move vips_lrmerge() etc. out of the public API

libvips/include/vips/internal.h

@@ -276,6 +276,30 @@ VipsWindow *vips_window_take( VipsWindow *window,
 
 int vips__profile_set( VipsImage *image, const char *name );
 
+int vips_correl( VipsImage *ref, VipsImage *sec,
+	int xref, int yref, int xsec, int ysec,
+	int hwindowsize, int hsearchsize,
+	double *correlation, int *x, int *y );
+
+int vips_lrmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int dx, int dy, int mwidth );
+int vips_tbmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int dx, int dy, int mwidth );
+
+int vips_lrmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int bandno,
+	int xref, int yref, int xsec, int ysec,
+	int hwindowsize, int hsearchsize,
+	int balancetype,
+	int mwidth );
+
+int vips_tbmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out,
+	int bandno,
+	int xref, int yref, int xsec, int ysec,
+	int hwindowsize, int hsearchsize,
+	int balancetype,
+	int mwidth );
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

libvips/include/vips/mosaicing.h

@@ -51,36 +51,6 @@ int vips_mosaic1( VipsImage *ref, VipsImage *sec, VipsImage **out,
 	int xr2, int yr2, int xs2, int ys2, ... )
 	__attribute__((sentinel));
 
-/* TODO(kleisauke): Convert these to pure vips8 classes? */
-int vips_correl( VipsImage *ref, VipsImage *sec,
-	int xref, int yref, int xsec, int ysec,
-	int hwindowsize, int hsearchsize,
-	double *correlation, int *x, int *y/*, ...*/ )
-	/*__attribute__((sentinel))*/;
-
-int vips_lrmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int dx, int dy, int mwidth/*, ...*/ )
-	/*__attribute__((sentinel))*/;
-int vips_tbmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int dx, int dy, int mwidth/*, ...*/ )
-	/*__attribute__((sentinel))*/;
-
-int vips_lrmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int bandno,
-	int xref, int yref, int xsec, int ysec,
-	int hwindowsize, int hsearchsize,
-	int balancetype,
-	int mwidth/*, ...*/ )
-	/*__attribute__((sentinel))*/;
-
-int vips_tbmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out,
-	int bandno,
-	int xref, int yref, int xsec, int ysec,
-	int hwindowsize, int hsearchsize,
-	int balancetype,
-	int mwidth/*, ...*/ )
-	/*__attribute__((sentinel))*/;
-
 int vips_match( VipsImage *ref, VipsImage *sec, VipsImage **out, 
 	int xr1, int yr1, int xs1, int ys1, 
 	int xr2, int yr2, int xs2, int ys2, ... )

libvips/mosaicing/global_balance.c

@@ -111,6 +111,7 @@
 
 #include <vips/vips.h>
 #include <vips/transform.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"
 #include "global_balance.h"

libvips/mosaicing/im_lrmosaic.c

@@ -69,6 +69,7 @@
 #include <string.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"
 

libvips/mosaicing/match.c

@@ -37,6 +37,7 @@
 #include <math.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"
 

libvips/mosaicing/merge.c

@@ -41,6 +41,7 @@
 #include <stdio.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 typedef struct {
 	VipsOperation parent_instance;

libvips/mosaicing/mosaic1.c

@@ -57,6 +57,7 @@
 #include <vips/vips.h>
 #include <vips/buf.h>
 #include <vips/transform.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"