Merge remote-tracking branch 'origin/7.28'

Conflicts:
	ChangeLog
	configure.in
	libvips/deprecated/im_csv2vips.c

ChangeLog

@@ -20,6 +20,13 @@
 - better handling of input files in vips7 command-line interface
 - sequential can skip ahead, so extract / insert are now seq
 
+16/7/12 started 7.28.10
+- wopconst was broken
+- vips_sign() was broken
+- png save compression range was wrong
+- more/moreeq was wrong
+- vips7 ppm save with options was broken 
+
 18/6/12 started 7.28.9
 - slightly more memory debugging output
 - remove references to the static bicubic interpolator from the docs

configure.in

@@ -37,7 +37,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
 #   binary interface changes not backwards compatible?: reset age to 0
 
 LIBRARY_CURRENT=33
-LIBRARY_REVISION=1
+LIBRARY_REVISION=2
 LIBRARY_AGE=1
 
 # patched into include/vips/version.h

libvips/arithmetic/math2.c

@@ -22,6 +22,8 @@
  * 	- im_powtra() adapated to make math2.c
  * 12/11/11
  * 	- redone as a class
+ * 17/7/12
+ * 	- wopconst was broken
  */
 
 /*
@@ -401,7 +403,7 @@ vips_math2_const_class_init( VipsMath2ConstClass *class )
 		_( "Operation" ), 
 		_( "math to perform" ),
 		VIPS_ARGUMENT_REQUIRED_INPUT,
-		G_STRUCT_OFFSET( VipsMath2, math2 ),
+		G_STRUCT_OFFSET( VipsMath2Const, math2 ),
 		VIPS_TYPE_OPERATION_MATH2, VIPS_OPERATION_MATH2_POW ); 
 }
 

libvips/deprecated/im_csv2vips.c

@@ -74,7 +74,7 @@ im_csv2vips( const char *filename, IMAGE *out )
 			lines = atoi( r );
 	}
 
-	if( vips__csv_read( filename, out, 
+	if( vips__csv_read( name, out, 
 		start_skip, lines, whitespace, separator ) )
 		return( -1 );
 

libvips/deprecated/im_vips2ppm.c

@@ -66,5 +66,5 @@ im_vips2ppm( IMAGE *in, const char *filename )
 		}
 	}
 
-	return( vips_ppmsave( in, filename, "ascii", ascii, NULL ) ); 
+	return( vips_ppmsave( in, name, "ascii", ascii, NULL ) ); 
 }

libvips/foreign/pngsave.c

@@ -2,6 +2,8 @@
  *
  * 2/12/11
  * 	- wrap a class around the png writer
+ * 16/7/12
+ * 	- compression should be 0-9, not 1-10
  */
 
 /*
@@ -104,7 +106,7 @@ vips_foreign_save_png_class_init( VipsForeignSavePngClass *class )
 		_( "Compression factor" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsForeignSavePng, compression ),
-		1, 10, 6 );
+		0, 9, 6 );
 
 	VIPS_ARG_BOOL( class, "interlace", 7, 
 		_( "Interlace" ), 

libvips/iofuncs/cache.c

@@ -265,9 +265,15 @@ vips_value_equal( GParamSpec *pspec, GValue *v1, GValue *v2 )
 	if( generic == G_TYPE_PARAM_DOUBLE ) 
 		return( g_value_get_double( v1 ) ==
 			g_value_get_double( v2 ) );
-	if( generic == G_TYPE_PARAM_STRING ) 
-		return( strcmp( g_value_get_string( v1 ),
-			g_value_get_string( v2 ) ) == 0 );
+	if( generic == G_TYPE_PARAM_STRING ) {
+		const char *s1 = g_value_get_string( v1 );
+		const char *s2 = g_value_get_string( v2 );
+
+		if( s1 == s2 )
+			return( TRUE );
+		else
+			return( s1 && s2 && strcmp( s1, s2 ) == 0 );
+	}
 	if( generic == G_TYPE_PARAM_BOXED ) 
 		return( g_value_get_boxed( v1 ) ==
 			g_value_get_boxed( v2 ) );