fix bug 694618

For Separation and DeviceN colorspaces, the initial color value is 1.0
for all components instead of 0.0 as for most other colorspaces. The
current initialization in pdf_set_colorspace initializes for CMYK which
happens to work for all non-tint colorspaces.

3 files changed, 16 insertions, 0 deletions

diff --git a/include/mupdf/pdf/resource.h b/include/mupdf/pdf/resource.h
index fb088a3d..0b090705 100644
--- a/include/mupdf/pdf/resource.h
+++ b/include/mupdf/pdf/resource.h
@@ -15,6 +15,7 @@ void pdf_remove_item(fz_context *ctx, fz_store_free_fn *free, pdf_obj *key);
 fz_function *pdf_load_function(pdf_document *doc, pdf_obj *ref, int in, int out);
 
 fz_colorspace *pdf_load_colorspace(pdf_document *doc, pdf_obj *obj);
+int pdf_is_tint_colorspace(fz_colorspace *cs);
 
 fz_shade *pdf_load_shading(pdf_document *doc, pdf_obj *obj);
 
diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c
index 9ade1a71..611a187b 100644
--- a/source/pdf/pdf-colorspace.c
+++ b/source/pdf/pdf-colorspace.c
@@ -167,6 +167,14 @@ load_separation(pdf_document *doc, pdf_obj *array)
 	return cs;
 }
 
+int
+pdf_is_tint_colorspace(fz_colorspace *cs)
+{
+	return cs && cs->to_rgb == separation_to_rgb;
+}
+
+/* Indexed */
+
 static fz_colorspace *
 load_indexed(pdf_document *doc, pdf_obj *array)
 {
diff --git a/source/pdf/pdf-interpret.c b/source/pdf/pdf-interpret.c
index b498d54d..3790578f 100644
--- a/source/pdf/pdf-interpret.c
+++ b/source/pdf/pdf-interpret.c
@@ -1252,6 +1252,13 @@ pdf_set_colorspace(pdf_csi *csi, int what, fz_colorspace *colorspace)
 	mat->v[1] = 0;
 	mat->v[2] = 0;
 	mat->v[3] = 1;
+
+	if (pdf_is_tint_colorspace(colorspace))
+	{
+		int i;
+		for (i = 0; i < colorspace->n; i++)
+			mat->v[i] = 1.0f;
+	}
 }
 
 static void