better enum display

jcupitt · jcupitt · commit e9939acf4f05 · 2018-05-01T15:50:01.000+01:00
"header" just displays enum nick
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+started 8.6.1 1/5/18
+- better enum display in header
+
 started 8.6.0 16/8/17
 - add scRGB support
 - improve radiance support
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [8.6.0], [vipsip@jiscmail.ac.uk])
+AC_INIT([nip2], [8.6.1], [vipsip@jiscmail.ac.uk])
 
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
@@ -17,7 +17,7 @@ dnl
 
 m4_define([nip_major_version], [8])
 m4_define([nip_minor_version], [6])
-m4_define([nip_micro_version], [0])
+m4_define([nip_micro_version], [1])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
diff --git a/src/imageheader.c b/src/imageheader.c
@@ -68,35 +68,27 @@ imageheader_add_item( IMAGE *im,
 	char txt[256];
 	VipsBuf buf = VIPS_BUF_STATIC( txt );
 	GtkTreeIter iter;
-        char *value_str;
-	const char *extra;
 
-	value_str = g_strdup_value_contents( value );
-	vips_buf_appendf( &buf, "%s", value_str );
-
-	/* Look for enums and decode them.
+	/* Show the nicks for enums.
 	 */
-	extra = NULL;
-	if( strcmp( field, "coding" ) == 0 )
-		extra = vips_enum_nick( VIPS_TYPE_CODING, 
-			g_value_get_int( value ) );
-	else if( strcmp( field, "format" ) == 0 )
-		extra = vips_enum_nick( VIPS_TYPE_BAND_FORMAT, 
-			g_value_get_int( value ) );
-	else if( strcmp( field, "interpretation" ) == 0 )
-		extra = vips_enum_nick( VIPS_TYPE_INTERPRETATION, 
-			g_value_get_int( value ) );
-	if( extra )
-		vips_buf_appendf( &buf, " - %s", extra );
+	if( G_VALUE_HOLDS_ENUM( value ) ) 
+		vips_buf_appendf( &buf, "%s", 
+			vips_enum_nick( G_VALUE_TYPE( value ), 
+				g_value_get_enum( value ) ) );
+	else {
+		char *value_str;
+
+		value_str = g_strdup_value_contents( value );
+		vips_buf_appendf( &buf, "%s", value_str );
+		g_free( value_str );
+	}
 
 	gtk_list_store_append( imageheader->store, &iter );
 	gtk_list_store_set( imageheader->store, &iter,
 		NAME_COLUMN, field,
 		VALUE_COLUMN, vips_buf_all( &buf ),
 		-1 );
 
-	g_free( value_str );
-
 	return( NULL );
 }
 
