Skip to content

Commit

Permalink
8312191: ColorConvertOp.filter for the default destination is too slow
Browse files Browse the repository at this point in the history
Backport-of: e5f05b5a963774914751d9c241dd5693ed06af0b
  • Loading branch information
mrserb committed Nov 16, 2023
1 parent 245885b commit d603f8a
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 2 deletions.
23 changes: 21 additions & 2 deletions src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023, 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
Expand Down Expand Up @@ -560,7 +560,7 @@ public BufferedImage createCompatibleDestImage (BufferedImage src,
"Destination ColorSpace is undefined");
}
ICC_Profile destProfile = profileList[nProfiles - 1];
cs = new ICC_ColorSpace(destProfile);
cs = createCompatibleColorSpace(destProfile);
} else {
/* non-ICC case */
int nSpaces = CSList.length;
Expand All @@ -570,6 +570,25 @@ public BufferedImage createCompatibleDestImage (BufferedImage src,
return createCompatibleDestImage(src, destCM, cs);
}

private static ColorSpace createCompatibleColorSpace(ICC_Profile profile) {
if (profile == ICC_Profile.getInstance(ColorSpace.CS_sRGB)) {
return ColorSpace.getInstance(ColorSpace.CS_sRGB);
}
if (profile == ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)) {
return ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB);
}
if (profile == ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)) {
return ColorSpace.getInstance(ColorSpace.CS_CIEXYZ);
}
if (profile == ICC_Profile.getInstance(ColorSpace.CS_PYCC)) {
return ColorSpace.getInstance(ColorSpace.CS_PYCC);
}
if (profile == ICC_Profile.getInstance(ColorSpace.CS_GRAY)) {
return ColorSpace.getInstance(ColorSpace.CS_GRAY);
}
return new ICC_ColorSpace(profile);
}

private BufferedImage createCompatibleDestImage(BufferedImage src,
ColorModel destCM,
ColorSpace destCS) {
Expand Down
61 changes: 61 additions & 0 deletions test/jdk/sun/java2d/cmm/ColorConvertOp/CompatibleColorSpace.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Copyright Amazon.com Inc. 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.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
import java.awt.image.ColorConvertOp;

/**
* @test
* @bug 8312191
* @summary Standard color spaces should be reused for CompatibleDestImage
*/
public final class CompatibleColorSpace {

private static final int[] spaces = {
ColorSpace.CS_CIEXYZ, ColorSpace.CS_GRAY, ColorSpace.CS_LINEAR_RGB,
ColorSpace.CS_PYCC, ColorSpace.CS_sRGB
};

public static void main(String[] args) {
for (int from : spaces) {
for (int to : spaces) {
test(from, to);
}
}
}

private static void test(int from, int to) {
ColorSpace srcCS = ColorSpace.getInstance(from);
ColorSpace dstCS = ColorSpace.getInstance(to);
ColorConvertOp op = new ColorConvertOp(srcCS, dstCS, null);
BufferedImage src = new BufferedImage(10, 10,
BufferedImage.TYPE_INT_ARGB);
BufferedImage dst = op.filter(src, null);
// dst image is not set and will be created automatically, the dstCS
// should be reused
if (dst.getColorModel().getColorSpace() != dstCS) {
throw new RuntimeException("Wrong color space");
}
}
}

1 comment on commit d603f8a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.