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
Reviewed-by: prr
  • Loading branch information
mrserb committed Sep 25, 2023
1 parent be9cc73 commit e5f05b5
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");
}
}
}

3 comments on commit e5f05b5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@mrserb
Copy link
Member Author

@mrserb mrserb commented on e5f05b5 Nov 9, 2023

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on e5f05b5 Nov 9, 2023

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch mrserb-backport-e5f05b5a in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e5f05b5a from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 25 Sep 2023 and was reviewed by Phil Race.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git mrserb-backport-e5f05b5a:mrserb-backport-e5f05b5a
$ git checkout mrserb-backport-e5f05b5a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git mrserb-backport-e5f05b5a

Please sign in to comment.