small fixes

TODO

@@ -1,3 +1,4 @@
+
 - Vips.Image has members like chain, __subclasshook__ etc etc, are we
   really subclassing it correctly?
 
@@ -24,9 +25,6 @@
 
 
 
-- test rad read/write with real images (add to nip2 checks?)
-
-- test matio load with real images (add to nip2 checks?)
 
 - magickload is broken
 
@@ -37,8 +35,9 @@
 
   seems to be a magick bug: ping jpg reports 1 band, load jpg reports 3 band
 
-  posted a question, wait for reply
+  posted a question, wait for reply ... useless
 
+  look at what PingImage() actually does for jpg images
 
 
 

configure.in

@@ -10,7 +10,7 @@ AC_PREREQ(2.62)
 AM_INIT_AUTOMAKE([-Wno-portability])
 
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR([m4])
 
 # user-visible library versioning
 m4_define([vips_major_version], [7])
@@ -26,13 +26,12 @@ VIPS_VERSION=vips_version()
 VIPS_VERSION_STRING=$VIPS_VERSION-`date`
 
 # init introspection support
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
 
 # gir needs a list of source files to scan for introspection
+#
 # build with a glob and a list of files to exclude from scanning
 # see also IGNORE_HFILES in doc/reference/Makefile.am
-# the only header we include is the main vips.h one, it'll pull in everything
-# else in the public API
 introspection_sources=`cd libvips ; find . -name "*.c"`
 filter_list="deprecated im_video_v4l1.c"
 

libvips/Makefile.am

@@ -91,16 +91,16 @@ 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)
+INTROSPECTION_GIRS += Vips-8.0.gir
+
 Vips_8_0_gir_SCANNERFLAGS = \
 			    --warn-all \
 			    --verbose \
-			    --namespace=Vips \
 			    --identifier-prefix=Vips \
 			    --identifier-prefix=vips \
 			    --symbol-prefix=vips \
 			    --symbol-prefix=im \
 			    --symbol-prefix=im_ 
-INTROSPECTION_GIRS += Vips-8.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)

libvips/colour/colour.c

@@ -772,7 +772,7 @@ vips_LabQ2disp( VipsImage *in, VipsImage **out,
 	int result;
 
 	va_start( ap, disp );
-	result = vips_call_split( "LabQ2disp", ap, in, out, disp );
+	result = vips_call_split( "im_LabQ2disp", ap, in, out, disp );
 	va_end( ap );
 
 	return( result );
@@ -785,7 +785,7 @@ vips_rad2float( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "rad2float", ap, in, out );
+	result = vips_call_split( "im_rad2float", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -798,7 +798,7 @@ vips_float2rad( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "float2rad", ap, in, out );
+	result = vips_call_split( "im_float2rad", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -811,7 +811,7 @@ vips_LabS2LabQ( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "LabS2LabQ", ap, in, out );
+	result = vips_call_split( "im_LabS2LabQ", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -824,7 +824,7 @@ vips_LabQ2Lab( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "LabQ2Lab", ap, in, out );
+	result = vips_call_split( "im_LabQ2Lab", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -837,7 +837,7 @@ vips_Lab2LabQ( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "Lab2LabQ", ap, in, out );
+	result = vips_call_split( "im_Lab2LabQ", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -850,7 +850,7 @@ vips_LCh2Lab( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "LCh2Lab", ap, in, out );
+	result = vips_call_split( "im_LCh2Lab", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -863,7 +863,7 @@ vips_Yxy2Lab( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "Yxy2Lab", ap, in, out );
+	result = vips_call_split( "im_Yxy2Lab", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -876,7 +876,7 @@ vips_UCS2XYZ( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "UCS2XYZ", ap, in, out );
+	result = vips_call_split( "im_UCS2XYZ", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -889,7 +889,7 @@ vips_Lab2XYZ( VipsImage *in, VipsImage **out, ... )
 	int result;
 
 	va_start( ap, out );
-	result = vips_call_split( "Lab2XYZ", ap, in, out );
+	result = vips_call_split( "im_Lab2XYZ", ap, in, out );
 	va_end( ap );
 
 	return( result );
@@ -903,7 +903,7 @@ vips_XYZ2disp( VipsImage *in, VipsImage **out,
 	int result;
 
 	va_start( ap, disp );
-	result = vips_call_split( "XYZ2disp", ap, in, out, disp );
+	result = vips_call_split( "im_XYZ2disp", ap, in, out, disp );
 	va_end( ap );
 
 	return( result );

libvips/include/vips/type.h

@@ -107,7 +107,7 @@ GType vips_ref_string_get_type( void );
 /**
  * VIPS_TYPE_BLOB:
  *
- * The #GType for a #VipsBlob.
+ * The %GType for a #VipsBlob.
  */
 #define VIPS_TYPE_BLOB (vips_blob_get_type())
 GType vips_blob_get_type( void );

tools/vips.c

@@ -1041,6 +1041,25 @@ main( int argc, char **argv )
 				break;
 			}
 
+	/* Could be a vips7 im_function. Search here first for max
+	 * compatibility.
+	 */
+	if( action && !handled && 
+		(fn = im_find_function( action )) ) {
+		(void) add_main_group( context, NULL );
+		parse_options( context, &argc, argv );
+
+		if( im_run_command( action, argc - 1, argv + 1 ) ) {
+			if( argc == 1 ) 
+				usage( fn );
+			else
+				error_exit( NULL );
+		}
+
+		handled = TRUE;
+	}
+	im_error_clear();
+
 	/* Could be a vips8 VipsOperation.
 	 */
 	if( action && !handled && 
@@ -1067,24 +1086,6 @@ main( int argc, char **argv )
 	}
 	im_error_clear();
 
-	/* Could be a vips7 im_function.
-	 */
-	if( action && !handled && 
-		(fn = im_find_function( action )) ) {
-		(void) add_main_group( context, NULL );
-		parse_options( context, &argc, argv );
-
-		if( im_run_command( action, argc - 1, argv + 1 ) ) {
-			if( argc == 1 ) 
-				usage( fn );
-			else
-				error_exit( NULL );
-		}
-
-		handled = TRUE;
-	}
-	im_error_clear();
-
 	if( action && !handled ) {
 		printf( "%s", _( "possible actions:\n" ) );
 		for( i = 0; i < VIPS_NUMBER( actions ); i++ )