Skip to content

Commit d8573b2

Browse files
mrserbprrace
mrserb
authored and
prrace
committedNov 4, 2022
8294488: Delete KCMS transforms wrappers
Reviewed-by: prr
1 parent f857f79 commit d8573b2

File tree

9 files changed

+106
-263
lines changed

9 files changed

+106
-263
lines changed
 

‎src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java

+18-44
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,13 @@ public float[] toRGB(float[] colorvalue) {
200200
if (this2srgb == null) {
201201
synchronized (this) {
202202
if (this2srgb == null) {
203-
ColorTransform[] transforms = new ColorTransform[2];
204-
var srgb = (ICC_ColorSpace) getInstance(CS_sRGB);
205-
PCMM mdl = CMSManager.getModule();
206-
transforms[0] = mdl.createTransform(thisProfile,
207-
ColorTransform.Any, ColorTransform.In);
208-
transforms[1] = mdl.createTransform(srgb.getProfile(),
209-
ColorTransform.Any, ColorTransform.Out);
210203
if (needScaleInit) {
211204
setComponentScaling();
212205
}
213-
this2srgb = mdl.createTransform(transforms);
206+
var srgb = ICC_Profile.getInstance(CS_sRGB);
207+
PCMM mdl = CMSManager.getModule();
208+
this2srgb = mdl.createTransform(ColorTransform.Any,
209+
thisProfile, srgb);
214210
}
215211
}
216212
}
@@ -252,17 +248,13 @@ public float[] fromRGB(float[] rgbvalue) {
252248
if (srgb2this == null) {
253249
synchronized (this) {
254250
if (srgb2this == null) {
255-
ColorTransform[] transforms = new ColorTransform[2];
256-
var srgb = (ICC_ColorSpace) getInstance(CS_sRGB);
257-
PCMM mdl = CMSManager.getModule();
258-
transforms[0] = mdl.createTransform(srgb.getProfile(),
259-
ColorTransform.Any, ColorTransform.In);
260-
transforms[1] = mdl.createTransform(thisProfile,
261-
ColorTransform.Any, ColorTransform.Out);
262251
if (needScaleInit) {
263252
setComponentScaling();
264253
}
265-
srgb2this = mdl.createTransform(transforms);
254+
var srgb = ICC_Profile.getInstance(CS_sRGB);
255+
PCMM mdl = CMSManager.getModule();
256+
srgb2this = mdl.createTransform(ColorTransform.Any,
257+
srgb, thisProfile);
266258
}
267259
}
268260
}
@@ -384,23 +376,14 @@ public float[] toCIEXYZ(float[] colorvalue) {
384376
if (this2xyz == null) {
385377
synchronized (this) {
386378
if (this2xyz == null) {
387-
ColorTransform[] transforms = new ColorTransform[2];
388-
var xyz = (ICC_ColorSpace) getInstance(CS_CIEXYZ);
389-
PCMM mdl = CMSManager.getModule();
390-
try {
391-
transforms[0] = mdl.createTransform(thisProfile,
392-
ICC_Profile.icRelativeColorimetric,
393-
ColorTransform.In);
394-
} catch (CMMException e) {
395-
transforms[0] = mdl.createTransform(thisProfile,
396-
ColorTransform.Any, ColorTransform.In);
397-
}
398-
transforms[1] = mdl.createTransform(xyz.getProfile(),
399-
ColorTransform.Any, ColorTransform.Out);
400379
if (needScaleInit) {
401380
setComponentScaling();
402381
}
403-
this2xyz = mdl.createTransform(transforms);
382+
var xyz = ICC_Profile.getInstance(CS_CIEXYZ);
383+
PCMM mdl = CMSManager.getModule();
384+
this2xyz = mdl.createTransform(
385+
ICC_Profile.icRelativeColorimetric,
386+
thisProfile, xyz);
404387
}
405388
}
406389
}
@@ -524,23 +507,14 @@ public float[] fromCIEXYZ(float[] colorvalue) {
524507
if (xyz2this == null) {
525508
synchronized (this) {
526509
if (xyz2this == null) {
527-
ColorTransform[] transforms = new ColorTransform[2];
528-
var xyz = (ICC_ColorSpace) getInstance(CS_CIEXYZ);
529-
PCMM mdl = CMSManager.getModule();
530-
try {
531-
transforms[0] = mdl.createTransform(xyz.getProfile(),
532-
ICC_Profile.icRelativeColorimetric,
533-
ColorTransform.In);
534-
} catch (CMMException e) {
535-
transforms[0] = mdl.createTransform(xyz.getProfile(),
536-
ColorTransform.Any, ColorTransform.In);
537-
}
538-
transforms[1] = mdl.createTransform(thisProfile,
539-
ColorTransform.Any, ColorTransform.Out);
540510
if (needScaleInit) {
541511
setComponentScaling();
542512
}
543-
xyz2this = mdl.createTransform(transforms);
513+
var xyz = ICC_Profile.getInstance(CS_CIEXYZ);
514+
PCMM mdl = CMSManager.getModule();
515+
xyz2this = mdl.createTransform(
516+
ICC_Profile.icRelativeColorimetric,
517+
xyz, thisProfile);
544518
}
545519
}
546520
}

‎src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java

+16-78
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -355,8 +355,7 @@ private BufferedImage ICCBIFilter(BufferedImage src,
355355
private void updateBITransform(ICC_Profile srcProfile,
356356
ICC_Profile destProfile) {
357357
ICC_Profile[] theProfiles;
358-
int i1, nProfiles, nTransforms, whichTrans, renderState;
359-
ColorTransform[] theTransforms;
358+
int i1, nProfiles, nTransforms, renderingIntent;
360359
boolean useSrc = false, useDest = false;
361360

362361
nProfiles = profileList.length;
@@ -391,51 +390,20 @@ private void updateBITransform(ICC_Profile srcProfile,
391390
theProfiles[idx] = destProfile;
392391
}
393392

394-
/* make the transform list */
395-
theTransforms = new ColorTransform [nTransforms];
396-
397-
/* initialize transform get loop */
398393
if (theProfiles[0].getProfileClass() == ICC_Profile.CLASS_OUTPUT) {
399394
/* if first profile is a printer
400395
render as colorimetric */
401-
renderState = ICC_Profile.icRelativeColorimetric;
396+
renderingIntent = ICC_Profile.icRelativeColorimetric;
402397
}
403398
else {
404-
renderState = ICC_Profile.icPerceptual; /* render any other
399+
renderingIntent = ICC_Profile.icPerceptual; /* render any other
405400
class perceptually */
406401
}
407-
408-
whichTrans = ColorTransform.In;
409-
402+
/* or get this profile's rendering intent to select transform
403+
from next profiles? */
404+
//renderingIntent = getRenderingIntent(theProfiles[0]);
410405
PCMM mdl = CMSManager.getModule();
411-
412-
/* get the transforms from each profile */
413-
for (i1 = 0; i1 < nTransforms; i1++) {
414-
if (i1 == nTransforms -1) { /* last profile? */
415-
whichTrans = ColorTransform.Out; /* get output transform */
416-
}
417-
else { /* check for abstract profile */
418-
if ((whichTrans == ColorTransform.Simulation) &&
419-
(theProfiles[i1].getProfileClass () ==
420-
ICC_Profile.CLASS_ABSTRACT)) {
421-
renderState = ICC_Profile.icPerceptual;
422-
whichTrans = ColorTransform.In;
423-
}
424-
}
425-
426-
theTransforms[i1] = mdl.createTransform (
427-
theProfiles[i1], renderState, whichTrans);
428-
429-
/* get this profile's rendering intent to select transform
430-
from next profile */
431-
renderState = getRenderingIntent(theProfiles[i1]);
432-
433-
/* "middle" profiles use simulation transform */
434-
whichTrans = ColorTransform.Simulation;
435-
}
436-
437-
/* make the net transform */
438-
thisTransform = mdl.createTransform(theTransforms);
406+
thisTransform = mdl.createTransform(renderingIntent, theProfiles);
439407

440408
/* update corresponding source and dest profiles */
441409
thisSrcProfile = srcProfile;
@@ -497,54 +465,24 @@ public final WritableRaster filter (Raster src, WritableRaster dest) {
497465

498466
/* make a new transform if needed */
499467
if (thisRasterTransform == null) {
500-
int i1, whichTrans, renderState;
501-
ColorTransform[] theTransforms;
468+
int renderingIntent;
502469

503-
/* make the transform list */
504-
theTransforms = new ColorTransform [nProfiles];
505-
506-
/* initialize transform get loop */
507470
if (profileList[0].getProfileClass() == ICC_Profile.CLASS_OUTPUT) {
508471
/* if first profile is a printer
509472
render as colorimetric */
510-
renderState = ICC_Profile.icRelativeColorimetric;
473+
renderingIntent = ICC_Profile.icRelativeColorimetric;
511474
}
512475
else {
513-
renderState = ICC_Profile.icPerceptual; /* render any other
476+
renderingIntent = ICC_Profile.icPerceptual; /* render any other
514477
class perceptually */
515478
}
516479

517-
whichTrans = ColorTransform.In;
518-
480+
/* or get this profile's rendering intent to select transform
481+
from next profiles? */
482+
// renderingIntent = getRenderingIntent(profileList[i1]);
519483
PCMM mdl = CMSManager.getModule();
520-
521-
/* get the transforms from each profile */
522-
for (i1 = 0; i1 < nProfiles; i1++) {
523-
if (i1 == nProfiles -1) { /* last profile? */
524-
whichTrans = ColorTransform.Out; /* get output transform */
525-
}
526-
else { /* check for abstract profile */
527-
if ((whichTrans == ColorTransform.Simulation) &&
528-
(profileList[i1].getProfileClass () ==
529-
ICC_Profile.CLASS_ABSTRACT)) {
530-
renderState = ICC_Profile.icPerceptual;
531-
whichTrans = ColorTransform.In;
532-
}
533-
}
534-
535-
theTransforms[i1] = mdl.createTransform (
536-
profileList[i1], renderState, whichTrans);
537-
538-
/* get this profile's rendering intent to select transform
539-
from next profile */
540-
renderState = getRenderingIntent(profileList[i1]);
541-
542-
/* "middle" profiles use simulation transform */
543-
whichTrans = ColorTransform.Simulation;
544-
}
545-
546-
/* make the net transform */
547-
thisRasterTransform = mdl.createTransform(theTransforms);
484+
thisRasterTransform = mdl.createTransform(renderingIntent,
485+
profileList);
548486
}
549487

550488
int srcTransferType = src.getTransferType();

‎src/java.desktop/share/classes/java/awt/image/ColorModel.java

+19-38
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,15 @@
2828
import java.awt.Transparency;
2929
import java.awt.color.ColorSpace;
3030
import java.awt.color.ICC_ColorSpace;
31-
import sun.java2d.cmm.CMSManager;
32-
import sun.java2d.cmm.ColorTransform;
33-
import sun.java2d.cmm.PCMM;
31+
import java.awt.color.ICC_Profile;
32+
import java.util.Arrays;
3433
import java.util.Collections;
3534
import java.util.Map;
3635
import java.util.WeakHashMap;
37-
import java.util.Arrays;
36+
37+
import sun.java2d.cmm.CMSManager;
38+
import sun.java2d.cmm.ColorTransform;
39+
import sun.java2d.cmm.PCMM;
3840

3941
/**
4042
* The {@code ColorModel} abstract class encapsulates the
@@ -1791,15 +1793,10 @@ static byte[] getGray8TosRGB8LUT(ICC_ColorSpace grayCS) {
17911793
for (int i = 0; i <= 255; i++) {
17921794
g8Tos8LUT[i] = (byte) i;
17931795
}
1794-
ColorTransform[] transformList = new ColorTransform[2];
1796+
var srgb = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
17951797
PCMM mdl = CMSManager.getModule();
1796-
ICC_ColorSpace srgbCS =
1797-
(ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_sRGB);
1798-
transformList[0] = mdl.createTransform(
1799-
grayCS.getProfile(), ColorTransform.Any, ColorTransform.In);
1800-
transformList[1] = mdl.createTransform(
1801-
srgbCS.getProfile(), ColorTransform.Any, ColorTransform.Out);
1802-
ColorTransform t = mdl.createTransform(transformList);
1798+
ColorTransform t = mdl.createTransform(ColorTransform.Any,
1799+
grayCS.getProfile(), srgb);
18031800
byte[] tmp = t.colorConvert(g8Tos8LUT, null);
18041801
for (int i = 0, j= 2; i <= 255; i++, j += 3) {
18051802
// All three components of tmp should be equal, since
@@ -1832,15 +1829,10 @@ static byte[] getLinearGray16ToOtherGray8LUT(ICC_ColorSpace grayCS) {
18321829
for (int i = 0; i <= 65535; i++) {
18331830
tmp[i] = (short) i;
18341831
}
1835-
ColorTransform[] transformList = new ColorTransform[2];
1832+
var lg = ICC_Profile.getInstance(ColorSpace.CS_GRAY);
18361833
PCMM mdl = CMSManager.getModule();
1837-
ICC_ColorSpace lgCS =
1838-
(ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_GRAY);
1839-
transformList[0] = mdl.createTransform (
1840-
lgCS.getProfile(), ColorTransform.Any, ColorTransform.In);
1841-
transformList[1] = mdl.createTransform (
1842-
grayCS.getProfile(), ColorTransform.Any, ColorTransform.Out);
1843-
ColorTransform t = mdl.createTransform(transformList);
1834+
ColorTransform t = mdl.createTransform(ColorTransform.Any,
1835+
lg, grayCS.getProfile());
18441836
tmp = t.colorConvert(tmp, null);
18451837
byte[] lg16Toog8LUT = new byte[65536];
18461838
for (int i = 0; i <= 65535; i++) {
@@ -1876,15 +1868,10 @@ static byte[] getGray16TosRGB8LUT(ICC_ColorSpace grayCS) {
18761868
for (int i = 0; i <= 65535; i++) {
18771869
tmp[i] = (short) i;
18781870
}
1879-
ColorTransform[] transformList = new ColorTransform[2];
1871+
var srgb = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
18801872
PCMM mdl = CMSManager.getModule();
1881-
ICC_ColorSpace srgbCS =
1882-
(ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_sRGB);
1883-
transformList[0] = mdl.createTransform (
1884-
grayCS.getProfile(), ColorTransform.Any, ColorTransform.In);
1885-
transformList[1] = mdl.createTransform (
1886-
srgbCS.getProfile(), ColorTransform.Any, ColorTransform.Out);
1887-
ColorTransform t = mdl.createTransform(transformList);
1873+
ColorTransform t = mdl.createTransform(ColorTransform.Any,
1874+
grayCS.getProfile(), srgb);
18881875
tmp = t.colorConvert(tmp, null);
18891876
byte[] g16Tos8LUT = new byte[65536];
18901877
for (int i = 0, j= 2; i <= 65535; i++, j += 3) {
@@ -1921,16 +1908,10 @@ static short[] getLinearGray16ToOtherGray16LUT(ICC_ColorSpace grayCS) {
19211908
for (int i = 0; i <= 65535; i++) {
19221909
tmp[i] = (short) i;
19231910
}
1924-
ColorTransform[] transformList = new ColorTransform[2];
1911+
var lg = ICC_Profile.getInstance(ColorSpace.CS_GRAY);
19251912
PCMM mdl = CMSManager.getModule();
1926-
ICC_ColorSpace lgCS =
1927-
(ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_GRAY);
1928-
transformList[0] = mdl.createTransform (
1929-
lgCS.getProfile(), ColorTransform.Any, ColorTransform.In);
1930-
transformList[1] = mdl.createTransform(
1931-
grayCS.getProfile(), ColorTransform.Any, ColorTransform.Out);
1932-
ColorTransform t = mdl.createTransform(
1933-
transformList);
1913+
ColorTransform t = mdl.createTransform(ColorTransform.Any,
1914+
lg, grayCS.getProfile());
19341915
short[] lg16Toog16LUT = t.colorConvert(tmp, null);
19351916
if (lg16Toog16Map == null) {
19361917
lg16Toog16Map = Collections.synchronizedMap(new WeakHashMap<ICC_ColorSpace, short[]>(2));

‎src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -123,16 +123,11 @@ public void setTagData(Profile p, int tagSignature,
123123
}
124124

125125
/* methods for creating ColorTransforms */
126-
public ColorTransform createTransform(ICC_Profile profile,
127-
int renderType,
128-
int transformType) {
129-
System.err.println(cName + ".createTransform(ICC_Profile,int,int)");
130-
return tcmm.createTransform(profile, renderType, transformType);
131-
}
132-
133-
public ColorTransform createTransform(ColorTransform[] transforms) {
134-
System.err.println(cName + ".createTransform(ColorTransform[])");
135-
return tcmm.createTransform(transforms);
126+
public ColorTransform createTransform(int renderingIntent,
127+
ICC_Profile... profiles)
128+
{
129+
System.err.println(cName + ".createTransform(int, ICC_Profile...)");
130+
return tcmm.createTransform(renderingIntent, profiles);
136131
}
137132

138133
private static String signatureToString(int sig) {

‎src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,10 @@
3030
import java.awt.image.WritableRaster;
3131

3232
public interface ColorTransform {
33-
public int Any = -1;/* any rendering type, whichever is
34-
available */
33+
public int Any = -1;/* any rendering intent, whichever is available */
3534
/* search order is icPerceptual,
3635
icRelativeColorimetric, icSaturation */
3736

38-
/* Transform types */
39-
public int In = 1;
40-
public int Out = 2;
41-
public int Gamut = 3;
42-
public int Simulation = 4;
43-
4437
public int getNumInComponents();
4538
public int getNumOutComponents();
4639
public void colorConvert(BufferedImage src, BufferedImage dst);

‎src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -32,14 +32,12 @@
3232
public interface PCMM {
3333

3434
/* methods invoked from ICC_Profile */
35-
public Profile loadProfile(byte[] data);
36-
public byte[] getProfileData(Profile p);
37-
public byte[] getTagData(Profile p, int tagSignature);
38-
public void setTagData(Profile p, int tagSignature, byte[] data);
35+
Profile loadProfile(byte[] data);
36+
byte[] getProfileData(Profile p);
37+
byte[] getTagData(Profile p, int tagSignature);
38+
void setTagData(Profile p, int tagSignature, byte[] data);
3939

40-
/* methods for creating ColorTransforms */
41-
public ColorTransform createTransform(ICC_Profile profile, int renderType,
42-
int transformType);
43-
44-
public ColorTransform createTransform(ColorTransform[] transforms);
40+
/* Creates ColorTransform */
41+
ColorTransform createTransform(int renderingIntent,
42+
ICC_Profile... profiles);
4543
}

‎src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java

+8-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ public void setTagData(Profile p, int tagSignature, byte[] data) {
9999

100100
/* Helper method used from LCMSColorTransfrom */
101101
static long createTransform(
102-
LCMSProfile[] profiles, int renderType,
102+
LCMSProfile[] profiles, int renderingIntent,
103103
int inFormatter, boolean isInIntPacked,
104104
int outFormatter, boolean isOutIntPacked,
105105
Object disposerRef)
@@ -114,37 +114,26 @@ static long createTransform(
114114
ptrs[i] = profiles[i].getLcmsPtr();
115115
}
116116

117-
return createNativeTransform(ptrs, renderType, inFormatter,
117+
return createNativeTransform(ptrs, renderingIntent, inFormatter,
118118
isInIntPacked, outFormatter, isOutIntPacked, disposerRef);
119119
} finally {
120120
lock.unlockRead(stamp);
121121
}
122122
}
123123

124124
private static native long createNativeTransform(
125-
long[] profileIDs, int renderType,
125+
long[] profileIDs, int renderingIntent,
126126
int inFormatter, boolean isInIntPacked,
127127
int outFormatter, boolean isOutIntPacked,
128128
Object disposerRef);
129129

130-
/**
131-
* Constructs ColorTransform object corresponding to an ICC_profile
132-
*/
133-
public ColorTransform createTransform(ICC_Profile profile,
134-
int renderType,
135-
int transformType)
136-
{
137-
return new LCMSTransform(profile, renderType, renderType);
138-
}
139-
140130
/**
141-
* Constructs an ColorTransform object from a list of ColorTransform
142-
* objects
131+
* Constructs ColorTransform object corresponding to the ICC_profiles.
143132
*/
144-
public synchronized ColorTransform createTransform(
145-
ColorTransform[] transforms)
133+
public ColorTransform createTransform(int renderingIntent,
134+
ICC_Profile... profiles)
146135
{
147-
return new LCMSTransform(transforms);
136+
return new LCMSTransform(renderingIntent, profiles);
148137
}
149138

150139
/* methods invoked from LCMSTransform */

‎src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java

+27-52
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -68,58 +68,33 @@ private boolean match(LCMSImageLayout in, LCMSImageLayout out) {
6868
}
6969

7070
private volatile NativeTransform transform;
71-
ICC_Profile[] profiles;
72-
LCMSProfile[] lcmsProfiles;
73-
int renderType;
74-
int transformType;
75-
76-
private int numInComponents = -1;
77-
private int numOutComponents = -1;
78-
79-
public LCMSTransform(ICC_Profile profile, int renderType,
80-
int transformType)
81-
{
82-
/* Actually, it is not a complete transform but just part of it */
83-
profiles = new ICC_Profile[1];
84-
profiles[0] = profile;
85-
lcmsProfiles = new LCMSProfile[1];
86-
lcmsProfiles[0] = LCMS.getProfileID(profile);
87-
this.renderType = (renderType == ColorTransform.Any)?
88-
ICC_Profile.icPerceptual : renderType;
89-
this.transformType = transformType;
90-
91-
/* Note that ICC_Profile.getNumComponents() is quite expensive
92-
* (it may results in a reading of the profile header).
93-
* So, here we cache the number of components of input and
94-
* output profiles for further usage.
95-
*/
96-
numInComponents = profiles[0].getNumComponents();
97-
numOutComponents = profiles[profiles.length - 1].getNumComponents();
98-
}
71+
private final LCMSProfile[] lcmsProfiles;
72+
private final int renderingIntent;
9973

100-
public LCMSTransform (ColorTransform[] transforms) {
101-
int size = 0;
102-
for (int i=0; i < transforms.length; i++) {
103-
size+=((LCMSTransform)transforms[i]).profiles.length;
104-
}
105-
profiles = new ICC_Profile[size];
106-
lcmsProfiles = new LCMSProfile[size];
107-
int j = 0;
108-
for (int i=0; i < transforms.length; i++) {
109-
LCMSTransform curTrans = (LCMSTransform)transforms[i];
110-
System.arraycopy(curTrans.profiles, 0, profiles, j,
111-
curTrans.profiles.length);
112-
System.arraycopy(curTrans.lcmsProfiles, 0, lcmsProfiles, j,
113-
curTrans.lcmsProfiles.length);
114-
j += curTrans.profiles.length;
115-
}
116-
renderType = ((LCMSTransform)transforms[0]).renderType;
74+
private final int numInComponents;
75+
private final int numOutComponents;
11776

118-
/* Note that ICC_Profile.getNumComponents() is quite expensive
119-
* (it may results in a reading of the profile header).
120-
* So, here we cache the number of components of input and
121-
* output profiles for further usage.
122-
*/
77+
/**
78+
* Creates a transform based on the list of profiles and rendering intent.
79+
* The first profile will be considered input, and the last profile will be
80+
* considered output.
81+
*
82+
* @param renderingIntent the desired rendering intent, could be ignored if
83+
* unsupported. If the {@link ColorTransform#Any} is passed then we
84+
* will try to use {@code ICC_Profile.icPerceptual} intent.
85+
* @param profiles the list of color profiles
86+
*/
87+
LCMSTransform(int renderingIntent, ICC_Profile... profiles) {
88+
lcmsProfiles = new LCMSProfile[profiles.length];
89+
for (int i = 0; i < profiles.length; i++) {
90+
lcmsProfiles[i] = LCMS.getProfileID(profiles[i]);
91+
profiles[i].getNumComponents(); // force header initialization
92+
}
93+
this.renderingIntent = (renderingIntent == ColorTransform.Any) ?
94+
ICC_Profile.icPerceptual : renderingIntent;
95+
// Note that ICC_Profile.getNumComponents() is quite expensive (it may
96+
// result in a reading of the profile header). So, here we cache the
97+
// number of components of input and output profiles for further usage.
12398
numInComponents = profiles[0].getNumComponents();
12499
numOutComponents = profiles[profiles.length - 1].getNumComponents();
125100
}
@@ -146,7 +121,7 @@ private void doTransform(LCMSImageLayout in, LCMSImageLayout out) {
146121
tfm.outFormatter = out.pixelType;
147122
tfm.isOutIntPacked = out.isIntPacked;
148123

149-
tfm.ID = LCMS.createTransform(lcmsProfiles, renderType,
124+
tfm.ID = LCMS.createTransform(lcmsProfiles, renderingIntent,
150125
tfm.inFormatter,
151126
tfm.isInIntPacked,
152127
tfm.outFormatter,

‎src/java.desktop/share/native/liblcms/LCMS.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static void ThrowIllegalArgumentException(JNIEnv *env, const char *msg) {
141141
* Signature: ([JIIZIZLjava/lang/Object;)J
142142
*/
143143
JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_createNativeTransform
144-
(JNIEnv *env, jclass cls, jlongArray profileIDs, jint renderType,
144+
(JNIEnv *env, jclass cls, jlongArray profileIDs, jint renderingIntent,
145145
jint inFormatter, jboolean isInIntPacked,
146146
jint outFormatter, jboolean isOutIntPacked, jobject disposerRef)
147147
{
@@ -200,7 +200,7 @@ JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_createNativeTransform
200200
}
201201

202202
sTrans = cmsCreateMultiprofileTransform(iccArray, j,
203-
inFormatter, outFormatter, renderType, cmsFLAGS_COPY_ALPHA);
203+
inFormatter, outFormatter, renderingIntent, cmsFLAGS_COPY_ALPHA);
204204

205205
(*env)->ReleaseLongArrayElements(env, profileIDs, ids, 0);
206206

0 commit comments

Comments
 (0)
Please sign in to comment.