changeset in /hg/icedtea6: 2009-04-02 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Thu Apr 2 06:48:16 PDT 2009
changeset ba7703f67b22 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ba7703f67b22
description:
2009-04-02 Lillian Angel <langel at redhat.com>
* patches/icedtea-lcms.patch: Updated with most recent security fixes.
diffstat:
2 files changed, 216 insertions(+), 155 deletions(-)
ChangeLog | 4
patches/icedtea-lcms.patch | 367 +++++++++++++++++++++++++-------------------
diffs (truncated from 923 to 500 lines):
diff -r 6a51f2c4db71 -r ba7703f67b22 ChangeLog
--- a/ChangeLog Tue Mar 31 17:28:50 2009 -0400
+++ b/ChangeLog Thu Apr 02 09:48:22 2009 -0400
@@ -1,3 +1,7 @@ 2009-03-31 Omair Majid <omajid at redhat.
+2009-04-02 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-lcms.patch: Updated with most recent security fixes.
+
2009-03-31 Omair Majid <omajid at redhat.com>
* test/jtreg/excludelist.jdk.jtx: Revert previous change.
diff -r 6a51f2c4db71 -r ba7703f67b22 patches/icedtea-lcms.patch
--- a/patches/icedtea-lcms.patch Tue Mar 31 17:28:50 2009 -0400
+++ b/patches/icedtea-lcms.patch Thu Apr 02 09:48:22 2009 -0400
@@ -1,6 +1,6 @@ diff -bBruN openjdkold/jdk/src/share/nat
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2009-03-24 14:11:33.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -79,9 +79,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
}
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2009-03-24 14:16:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -118,9 +118,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
#else
VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2009-03-24 14:17:09.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -285,8 +285,6 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ const char *id;
+ WRITEMODE as;
+ } PROPERTY;
-+
-+static PROPERTY PredefinedProperties[] = {
- "NUMBER_OF_FIELDS", // Required - NUMBER OF FIELDS
- "NUMBER_OF_SETS", // Required - NUMBER OF SETS
@@ -299,6 +297,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
- "MANUFACTURE", // Some broken Fuji targets does store this value
- "PROD_DATE", // Identifies year and month of production of the target in the form yyyy:mm.
- "SERIAL", // Uniquely identifies individual physical target.
++static PROPERTY PredefinedProperties[] = {
+
+- "MATERIAL", // Identifies the material on which the target was produced using a code
+ {"NUMBER_OF_FIELDS", WRITE_UNCOOKED}, // Required - NUMBER OF FIELDS
+ {"NUMBER_OF_SETS", WRITE_UNCOOKED}, // Required - NUMBER OF SETS
+ {"ORIGINATOR", WRITE_STRINGIFY}, // Required - Identifies the specific system, organization or individual that created the data file.
@@ -310,8 +311,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ {"MANUFACTURE", WRITE_STRINGIFY}, // Some broken Fuji targets does store this value
+ {"PROD_DATE", WRITE_STRINGIFY}, // Identifies year and month of production of the target in the form yyyy:mm.
+ {"SERIAL", WRITE_STRINGIFY}, // Uniquely identifies individual physical target.
-
-- "MATERIAL", // Identifies the material on which the target was produced using a code
++
+ {"MATERIAL", WRITE_STRINGIFY}, // Identifies the material on which the target was produced using a code
// uniquely identifying th e material. This is intend ed to be used for IT8.7
// physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
@@ -337,8 +337,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
- // measurement. Allowed values are “black”, “white”, or "na".
+ {"SAMPLE_BACKING", WRITE_STRINGIFY}, // Identifies the backing material used behind the sample during
+ // measurement. Allowed values are “black”, “white”, or {"na".
-
-- "CHISQ_DOF" // Degrees of freedom associated with the Chi squared statistic
++
+ {"CHISQ_DOF", WRITE_STRINGIFY}, // Degrees of freedom associated with the Chi squared statistic
+
+// new in recent specs:
@@ -372,7 +371,8 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ {"TARGET_TYPE", WRITE_STRINGIFY}, // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
+
+ {"COLORANT", WRITE_STRINGIFY}, // Identifies the colorant(s) used in creating the target.
-+
+
+- "CHISQ_DOF" // Degrees of freedom associated with the Chi squared statistic
+ {"TABLE_DESCRIPTOR", WRITE_STRINGIFY}, // Describes the purpose or contents of a data table.
+
+ {"TABLE_NAME", WRITE_STRINGIFY} // Provides a short name for a data table.
@@ -408,7 +408,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
"STDEV_B", // Standard deviation of b*
"STDEV_DE", // Standard deviation of CIE dE
"CHI_SQD_PAR"}; // The average of the standard deviations of L*, a* and b*. It is
-@@ -397,9 +458,13 @@
+@@ -397,57 +458,119 @@
#define NUMPREDEFINEDSAMPLEID (sizeof(PredefinedSampleID)/sizeof(char *))
@@ -422,8 +422,6 @@ diff -bBruN openjdkold/jdk/src/share/nat
+LCMSBOOL isseparator(int c)
{
return (c == ' ') || (c == '\t') || (c == '\r');
- }
-@@ -405,49 +470,107 @@
}
// Checks whatever if c is a valid identifier char
@@ -494,7 +492,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ return TRUE;
+}
+
-
++
+// Make sure no exploit is being even tried
+
+static
@@ -506,7 +504,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ return str;
+}
+
-+
+
+// Syntax error
static
-BOOL SynError(LPIT8 it8, const char *Txt, ...)
@@ -591,18 +589,18 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ if(_cmsMakePath(it8->str, it8->FileStack[it8->IncludeSP]->FileName, FileNest->FileName) == FALSE)
+ {
+ SynError(it8, "File path too long");
+ return;
+ }
+
+- it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
++ FileNest->Stream = fopen(FileNest->FileName, "rt");
++ if (FileNest->Stream == NULL) {
++
++ SynError(it8, "File %s not found", FileNest->FileName);
+ return;
+ }
-+
-+ FileNest->Stream = fopen(FileNest->FileName, "rt");
-+ if (FileNest->Stream == NULL) {
-+
-+ SynError(it8, "File %s not found", FileNest->FileName);
- return;
- }
+ it8->IncludeSP++;
-
-- it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
++
it8 ->ch = ' ';
InSymbol(it8);
}
@@ -1564,9 +1562,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
{
LPIT8 it8 = (LPIT8) hIT8;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2009-03-24 14:17:18.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1592,9 +1590,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
+
+
+
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2009-03-24 14:17:24.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1624,9 +1622,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
strcat(Buffer1, Buffer2);
MessageBox(NULL, Buffer1, "Little cms",
MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2009-03-24 14:17:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1771,9 +1769,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2009-03-24 14:17:50.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1875,9 +1873,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
}
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2009-03-24 14:17:59.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1914,9 +1912,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
f = ((Value - b) / a);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2009-03-24 14:18:22.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -1964,23 +1962,23 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ if (len == 0) {
+ return 0;
+ }
-
-- if (ResData -> Pointer + len > ResData -> Size){
++
+ if (len / size != count) {
+ cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with count / size.");
+ return 0;
+ }
-
-- len = (ResData -> Size - ResData -> Pointer);
-- cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
++
+ if (extent < len || extent < ResData -> Pointer) {
+ cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with len.");
+ return 0;
+ }
-+
+
+- if (ResData -> Pointer + len > ResData -> Size){
+ if (ResData -> Pointer + len > ResData -> Size) {
-+ len = (ResData -> Size - ResData -> Pointer);
+ len = (ResData -> Size - ResData -> Pointer);
+- cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
+-
+ cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
+ return 0;
}
@@ -2293,7 +2291,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
_cmsInitTag(Icc, sig, sizeof(cmsNAMEDCOLORLIST) + (nc ->nColors - 1) * sizeof(cmsNAMEDCOLOR), nc);
- return FALSE;
+ return TRUE;
- }
++}
+
+
+LCMSBOOL LCMSEXPORT _cmsAddChromaticAdaptationTag(cmsHPROFILE hProfile, icTagSignature sig, const cmsCIEXYZ* mat)
@@ -2303,12 +2301,12 @@ diff -bBruN openjdkold/jdk/src/share/nat
+ _cmsInitTag(Icc, sig, 3*sizeof(cmsCIEXYZ), mat);
+ return TRUE;
+
-+}
-+
-+
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2009-03-24 14:18:32.000000000 -0400
+ }
++
++
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -2476,7 +2474,7 @@ diff -bBruN openjdkold/jdk/src/share/nat
NewLUT -> T = PtrW;
NewLUT -> Tsize = (unsigned int) (nTabSize * sizeof(WORD));
-@@ -589,12 +628,12 @@
+@@ -589,25 +628,37 @@
*PtrW++ = TO16_TAB(Temp[i]);
}
@@ -2488,10 +2486,6 @@ diff -bBruN openjdkold/jdk/src/share/nat
NewLUT ->Tsize = 0;
- NewLUT -> wFlags &= ~LUT_HAS3DGRID;
+ NewLUT ->wFlags &= ~LUT_HAS3DGRID;
- }
-
-
-@@ -598,16 +637,28 @@
}
@@ -2985,14 +2979,15 @@ diff -bBruN openjdkold/jdk/src/share/nat
- case icSigLut8Type: ReadLUT8(Icc, NewLUT, sig); break;
- case icSigLut16Type: ReadLUT16(Icc, NewLUT); break;
+-
+- case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
+- case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
+ case icSigLut8Type: if (!ReadLUT8(Icc, NewLUT, sig)) {
+ cmsFreeLUT(NewLUT);
+ return NULL;
+ }
+ break;
-
-- case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
-- case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
++
+ case icSigLut16Type: if (!ReadLUT16(Icc, NewLUT)) {
+ cmsFreeLUT(NewLUT);
+ return NULL;
@@ -4284,9 +4279,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
- return TRUE;
-}
-
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2009-03-24 14:18:49.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -4442,9 +4437,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
&Lut -> In16params);
Lut ->wFlags &= ~LUT_HASTL1;
}
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2009-03-24 14:19:12.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -4505,9 +4500,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
}
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2009-03-24 14:19:17.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -4569,9 +4564,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
{
MAT3 m, a_1;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2009-03-24 14:19:23.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -4630,9 +4625,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
{
_LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2009-03-24 14:19:30.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2009-03-26 15:13:30.000000000 -0400
@@ -28,7 +28,7 @@
// file:
//
@@ -4814,9 +4809,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
break;
default:;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2009-03-24 14:19:46.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -4826,9 +4821,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the "Software"),
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2009-03-24 14:19:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -5004,14 +4999,14 @@ diff -bBruN openjdkold/jdk/src/share/nat
- if (lIsAbsolute) {
+ cmsCIEXYZ White;
-+
+
+- // For absolute colorimetric intent, do nothing
+ cmsTakeMediaWhitePoint(&White, hProfile);
-- // For absolute colorimetric intent, do nothing
+- Writef(m, "%% Absolute colorimetric -- no transformation\n"
+ Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
+ Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
-
-- Writef(m, "%% Absolute colorimetric -- no transformation\n"
++
+ Writef(m, "%% Absolute colorimetric -- encode to relative to maximize LUT usage\n"
"/TransformPQR [\n"
- "{exch pop exch pop exch pop exch pop} bind dup dup]\n");
@@ -5190,9 +5185,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
// Finally, return used byte count
return dwBytesUsed;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2009-03-24 14:20:03.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -5302,9 +5297,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
{
WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2009-03-24 14:20:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -5457,9 +5452,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
Lut -> InputChan = 3;
Lut -> OutputChan = 1;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2009-03-24 14:20:20.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2009-03-26 15:13:30.000000000 -0400
@@ -29,7 +29,7 @@
//
//
@@ -5614,9 +5609,9 @@ diff -bBruN openjdkold/jdk/src/share/nat
if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
(cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
(cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2009-03-24 14:20:26.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2009-03-26 15:18:47.000000000 -0400
@@ -29,7 +29,7 @@
//
More information about the distro-pkg-dev
mailing list