Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8256321: Some "inactive" color profiles use the wrong profile class
Reviewed-by: prr
  • Loading branch information
mrserb committed Jan 5, 2021
1 parent 9f15164 commit a6c088131bfeec1ce44e43b513ce3f857fa6e44f
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 2 deletions.
@@ -857,7 +857,7 @@ public static ICC_Profile getInstance (int cspace) {
ProfileDeferralInfo pInfo =
new ProfileDeferralInfo("CIEXYZ.pf",
ColorSpace.TYPE_XYZ, 3,
CLASS_DISPLAY);
CLASS_ABSTRACT);
XYZprofile = getDeferredInstance(pInfo);
}
thisProfile = XYZprofile;
@@ -871,7 +871,7 @@ public static ICC_Profile getInstance (int cspace) {
ProfileDeferralInfo pInfo =
new ProfileDeferralInfo("PYCC.pf",
ColorSpace.TYPE_3CLR, 3,
CLASS_DISPLAY);
CLASS_COLORSPACECONVERSION);
PYCCprofile = getDeferredInstance(pInfo);
}
thisProfile = PYCCprofile;
@@ -0,0 +1,85 @@
/*
* Copyright (c) 2020, 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.color.ColorSpace;
import java.awt.color.ICC_Profile;

import static java.awt.color.ColorSpace.TYPE_3CLR;
import static java.awt.color.ColorSpace.TYPE_GRAY;
import static java.awt.color.ColorSpace.TYPE_RGB;
import static java.awt.color.ColorSpace.TYPE_XYZ;
import static java.awt.color.ICC_Profile.CLASS_ABSTRACT;
import static java.awt.color.ICC_Profile.CLASS_COLORSPACECONVERSION;
import static java.awt.color.ICC_Profile.CLASS_DISPLAY;

/**
* @test
* @bug 8256321
* @summary Verifies profile properties are the same before/after activation
*/
public final class CheckDefaultProperties {

public static void main(String[] args) {
ICC_Profile srgb = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
ICC_Profile gray = ICC_Profile.getInstance(ColorSpace.CS_GRAY);
ICC_Profile xyz = ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ);
ICC_Profile lrgb = ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB);
ICC_Profile pycc = ICC_Profile.getInstance(ColorSpace.CS_PYCC);

// check default values, before profile activation
test(srgb, TYPE_RGB, 3, CLASS_DISPLAY);
test(gray, TYPE_GRAY, 1, CLASS_DISPLAY);
test(xyz, TYPE_XYZ, 3, CLASS_ABSTRACT);
test(lrgb, TYPE_RGB, 3, CLASS_DISPLAY);
test(pycc, TYPE_3CLR, 3, CLASS_COLORSPACECONVERSION);

// activate profiles
srgb.getData();
gray.getData();
xyz.getData();
lrgb.getData();
pycc.getData();

// check default values, after profile activation
test(srgb, TYPE_RGB, 3, CLASS_DISPLAY);
test(gray, TYPE_GRAY, 1, CLASS_DISPLAY);
test(xyz, TYPE_XYZ, 3, CLASS_ABSTRACT);
test(lrgb, TYPE_RGB, 3, CLASS_DISPLAY);
test(pycc, TYPE_3CLR, 3, CLASS_COLORSPACECONVERSION);
}

private static void test(ICC_Profile profile, int type, int num, int pcls) {
int profileClass = profile.getProfileClass();
int colorSpaceType = profile.getColorSpaceType();
int numComponents = profile.getNumComponents();
if (profileClass != pcls) {
throw new RuntimeException("Wrong profile class: " + profileClass);
}
if (colorSpaceType != type) {
throw new RuntimeException("Wrong profile type: " + colorSpaceType);
}
if (numComponents != num) {
throw new RuntimeException("Wrong profile comps: " + numComponents);
}
}
}

0 comments on commit a6c0881

Please sign in to comment.