[gimp] Issue #3405 - Color component decompose crash for CMY

[Michael Natterer <mitch src gnome org>]

commit f3f8d3a54e011db536ae15086a6533e2da923014
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 2 21:17:20 2020 +0200

    Issue #3405 - Color component decompose crash for CMY
    
    Remove the "CMY" model from compose and decompose, it's gone from
    babl. Also fix decomposing to CMYK by using the right component names.

 plug-ins/common/compose.c   | 19 ++++---------------
 plug-ins/common/decompose.c | 24 ++++++++----------------
 2 files changed, 12 insertions(+), 31 deletions(-)
---
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index f746201ac4..3ad2b94e5c 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -213,14 +213,10 @@ GIMP_MAIN (COMPOSE_TYPE)
 #define CPN_HSL_S  { "saturation", N_("_Saturation:"), NULL, 0.0, 1.0, TRUE}
 #define CPN_HSL_L  { "lightness",  N_("_Lightness:"),  NULL, 0.0, 1.0, TRUE}
 
-#define CPN_CMYK_C { "cyan",    N_("_Cyan:"),    NULL, 0.0, 1.0, TRUE}
-#define CPN_CMYK_M { "magenta", N_("_Magenta:"), NULL, 0.0, 1.0, TRUE}
-#define CPN_CMYK_Y { "yellow",  N_("_Yellow:"),  NULL, 0.0, 1.0, TRUE}
-#define CPN_CMYK_K { "key",     N_("_Black:"),   NULL, 0.0, 1.0, TRUE}
-
-#define CPN_CMY_C  { "cyan",    N_("_Cyan:"),    NULL, 0.0, 1.0, TRUE}
-#define CPN_CMY_M  { "magenta", N_("_Magenta:"), NULL, 0.0, 1.0, TRUE}
-#define CPN_CMY_Y  { "yellow",  N_("_Yellow:"),  NULL, 0.0, 1.0, TRUE}
+#define CPN_CMYK_C { "Cyan",    N_("_Cyan:"),    NULL, 0.0, 1.0, TRUE}
+#define CPN_CMYK_M { "Magenta", N_("_Magenta:"), NULL, 0.0, 1.0, TRUE}
+#define CPN_CMYK_Y { "Yellow",  N_("_Yellow:"),  NULL, 0.0, 1.0, TRUE}
+#define CPN_CMYK_K { "Key",     N_("_Black:"),   NULL, 0.0, 1.0, TRUE}
 
 #define CPN_LAB_L  { "CIE L", N_("_L:"), NULL, 0.0, 100.0, TRUE}
 #define CPN_LAB_A  { "CIE a", N_("_A:"), NULL, -127.5, 127.5, TRUE}
@@ -270,13 +266,6 @@ static COMPOSE_DSC compose_dsc[] =
       CPN_HSL_L },
     "hsl-compose" },
 
-  { "CMY",
-    N_("CMY"), 3,
-    { CPN_CMY_C,
-      CPN_CMY_M,
-      CPN_CMY_Y },
-    "cmy-compose" },
-
   { "CMYK",
     N_("CMYK"), 4,
     { CPN_CMYK_C,
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index 7ef72bc605..f6822b8bff 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -169,14 +169,10 @@ GIMP_MAIN (DECOMPOSE_TYPE)
 #define CPN_HSL_S       { "saturation", N_("saturation"),    0.0, 1.0, TRUE }
 #define CPN_HSL_L       { "lightness",  N_("lightness"),     0.0, 1.0, TRUE }
 
-#define CPN_CMYK_C      { "cyan",       N_("cyan-k"),        0.0, 1.0, TRUE }
-#define CPN_CMYK_M      { "magenta",    N_("magenta-k"),     0.0, 1.0, TRUE }
-#define CPN_CMYK_Y      { "yellow",     N_("yellow-k"),      0.0, 1.0, TRUE }
-#define CPN_CMYK_K      { "key",        N_("black"),         0.0, 1.0, TRUE }
-
-#define CPN_CMY_C       { "cyan",       N_("cyan"),          0.0, 1.0, TRUE }
-#define CPN_CMY_M       { "magenta",    N_("magenta"),       0.0, 1.0, TRUE }
-#define CPN_CMY_Y       { "yellow",     N_("yellow"),        0.0, 1.0, TRUE }
+#define CPN_CMYK_C      { "Cyan",       N_("cyan"),          0.0, 1.0, TRUE }
+#define CPN_CMYK_M      { "Magenta",    N_("magenta"),       0.0, 1.0, TRUE }
+#define CPN_CMYK_Y      { "Yellow",     N_("yellow"),        0.0, 1.0, TRUE }
+#define CPN_CMYK_K      { "Key",        N_("black"),         0.0, 1.0, TRUE }
 
 #define CPN_LAB_L       { "CIE L",      N_("L"),             0.0, 100.0, TRUE }
 #define CPN_LAB_A       { "CIE a",      N_("A"),          -127.5, 127.5, TRUE }
@@ -215,15 +211,11 @@ static const Extract extract[] =
   { N_("Saturation (HSL)"), "HSL", FALSE, 1, FALSE, { CPN_HSL_S } },
   { N_("Lightness"),        "HSL", FALSE, 1, FALSE, { CPN_HSL_L } },
 
-  { N_("CMY"),     "CMY", TRUE,  3, FALSE, { CPN_CMY_C, CPN_CMY_M, CPN_CMY_Y } },
-  { N_("Cyan"),    "CMY", FALSE, 1, FALSE, { CPN_CMY_C } },
-  { N_("Magenta"), "CMY", FALSE, 1, FALSE, { CPN_CMY_M } },
-  { N_("Yellow"),  "CMY", FALSE, 1, FALSE, { CPN_CMY_Y } },
-
   { N_("CMYK"),      "CMYK", TRUE,  4, FALSE, { CPN_CMYK_C, CPN_CMYK_M, CPN_CMYK_Y, CPN_CMYK_K } },
-  { N_("Cyan_K"),    "CMYK", FALSE, 1, FALSE, { CPN_CMYK_C } },
-  { N_("Magenta_K"), "CMYK", FALSE, 1, FALSE, { CPN_CMYK_M } },
-  { N_("Yellow_K"),  "CMYK", FALSE, 1, FALSE, { CPN_CMYK_Y } },
+  { N_("Cyan"),      "CMYK", FALSE, 1, FALSE, { CPN_CMYK_C } },
+  { N_("Magenta"),   "CMYK", FALSE, 1, FALSE, { CPN_CMYK_M } },
+  { N_("Yellow"),    "CMYK", FALSE, 1, FALSE, { CPN_CMYK_Y } },
+  { N_("Black"),     "CMYK", FALSE, 1, FALSE, { CPN_CMYK_K } },
 
   { N_("LAB"), "CIE Lab",     TRUE, 3, FALSE, { CPN_LAB_L, CPN_LAB_A, CPN_LAB_B } },