Merge branch 'master' of github.com:jcupitt/nip2

jcupitt · jcupitt · commit c889be64db0b · 2014-01-20T17:03:40.000Z
Conflicts:
	ChangeLog
	src/util.c
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 started 7.38.1 18/1/14
 - add scRGB to list of known Types
+=======
+started 7.38.1 20/1/14
+- fix scRGB display
+>>>>>>> 2bb3de9e64a99361e6363219f301761e4b2aa7d6
 
 started 7.38.0 18/1/14
 - version bump
diff --git a/TODO b/TODO
@@ -1,4 +1,3 @@
-
 - columns can move about on load in large workspaces
 
 - hide tabs if only one tab in window, though we'd need to allow tab drop 
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], [7.38.0])
+AC_INIT([nip2], [7.38.1])
 AM_INIT_AUTOMAKE([-Wall])
 
 # foreign stops complaints about a missing README (we use README.md instead)
@@ -18,7 +18,7 @@ dnl
 
 m4_define([nip_major_version], [7])
 m4_define([nip_minor_version], [38])
-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/src/conversion.c b/src/conversion.c
@@ -610,6 +610,7 @@ conversion_make_repaint( Conversion *conv, IMAGE *in )
 		(in->Type == IM_TYPE_LCH ||
 		in->Type == IM_TYPE_YXY ||
 		in->Type == IM_TYPE_UCS ||
+		in->Type == VIPS_INTERPRETATION_scRGB ||
 		in->Type == IM_TYPE_LAB ||
 		in->Type == IM_TYPE_XYZ) ) {
 		IMAGE *t[2];
@@ -641,6 +642,18 @@ conversion_make_repaint( Conversion *conv, IMAGE *in )
 			in = t[1];
 		}
 
+		if( in->Type == VIPS_INTERPRETATION_scRGB ) {
+			VipsImage *x;
+
+			if( vips_scRGB2sRGB( in, &x, NULL ) ) {
+				im_close( out );
+				return( NULL );
+			}
+			vips_object_local( out, x ); 
+
+			in = x;
+		}
+
 		if( in->Type == IM_TYPE_YXY ) {
 			if( im_open_local_array( out, t, 2, "conv-1", "p" ) ||
 				im_clip2fmt( in, t[0], IM_BANDFMT_FLOAT ) ||
diff --git a/src/util.c b/src/util.c
@@ -1315,7 +1315,7 @@ static const char *type_names[] = {
 	"RGB16",		/* IM_TYPE_RGB16	25 */
 	"GREY16",		/* IM_TYPE_GREY16	26 */
 	"Array",		/* VIPS_INTERPRETATION_ARRAY = 27 */
-	"scRGB"			/* VIPS_INTERPRETATION_scRGB 28 */
+	"scRGB"			/* VIPS_INTERPRETATION_scRGB = 28 */
 };
 static const int ntype_names = IM_NUMBER( type_names );
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`- columns can move about on load in large workspaces`
`3`	`2`
`4`	`3`	`- hide tabs if only one tab in window, though we'd need to allow tab drop`