From 8dcf3bca57386dcf416fb3c621c79b639e11a9ba Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 30 Jun 2020 12:32:07 +0100
Subject: [PATCH] move vips_lrmerge() etc. out of the public API

---
 libvips/include/vips/internal.h    | 24 ++++++++++++++++++++++++
 libvips/include/vips/mosaicing.h   | 30 ------------------------------
 libvips/mosaicing/global_balance.c |  1 +
 libvips/mosaicing/im_lrmosaic.c    |  1 +
 libvips/mosaicing/match.c          |  1 +
 libvips/mosaicing/merge.c          |  1 +
 libvips/mosaicing/mosaic1.c        |  1 +
 7 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/libvips/include/vips/internal.h b/libvips/include/vips/internal.h
index e9a78640..524097d8 100644
--- a/libvips/include/vips/internal.h
+++ b/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*/
diff --git a/libvips/include/vips/mosaicing.h b/libvips/include/vips/mosaicing.h
index 4a18068c..848675ea 100644
--- a/libvips/include/vips/mosaicing.h
+++ b/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, ... )
diff --git a/libvips/mosaicing/global_balance.c b/libvips/mosaicing/global_balance.c
index 190db7e2..ba45d395 100644
--- a/libvips/mosaicing/global_balance.c
+++ b/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"
diff --git a/libvips/mosaicing/im_lrmosaic.c b/libvips/mosaicing/im_lrmosaic.c
index 82cc9ef6..5832897a 100644
--- a/libvips/mosaicing/im_lrmosaic.c
+++ b/libvips/mosaicing/im_lrmosaic.c
@@ -69,6 +69,7 @@
 #include <string.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"
 
diff --git a/libvips/mosaicing/match.c b/libvips/mosaicing/match.c
index dfad8866..38821ebc 100644
--- a/libvips/mosaicing/match.c
+++ b/libvips/mosaicing/match.c
@@ -37,6 +37,7 @@
 #include <math.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 #include "pmosaicing.h"
 
diff --git a/libvips/mosaicing/merge.c b/libvips/mosaicing/merge.c
index 24d2cd47..e2f33118 100644
--- a/libvips/mosaicing/merge.c
+++ b/libvips/mosaicing/merge.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 
 #include <vips/vips.h>
+#include <vips/internal.h>
 
 typedef struct {
 	VipsOperation parent_instance;
diff --git a/libvips/mosaicing/mosaic1.c b/libvips/mosaicing/mosaic1.c
index 39aad6ce..8cebcb2b 100644
--- a/libvips/mosaicing/mosaic1.c
+++ b/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"