experiment with ppf save

jcupitt · jcupitt · commit 29f1182c7319 · 2021-10-25T20:12:06.000+01:00
argh won't work
diff --git a/ChangeLog b/ChangeLog
@@ -14,6 +14,8 @@
 - added restart_interval option to jpegsave [manthey]
 - add IIIF3 support to dzsaave [martimpassos]
 - add atan2 [indus]
+- added "string_arguments" ... buffer and target savers which support multiple
+  formats should no longer need special cases
 
 16/8/21 started 8.11.4
 - fix off-by-one error in new rank fast path
diff --git a/NOTES b/NOTES
@@ -16,6 +16,40 @@
 
   hide from introspection? eg. tag as DEPRECATED
 
+- nope, also fails, since py calls
+
+	pointer = vips_lib.vips_filename_get_options(format_string)
+        options = _to_string_copy(pointer)
+
+        pointer = vips_lib.vips_foreign_find_save_target(format_string)
+        if pointer == ffi.NULL:
+            raise Error('unable to write to target')
+        name = _to_string(pointer)
+
+        return pyvips.Operation.call(name, self, target,
+                                     string_options=options, **kwargs)
+
+  ie. the filename part is stripped before we see it
+
+  we'd need to change pyvips too, and it would need to detect older libvipses
+
+- could add an extra string param to vips_lib.vips_filename_get_options()?
+
+	vips_lib.vips_filename_get_options("x.y[arg=val]")
+
+  could yield
+
+	[arg=val,suffix=.y]
+
+  ie. append a magic extra arg we make
+
+  how fragile and ugly!
+
 - something in pytest is taking FOREVER ... find it and fix it
 
   uses enough memory to kill the laptop
+
+    heifsave is incredibly slow
+		
+      is it testing AVIF too?
+	
diff --git a/libvips/foreign/ppmsave.c b/libvips/foreign/ppmsave.c
@@ -75,6 +75,10 @@ struct _VipsForeignSavePpm {
 
 	VipsSavePpmFn fn;
 
+	/* Our save options in string form. See target save.
+	 */
+	const char *string_arguments;
+
 	/* Deprecated.
 	 */
 	gboolean squash;
@@ -216,7 +220,6 @@ vips_foreign_save_ppm_build( VipsObject *object )
 {
 	VipsForeignSave *save = (VipsForeignSave *) object;
 	VipsForeignSavePpm *ppm = (VipsForeignSavePpm *) object;
-
 	VipsImage *image;
 	char *magic;
 	char *date;
@@ -238,6 +241,49 @@ vips_foreign_save_ppm_build( VipsObject *object )
 		vips_image_pio_input( image ) )
 		return( -1 );
 
+	/* ppm types. We use the suffix (if avail.) to set the defaults for
+	 * bitdepth etc.
+	 *
+	 *   pbm ... 1 band 1 bit
+	 *   pgm ... 1 band many bit
+	 *   ppm ... 3 band many bit
+	 *   pfm ... 1 or 3 bands, 32 bit
+	 */
+	if( ppm->string_arguments ) {
+		VipsImage **t = (VipsImage **) 
+			vips_object_local_array( object, 2 );
+
+		char filename[VIPS_PATH_MAX];
+		char option_string[VIPS_PATH_MAX];
+		VipsBandFormat target_format;
+		VipsInterpretation target_interpretation;
+
+		vips__filename_split8( ppm->string_arguments, 
+			filename, option_string );
+
+		target_format = image->BandFmt;
+		target_interpretation = image->Type;
+
+		if( vips_iscasepostfix( filename, ".pbm" ) ||
+			vips_iscasepostfix( filename, ".pgm" ) )
+			target_interpretation = VIPS_INTERPRETATION_B_W;
+		else if( vips_iscasepostfix( filename, ".ppm" ) )
+			target_interpretation = VIPS_INTERPRETATION_sRGB;
+		else if( vips_iscasepostfix( filename, ".pfm" ) )
+			target_format = VIPS_FORMAT_FLOAT;
+
+		if( vips_cast( image, &t[0], target_format, NULL ) )
+			return( -1 );
+		image = t[0];
+
+		if( image->Type != target_interpretation ) {
+			if( vips_colourspace( image, &t[1], 
+				target_interpretation, NULL ) )
+				return( -1 );
+			image = t[1];
+		}
+	}
+
 	if( ppm->ascii && 
 		image->BandFmt == VIPS_FORMAT_FLOAT ) {
 		g_warning( "%s", 
@@ -428,6 +474,16 @@ vips_foreign_save_ppm_class_init( VipsForeignSavePpmClass *class )
 		G_STRUCT_OFFSET( VipsForeignSavePpm, squash ),
 		FALSE );
 
+	/* This isn't really deprecated, just internal. We just want to hide 
+	 * it from bindings and the user.
+	 */
+	VIPS_ARG_STRING( class, "string_arguments", 12,
+		_( "String arguments" ),
+		_( "Save options in string form" ),
+		VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, 
+		G_STRUCT_OFFSET( VipsForeignSavePpm, string_arguments ),
+		NULL );
+
 }
 
 static void
diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c
@@ -795,23 +795,28 @@ vips_object_get_argument( VipsObject *object, const char *name,
 }
 
 /**
- * vips_object_argument_has: 
+ * vips_object_argument_has: (skip)
  * @object: the object to fetch the args from
  * @name: arg name
  *
  * Convenience: true if the object has the named argument.
  *
  * Returns: %TRUE if the argument exists.
  */
-static gboolean
+int
 vips_object_argument_has( VipsObject *object, const char *name )
 {
-	GParamSpec *pspec;
-	VipsArgumentClass *argument_class;
-	VipsArgumentInstance *argument_instance;
+	VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
 
-	return( !vips_object_get_argument( object, name,
-		&pspec, &argument_class, &argument_instance ) );
+	GParamSpec pspec;
+
+	if( g_object_class_find_property( G_OBJECT_CLASS( class ), name ) )
+		return( TRUE );
+
+	if( vips__argument_table_lookup( class->argument_table, &pspec ) )
+		return( TRUE );
+
+	return( FALSE );
 }
 
 /**
