Merge pull request #1812 from lovell/cpp-set-vobject-class

jcupitt · web-flow · commit 808bec5d3d9c · 2020-09-14T13:11:21.000+01:00
cplusplus: ensure VOption::set for VObject uses class to determine type
diff --git a/cplusplus/VImage.cpp b/cplusplus/VImage.cpp
@@ -193,7 +193,7 @@ VOption::set( const char *name, const VObject value )
 {
 	Pair *pair = new Pair( name );
 	VipsObject *object = value.get_object();
-	GType type = G_VALUE_TYPE( object );
+	GType type = G_VALUE_TYPE( VIPS_OBJECT_GET_CLASS( object ) );
 
 	pair->input = true;
 	g_value_init( &pair->value, type );

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ VOption::set( const char *name, const VObject value )`
`193`	`193`	`{`
`194`	`194`	`Pair *pair = new Pair( name );`
`195`	`195`	`VipsObject *object = value.get_object();`
`196`		`- GType type = G_VALUE_TYPE( object );`
	`196`	`+ GType type = G_VALUE_TYPE( VIPS_OBJECT_GET_CLASS( object ) );`
`197`	`197`
`198`	`198`	`pair->input = true;`
`199`	`199`	`g_value_init( &pair->value, type );`