From 6c2a90eb053cbc221d686a9af9109405e19d5024 Mon Sep 17 00:00:00 2001
From: prrace <philip.race@oracle.com>
Date: Mon, 13 Oct 2025 22:23:19 -0700
Subject: [PATCH] 8364583

---
 .../java/awt/image/ColorConvertOp.java        |   2 +-
 .../ColorConvertOp/ColorConvertOpCMYK.java    |  51 ++++++++++++++++++
 .../awt/image/ColorConvertOp/black_cmyk.jpg   | Bin 0 -> 220 bytes
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
 create mode 100644 test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg

diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
index c1c6039719885..bf0292ca5c31a 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
@@ -808,7 +808,7 @@ private BufferedImage nonICCBIFilter(BufferedImage src,
                 idx = 0;
                 for (int x = 0; x < w; x++) {
                     pixel = srcRas.getDataElements(x, y, pixel);
-                    color = srcCM.getNormalizedComponents(pixel, color, 0);
+                    color = srcCM.getNormalizedComponents(pixel, null, 0);
                     if (needSrcAlpha) {
                         alpha[x] = color[srcNumComp];
                     }
diff --git a/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java b/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
new file mode 100644
index 0000000000000..9b008c591a837
--- /dev/null
+++ b/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.io.File;
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorConvertOp;
+import java.awt.image.ColorModel;
+
+import javax.imageio.ImageIO;
+
+/*
+ * @test
+ * @bug 8364583
+ * @summary Verify CMYK images work with ColorConvertOp
+ */
+
+public class ColorConvertOpCMYK {
+
+    public static void main(String[] args) throws Exception {
+        String sep = System.getProperty("file.separator");
+        String dir = System.getProperty("test.src", ".");
+        String prefix = dir + sep;
+        File file = new File(prefix + "black_cmyk.jpg");
+        BufferedImage source = ImageIO.read(file);
+        ColorModel sourceModel = source.getColorModel();
+        ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        ColorConvertOp convertOp = new ColorConvertOp(cs, null);
+        BufferedImage rgb = convertOp.filter(source, null);
+    }
+}
diff --git a/test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg b/test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1446f063bddf0c80a63a4a9da213b5560ad1d236
GIT binary patch
literal 220
zcmZ9FO%8%E6odz<O<#f10^WgJ7(+rt!p;p_gKJOYeO!15e>R@LD?D2_M8A2NOeT35
zzVQoo*LE$UD8kkY{D#>~r^68w0{ldSco7I5dxR7LCFN3*(wY>JPV-bJCLzjPW^!wt
z)oD={w)ENZ1(iaLS~L!W!|2dE@D(dR{GFMNd|lc97W{w_4F-(pfi=$E-rxN8oA~|#
DH1{1W

literal 0
HcmV?d00001