From 5875278850afb4f46126be2786c27f217908b8ba Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 10 Sep 2009 12:29:29 +0000
Subject: [PATCH] tweaks

---
 libvips/deprecated/deprecated_dispatch.c |  2 +-
 libvips/deprecated/im_cmulnorm.c         |  2 +-
 libvips/deprecated/im_fav4.c             |  2 +-
 libvips/deprecated/im_gadd.c             |  2 +-
 libvips/deprecated/im_gaddim.c           |  1 +
 libvips/deprecated/im_gfadd.c            |  1 +
 libvips/deprecated/im_litecor.c          |  2 +-
 libvips/include/vips/deprecated.h        | 28 ------------------------
 8 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/libvips/deprecated/deprecated_dispatch.c b/libvips/deprecated/deprecated_dispatch.c
index 7f8078bf..d5276d78 100644
--- a/libvips/deprecated/deprecated_dispatch.c
+++ b/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>
diff --git a/libvips/deprecated/im_cmulnorm.c b/libvips/deprecated/im_cmulnorm.c
index 973e63b4..b99ac381 100644
--- a/libvips/deprecated/im_cmulnorm.c
+++ b/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>
diff --git a/libvips/deprecated/im_fav4.c b/libvips/deprecated/im_fav4.c
index 1e85af50..84176da7 100644
--- a/libvips/deprecated/im_fav4.c
+++ b/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>
diff --git a/libvips/deprecated/im_gadd.c b/libvips/deprecated/im_gadd.c
index e1b26519..def5c995 100644
--- a/libvips/deprecated/im_gadd.c
+++ b/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>
diff --git a/libvips/deprecated/im_gaddim.c b/libvips/deprecated/im_gaddim.c
index 6ccc4c98..39feb6a9 100644
--- a/libvips/deprecated/im_gaddim.c
+++ b/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>
diff --git a/libvips/deprecated/im_gfadd.c b/libvips/deprecated/im_gfadd.c
index 859dc0bc..3fe6e26c 100644
--- a/libvips/deprecated/im_gfadd.c
+++ b/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>
diff --git a/libvips/deprecated/im_litecor.c b/libvips/deprecated/im_litecor.c
index 0d106232..b956ba69 100644
--- a/libvips/deprecated/im_litecor.c
+++ b/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>
diff --git a/libvips/include/vips/deprecated.h b/libvips/include/vips/deprecated.h
index b95348d6..1e43c71c 100644
--- a/libvips/include/vips/deprecated.h
+++ b/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 );