more introspection hackery

TODO

@@ -3,6 +3,13 @@
 
   at the moment Vips-8.0.gir just has the stuff directly in vips.h
 
+  ... is this correct? many includes are working finw without this
+
+- currently stuck on:
+
+	<unknown>:: Fatal: Vips: Unknown namespace for identifier 'vips_save_string'
+
+
 
 
 

configure.in

@@ -33,13 +33,15 @@ GOBJECT_INTROSPECTION_CHECK([0.6.7])
 # see also IGNORE_HFILES in doc/reference/Makefile.am
 # the only header we include is the main vips.h one, it'll pull in everythiung
 # else in the public API
-introspection_sources=`cd libvips ; find . -name "*.c"`
-filter_list="deprecated"
+introspection_sources=`cd libvips ; find . -name "*.[[hc]]"`
+filter_list="deprecated im_video_v4l1.c type.h draw.h dispatch.h transform.h sink.h mask.h merge.h debug.h internal.h intl.h CImg.h im_video_v4l1.h global_balance.h dbh.h base64.h templates.h mosaic.h deprecated.h thread.h private.h internal.h almostdeprecated.h inlines.h struct.h disp.h vector.h vips7compat.h"
 
 introspection_sources2=
 for name in $introspection_sources; do
   found=0
   for filter in $filter_list; do
+    # FIXME .. argh a bash-ism :( not sure of a nice, portable way to do 
+    # regexp matching
     if [[[ $name == *${filter}* ]]]; then
       found=1
     fi

libvips/Makefile.am

@@ -91,7 +91,14 @@ Vips_8_0_gir_INCLUDES = GObject-2.0
 Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include
 Vips_8_0_gir_LIBS = libvips.la
 Vips_8_0_gir_FILES = $(introspection_sources)
-Vips_8_0_gir_SCANNERFLAGS = --warn-all
+Vips_8_0_gir_SCANNERFLAGS = \
+			    --warn-all \
+			    --verbose \
+			    --namespace=Vips \
+			    --identifier-prefix=Vips \
+			    --symbol-prefix=vips \
+			    --symbol-prefix=im \
+			    --symbol-prefix=im_ 
 INTROSPECTION_GIRS += Vips-8.0.gir
 
 girdir = $(datadir)/gir-1.0

libvips/arithmetic/arithmetic.h

@@ -38,6 +38,7 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
 #include <vips/vector.h>
 
 #define VIPS_TYPE_ARITHMETIC (vips_arithmetic_get_type())

libvips/arithmetic/binary.h

@@ -30,6 +30,10 @@
 #ifndef VIPS_BINARY_H
 #define VIPS_BINARY_H
 
+#include <vips/vips.h>
+
+#include "arithmetic.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/

libvips/include/vips/buf.h

@@ -34,6 +34,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+
 /* A string in the process of being written to ... multiple calls to 
  * vips_buf_append add to it, on overflow append "..." and block further writes.
  */

libvips/include/vips/cimg_funcs.h

@@ -37,6 +37,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+
 int im_greyc_mask( VipsImage *in, VipsImage *out, VipsImage *mask, 
 	int iterations, float amplitude, float sharpness, float anisotropy, 
 	float alpha, float sigma, float dl, float da, float gauss_prec, 

libvips/include/vips/colour.h

@@ -154,8 +154,6 @@ int im_lab_morph( VipsImage *in, VipsImage *out,
 	double L_offset, double L_scale,
 	double a_scale, double b_scale );
 
-void im_col_make_tables_UCS( void );
-
 /* Render intents for icc wrappers.
  */
 typedef enum {

libvips/include/vips/freq_filt.h

@@ -37,6 +37,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+
 typedef enum {
         VIPS_MASK_IDEAL_HIGHPASS = 0,
         VIPS_MASK_IDEAL_LOWPASS = 1,

libvips/include/vips/header.h

@@ -167,11 +167,7 @@ int vips_image_get_int( VipsImage *image, const char *field, int *out );
 int vips_image_set_int( VipsImage *image, const char *field, int i );
 int vips_image_get_double( VipsImage *image, const char *field, double *out );
 int vips_image_set_double( VipsImage *image, const char *field, double d );
-int vips_image_get_string( VipsImage *image, const char *field, char **out );
-int vips_image_set_string( VipsImage *image, 
-	const char *field, const char *str );
 int vips_image_get_as_string( VipsImage *image, const char *field, char **out );
-GType vips_image_get_typeof( VipsImage *image, const char *field );
 
 int vips_image_history_printf( VipsImage *image, const char *format, ... )
 	__attribute__((format(printf, 2, 3)));

libvips/include/vips/mosaicing.h

@@ -37,6 +37,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+
 int im_lrmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,
 	int dx, int dy, int mwidth );
 int im_tbmerge( VipsImage *ref, VipsImage *sec, VipsImage *out,

libvips/include/vips/operation.h

@@ -34,6 +34,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+
 #define VIPS_TYPE_OPERATION (vips_operation_get_type())
 #define VIPS_OPERATION( obj ) \
 	(G_TYPE_CHECK_INSTANCE_CAST( (obj), \

libvips/include/vips/semaphore.h

@@ -40,6 +40,9 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+#include <vips/thread.h>
+
 /* Implement our own semaphores.
  */
 typedef struct {

libvips/iofuncs/init.c

@@ -305,7 +305,7 @@ static GOptionEntry option_entries[] = {
 };
 
 /**
- * vips_get_option_group:
+ * vips_get_option_group: (skip)
  *
  * vips_get_option_group()  returns  a GOptionGroup containing various VIPS
  * command-line options. It  can  be  used  with  GOption  to  help

libvips/iofuncs/pool.c

@@ -103,7 +103,7 @@
 
  */
 
-G_DEFINE_TYPE( VipsPool, vips_pool, VIPS_TYPE_POOL );
+G_DEFINE_TYPE( VipsPool, vips_pool, VIPS_TYPE_OBJECT );
 
 static void
 vips_pool_dispose( GObject *gobject )

libvips/iofuncs/sink.h

@@ -37,6 +37,9 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <vips/vips.h>
+#include <vips/thread.h>
+
 /* Base for sink.c / sinkdisc.c / sinkmemory.c
  */
 typedef struct _SinkBase {

libvips/relational/im_ifthenelse.c

@@ -227,7 +227,7 @@ im_ifthenelse( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out )
 	t[4] = c;
 	if( im__sizealike_vec( t + 2, t + 5, 3 ) )
 		return( -1 );
-	c = t[5];
+	c = t[7];
 
 	/* If c is not uchar, do (!=0) to make a uchar image.
 	 */
@@ -238,7 +238,7 @@ im_ifthenelse( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out )
 		c = t[8];
 	}
 
-	if( ifthenelse( c, t[6], t[7], out ) )
+	if( ifthenelse( c, t[5], t[6], out ) )
 		return( -1 );
 
 	return( 0 );