From 1ee558b4c2f84e983cc6befe203bc7b7eab95e00 Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Thu, 20 Jul 2017 15:02:33 +0100
Subject: Ensure colorspace colorants are named for ICC spaces too.

---
 source/fitz/colorspace.c | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

(limited to 'source/fitz/colorspace.c')

diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index 3e322bd9..98f7614e 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -3640,15 +3640,44 @@ fz_new_icc_colorspace(fz_context *ctx, const char *name, int num, fz_buffer *buf
 			fz_drop_buffer(ctx, profile->buffer);
 			fz_cmm_fin_profile(ctx, profile);
 			fz_free(ctx, profile);
+			break;
 		}
-		else
-		{
-			fz_md5_icc(ctx, profile);
-			cs = fz_new_colorspace(ctx, name, num, 0, 0, NULL, NULL, NULL, is_lab ? clamp_lab_icc : clamp_default_icc, free_icc, profile, sizeof(profile));
 
-			/* This is a bit of a handwave, but should be safe for our cases */
-			if (profile->num_devcomp == 4)
-				cs->is_subtractive = 1;
+		fz_md5_icc(ctx, profile);
+		cs = fz_new_colorspace(ctx, name, num, 0, 0, NULL, NULL, NULL, is_lab ? clamp_lab_icc : clamp_default_icc, free_icc, profile, sizeof(profile));
+
+		switch(profile->num_devcomp)
+		{
+		case 1:
+			fz_colorspace_name_colorant(ctx, cs, 0, "Gray");
+			break;
+		case 3:
+			if (is_lab)
+			{
+				fz_colorspace_name_colorant(ctx, cs, 0, "L");
+				fz_colorspace_name_colorant(ctx, cs, 1, "a");
+				fz_colorspace_name_colorant(ctx, cs, 2, "b");
+			}
+			else if (profile->bgr)
+			{
+				fz_colorspace_name_colorant(ctx, cs, 0, "Blue");
+				fz_colorspace_name_colorant(ctx, cs, 1, "Green");
+				fz_colorspace_name_colorant(ctx, cs, 2, "Red");
+			}
+			else
+			{
+				fz_colorspace_name_colorant(ctx, cs, 0, "Red");
+				fz_colorspace_name_colorant(ctx, cs, 1, "Green");
+				fz_colorspace_name_colorant(ctx, cs, 2, "Blue");
+			}
+			break;
+		case 4:
+			fz_colorspace_name_colorant(ctx, cs, 0, "Cyan");
+			fz_colorspace_name_colorant(ctx, cs, 1, "Magenta");
+			fz_colorspace_name_colorant(ctx, cs, 2, "Yellow");
+			fz_colorspace_name_colorant(ctx, cs, 3, "Black");
+			cs->is_subtractive = 1;
+			break;
 		}
 	}
 	fz_catch(ctx)
-- 
cgit v1.2.3