tweaks

libvips/deprecated/deprecated_dispatch.c

@@ -35,7 +35,7 @@
 #include <stdio.h>
 
 #include <vips/vips.h>
-#include <vips/dispatch.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/deprecated/im_cmulnorm.c

@@ -46,7 +46,7 @@
 #include <vips/intl.h>
 
 #include <vips/vips.h>
-#include <vips/dispatch.h>
+#include <vips/deprecated.h>
 
 #include <stdio.h>
 #include <stdlib.h>

libvips/deprecated/im_fav4.c

@@ -37,7 +37,7 @@ Copyright (C) 1992, Kirk Martinez, History of Art Dept, Birkbeck College
 #include <string.h>
 
 #include <vips/vips.h>
-#include <vips/dispatch.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/deprecated/im_gadd.c

@@ -56,7 +56,7 @@
 #include <assert.h>
 
 #include <vips/vips.h>
-#include <vips/dispatch.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/deprecated/im_gaddim.c

@@ -57,6 +57,7 @@
 #include <math.h>
 
 #include <vips/vips.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/deprecated/im_gfadd.c

@@ -60,6 +60,7 @@
 #include <math.h>
 
 #include <vips/vips.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/deprecated/im_litecor.c

@@ -65,7 +65,7 @@
 #include <stdlib.h>
 
 #include <vips/vips.h>
-#include <vips/dispatch.h>
+#include <vips/deprecated.h>
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

libvips/include/vips/deprecated.h

@@ -279,34 +279,6 @@ void im_diagnostics( const char *fmt, ... )
 void im_warning( const char *fmt, ... )
 	__attribute__((format(printf, 1, 2)));
 
-/* Was public, now deprecated.
- */
-typedef enum {
-	IM_BBITS_BYTE = 8,
-	IM_BBITS_SHORT = 16,
-	IM_BBITS_INT = 32,
-	IM_BBITS_FLOAT = 32,
-	IM_BBITS_COMPLEX = 64,
-	IM_BBITS_DOUBLE = 64,
-	IM_BBITS_DPCOMPLEX = 128
-} VipsBBits;
-
-/* Used to define a region of interest for im_extract() etc. Too boring to be
- * public API, see im_extract_area() etc.
- */
-typedef struct { 
-	int xstart;
-	int ystart;
-	int xsize;
-	int ysize;
-	int chsel;      /* 1 2 3 or 0, for r g b or all respectively
-			 *(channel select)	*/
-} IMAGE_BOX;
-
-/* Compatibility typedefs.
- */
-typedef VipsDemandType im_demand_type;
-
 /* Deprecated operations.
  */
 int im_cmulnorm( IMAGE *in1, IMAGE *in2, IMAGE *out );