Permalink
1 comment
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8012229: [lcms] Improve performance of color conversion for images wi…
…th alpha channel Reviewed-by: azvegint
- Loading branch information
Showing
with
206 additions
and 13 deletions.
- +12 −6 src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
- +18 −2 src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
- +1 −1 src/java.desktop/share/native/liblcms/LCMS.c
- +5 −4 test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java
- +170 −0 test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlphaDifferentSrcDst.java
There are no files selected for viewing
| @@ -0,0 +1,170 @@ | ||
| /* | ||
| * Copyright (c) 2021, 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.awt.AlphaComposite; | ||
| import java.awt.Graphics2D; | ||
| import java.awt.color.ColorSpace; | ||
| import java.awt.image.BufferedImage; | ||
| import java.awt.image.ColorConvertOp; | ||
|
|
||
| import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; | ||
| import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR; | ||
| import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE; | ||
| import static java.awt.image.BufferedImage.TYPE_BYTE_BINARY; | ||
| import static java.awt.image.BufferedImage.TYPE_BYTE_GRAY; | ||
| import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; | ||
| import static java.awt.image.BufferedImage.TYPE_INT_ARGB; | ||
| import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; | ||
| import static java.awt.image.BufferedImage.TYPE_INT_BGR; | ||
| import static java.awt.image.BufferedImage.TYPE_INT_RGB; | ||
| import static java.awt.image.BufferedImage.TYPE_USHORT_555_RGB; | ||
| import static java.awt.image.BufferedImage.TYPE_USHORT_565_RGB; | ||
| import static java.awt.image.BufferedImage.TYPE_USHORT_GRAY; | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8012229 | ||
| * @summary one more test to check the alpha channel | ||
| */ | ||
| public final class ColCvtAlphaDifferentSrcDst { | ||
|
|
||
| private static final int WIDTH = 256; | ||
| private static final int HEIGHT = 256; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| differentToOpaqueDst(); | ||
| differentToTransparentDst(TYPE_INT_ARGB); | ||
| differentToTransparentDst(TYPE_4BYTE_ABGR); | ||
| differentToTransparentDst(TYPE_INT_ARGB_PRE); | ||
| } | ||
|
|
||
| /** | ||
| * Various types of source images transform to the opaque destination, the | ||
| * result should be the same. | ||
| */ | ||
| private static void differentToOpaqueDst() { | ||
| opaqueDst(TYPE_INT_ARGB, TYPE_INT_RGB); | ||
| opaqueDst(TYPE_INT_ARGB, TYPE_INT_BGR); | ||
| opaqueDst(TYPE_4BYTE_ABGR, TYPE_INT_BGR); | ||
|
|
||
| // It is unclear how to hangle pre colors in the opaque DST | ||
| //opaqueDst(TYPE_INT_ARGB_PRE, TYPE_4BYTE_ABGR_PRE); | ||
| //opaqueDst(TYPE_4BYTE_ABGR_PRE, TYPE_INT_BGR); | ||
| } | ||
|
|
||
| /** | ||
| * Transparent types of source images transform to the transparent | ||
| * destination, the alpha channel should be the same in src/dst. | ||
| */ | ||
| private static void differentToTransparentDst(int typeDst) { | ||
| transparentDst(TYPE_INT_RGB, typeDst); | ||
| transparentDst(TYPE_INT_ARGB, typeDst); | ||
| transparentDst(TYPE_INT_ARGB_PRE, typeDst); | ||
| transparentDst(TYPE_INT_BGR, typeDst); | ||
| transparentDst(TYPE_3BYTE_BGR, typeDst); | ||
| transparentDst(TYPE_4BYTE_ABGR, typeDst); | ||
| transparentDst(TYPE_4BYTE_ABGR_PRE, typeDst); | ||
| transparentDst(TYPE_USHORT_565_RGB, typeDst); | ||
| transparentDst(TYPE_USHORT_555_RGB, typeDst); | ||
| transparentDst(TYPE_BYTE_GRAY, typeDst); | ||
| transparentDst(TYPE_USHORT_GRAY, typeDst); | ||
| transparentDst(TYPE_BYTE_BINARY, typeDst); | ||
| transparentDst(TYPE_BYTE_INDEXED, typeDst); | ||
| } | ||
|
|
||
| private static void opaqueDst(int transparent, int opaque) { | ||
| ColorSpace to = ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB); | ||
| ColorSpace from = ColorSpace.getInstance(ColorSpace.CS_sRGB); | ||
| ColorConvertOp op = new ColorConvertOp(from, to, null); | ||
| // Source data | ||
| BufferedImage timgSrc = createSrc(transparent); | ||
| BufferedImage oimgSrc = createSrc(opaque); | ||
|
|
||
| // Destination data | ||
| BufferedImage timgDst = createDst(TYPE_INT_RGB); | ||
| BufferedImage oimgDst = createDst(TYPE_INT_RGB); | ||
|
|
||
| op.filter(timgSrc, timgDst); | ||
| op.filter(oimgSrc, oimgDst); | ||
|
|
||
| validate(timgDst, oimgDst, false); | ||
| } | ||
|
|
||
| private static void transparentDst(int typeSrc, int typeDst) { | ||
| ColorSpace to = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ); | ||
| ColorSpace from = ColorSpace.getInstance(ColorSpace.CS_sRGB); | ||
| ColorConvertOp op = new ColorConvertOp(from, to, null); | ||
|
|
||
| BufferedImage src = createSrc(typeSrc); | ||
| BufferedImage dst = createDst(typeDst); | ||
|
|
||
| op.filter(src, dst); | ||
|
|
||
| validate(src, dst, true); | ||
| } | ||
|
|
||
| private static void validate(BufferedImage img1, BufferedImage img2, | ||
| boolean alphaOnly) { | ||
| for (int i = 0; i < WIDTH; i++) { | ||
| for (int j = 0; j < HEIGHT; j++) { | ||
| int rgb1 = img1.getRGB(i, j); | ||
| int rgb2 = img2.getRGB(i, j); | ||
| if (alphaOnly) { | ||
| rgb1 |= 0x00FFFFFF; | ||
| rgb2 |= 0x00FFFFFF; | ||
| } | ||
| if (rgb1 != rgb2) { | ||
| System.out.println("rgb1 = " + Integer.toHexString(rgb1)); | ||
| System.out.println("rgb2 = " + Integer.toHexString(rgb2)); | ||
| throw new RuntimeException(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static BufferedImage createSrc(int type) { | ||
| BufferedImage img = new BufferedImage(WIDTH, HEIGHT, type); | ||
| fill(img); | ||
| return img; | ||
| } | ||
|
|
||
| private static BufferedImage createDst(int type) { | ||
| BufferedImage img = new BufferedImage(WIDTH, HEIGHT, type); | ||
|
|
||
| Graphics2D g = img.createGraphics(); | ||
| g.setComposite(AlphaComposite.Clear); | ||
| g.fillRect(0, 0, WIDTH, HEIGHT); | ||
| g.dispose(); | ||
|
|
||
| return img; | ||
| } | ||
|
|
||
| private static void fill(BufferedImage image) { | ||
| for (int i = 0; i < WIDTH; i++) { | ||
| for (int j = 0; j < HEIGHT; j++) { | ||
| image.setRGB(i, j, | ||
| (i << 24) | (i << 16) | (j << 8) | ((i + j) >> 1)); | ||
| } | ||
| } | ||
| } | ||
| } |
This comment has been minimized.
16acfafReview
Issues