From dbdf9c8d836187d49132ccb960409412c8319764 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 18 Dec 2012 13:43:46 +0000
Subject: [PATCH] deprecate vips7 resample dispatch

---
 libvips/deprecated/Makefile.am                    |  1 +
 .../{resample => deprecated}/resample_dispatch.c  |  0
 libvips/include/vips/mosaicing.h                  |  8 ++++++++
 libvips/include/vips/resample.h                   | 15 +++------------
 libvips/resample/Makefile.am                      |  6 ++----
 5 files changed, 14 insertions(+), 16 deletions(-)
 rename libvips/{resample => deprecated}/resample_dispatch.c (100%)

diff --git a/libvips/deprecated/Makefile.am b/libvips/deprecated/Makefile.am
index aee29f81..493439bd 100644
--- a/libvips/deprecated/Makefile.am
+++ b/libvips/deprecated/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdeprecated.la
 libdeprecated_la_SOURCES = \
 	im_linreg.c \
 	im_point_bilinear.c \
+	resample_dispatch.c \
 	im_openslide2vips.c \
 	im_lab_morph.c \
 	deprecated_dispatch.c \
diff --git a/libvips/resample/resample_dispatch.c b/libvips/deprecated/resample_dispatch.c
similarity index 100%
rename from libvips/resample/resample_dispatch.c
rename to libvips/deprecated/resample_dispatch.c
diff --git a/libvips/include/vips/mosaicing.h b/libvips/include/vips/mosaicing.h
index 3fabf772..69800d31 100644
--- a/libvips/include/vips/mosaicing.h
+++ b/libvips/include/vips/mosaicing.h
@@ -39,6 +39,14 @@ extern "C" {
 
 #include <vips/vips.h>
 
+int im_match_linear( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int xr1, int yr1, int xs1, int ys1,
+	int xr2, int yr2, int xs2, int ys2 );
+int im_match_linear_search( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int xr1, int yr1, int xs1, int ys1,
+	int xr2, int yr2, int xs2, int ys2,
+	int hwindowsize, int hsearchsize );
+
 int im_lrmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
 	int dx, int dy, int mwidth );
 int im_tbmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
diff --git a/libvips/include/vips/resample.h b/libvips/include/vips/resample.h
index 738e9620..15ad84dc 100644
--- a/libvips/include/vips/resample.h
+++ b/libvips/include/vips/resample.h
@@ -37,18 +37,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-int im_match_linear( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int xr1, int yr1, int xs1, int ys1,
-	int xr2, int yr2, int xs2, int ys2 );
-int im_match_linear_search( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int xr1, int yr1, int xs1, int ys1,
-	int xr2, int yr2, int xs2, int ys2,
-	int hwindowsize, int hsearchsize );
-
-
-
-int vips_quadratic( VipsImage *in, VipsImage **out, VipsImage *coeff, ... )
-	__attribute__((sentinel));
 int vips_shrink( VipsImage *in, VipsImage **out, 
 	double xshrink, double yshrink, ... )
 	__attribute__((sentinel));
@@ -56,6 +44,9 @@ int vips_affine( VipsImage *in, VipsImage **out,
 	double a, double b, double c, double d, ... )
 	__attribute__((sentinel));
 
+int vips_quadratic( VipsImage *in, VipsImage **out, VipsImage *coeff, ... )
+	__attribute__((sentinel));
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/
diff --git a/libvips/resample/Makefile.am b/libvips/resample/Makefile.am
index 96b60b5e..97610342 100644
--- a/libvips/resample/Makefile.am
+++ b/libvips/resample/Makefile.am
@@ -12,7 +12,6 @@ libresample_la_SOURCES = \
 	shrink.c \
 	interpolate.c \
 	transform.c \
-	resample_dispatch.c \
 	bicubic.cpp \
 	lbb.cpp \
 	nohalo.cpp \
@@ -25,10 +24,9 @@ libresample_la_SOURCES = \
 	resample.c \
 	resample.h \
 	shrink.c \
-	im_affine.c \
+	affine.c \
 	interpolate.c \
-	transform.c \
-	resample_dispatch.c 
+	transform.c 
 
 EXTRA_DIST = \
 	bicubic.cpp \