rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-lcms.patch, 1.1, 1.2 java-1.6.0-openjdk.spec, 1.113, 1.114
Lillian Angel
langel at fedoraproject.org
Tue Mar 24 18:47:00 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31025
Modified Files:
java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec
Log Message:
* Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-17.b14
- Updated java-1.6.0-openjdk-lcms.patch.
java-1.6.0-openjdk-lcms.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 java-1.6.0-openjdk-lcms.patch
Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-lcms.patch 20 Mar 2009 15:43:47 -0000 1.1
+++ java-1.6.0-openjdk-lcms.patch 24 Mar 2009 18:46:59 -0000 1.2
@@ -1,403 +1,6590 @@
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2009-03-20 11:12:53.000000000 -0400
-@@ -1445,7 +1445,17 @@
- #endif
+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
+@@ -29,7 +29,7 @@
+ //
+ //
+ // Little cms
+-// Copyright (C) 1998-2006 Marti Maria
++// Copyright (C) 1998-2007 Marti Maria
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -51,7 +51,7 @@
+
+
+
+-// CIECAM 02 appearance model
++// CIECAM 02 appearance model. Many thanks to Jordi Vilar for the debugging.
+
+ #include "lcms.h"
+
+@@ -196,6 +196,10 @@
+ clr.RGBpa[i] = (400.0 * temp) / (temp + 27.13) + 0.1;
+ }
+ }
++
++ clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] +
++ (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb;
++
+ return clr;
}
+@@ -249,9 +253,6 @@
+ clr.H = 300 + ((100*((clr.h - 237.53)/1.2)) / temp);
+ }
+
+- clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] +
+- (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb;
-
-+LCMS_INLINE void* _cmsCalloc(size_t nmemb, size_t size)
-+{
-+ size_t alloc = nmemb * size;
-+ if (size == 0) {
-+ return malloc(0);
-+ }
-+ if (alloc / size != nmemb) {
-+ return NULL;
-+ }
-+ return malloc(alloc);
-+}
+ clr.J = 100.0 * pow((clr.A / pMod->adoptedWhite.A),
+ (pMod->c * pMod->z));
- // Clamp with saturation
+@@ -395,7 +396,7 @@
+ LPcmsCIECAM02 lpMod;
-@@ -2061,6 +2071,11 @@
- // Build a tone curve for K->K' if possible (only works on CMYK)
- LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
-+// Validates a LUT
-+BOOL cdecl _cmsValidateLUT(LPLUT NewLUT);
-+
+- if((lpMod = (LPcmsCIECAM02) malloc(sizeof(cmsCIECAM02))) == NULL) {
++ if((lpMod = (LPcmsCIECAM02) _cmsMalloc(sizeof(cmsCIECAM02))) == NULL) {
+ return (LCMSHANDLE) NULL;
+ }
+
+@@ -449,14 +450,19 @@
+ lpMod -> z = compute_z(lpMod);
+ lpMod -> Nbb = computeNbb(lpMod);
+ lpMod -> FL = computeFL(lpMod);
++
++ if (lpMod -> D == D_CALCULATE ||
++ lpMod -> D == D_CALCULATE_DISCOUNT) {
+
+ lpMod -> D = computeD(lpMod);
++ }
++
+ lpMod -> Ncb = lpMod -> Nbb;
+
+ lpMod -> adoptedWhite = XYZtoCAT02(lpMod -> adoptedWhite);
+ lpMod -> adoptedWhite = ChromaticAdaptation(lpMod -> adoptedWhite, lpMod);
+ lpMod -> adoptedWhite = CAT02toHPE(lpMod -> adoptedWhite);
+ lpMod -> adoptedWhite = NonlinearCompression(lpMod -> adoptedWhite, lpMod);
+- lpMod -> adoptedWhite = ComputeCorrelates(lpMod -> adoptedWhite, lpMod);
+
+ return (LCMSHANDLE) lpMod;
+
+@@ -465,7 +471,7 @@
+ void LCMSEXPORT cmsCIECAM02Done(LCMSHANDLE hModel)
+ {
+ LPcmsCIECAM02 lpMod = (LPcmsCIECAM02) (LPSTR) hModel;
+- if (lpMod) free(lpMod);
++ if (lpMod) _cmsFree(lpMod);
+ }
+
+
+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
+@@ -29,7 +29,7 @@
+ //
+ //
+ // Little cms
+-// Copyright (C) 1998-2006 Marti Maria
++// Copyright (C) 1998-2007 Marti Maria
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -174,7 +174,7 @@
+ LCMSAPI void LCMSEXPORT cmsCIECAM97sDone(LCMSHANDLE hModel)
+ {
+ LPcmsCIECAM97s lpMod = (LPcmsCIECAM97s) (LPSTR) hModel;
+- if (lpMod) free(lpMod);
++ if (lpMod) _cmsFree(lpMod);
+ }
+
+ // Partial discounting for adaptation degree computation
+@@ -331,7 +331,7 @@
+ LPcmsCIECAM97s lpMod;
+ VEC3 tmp;
+
+- if((lpMod = (LPcmsCIECAM97s) malloc(sizeof(cmsCIECAM97s))) == NULL) {
++ if((lpMod = (LPcmsCIECAM97s) _cmsMalloc(sizeof(cmsCIECAM97s))) == NULL) {
+ return (LCMSHANDLE) NULL;
+ }
+
+@@ -449,7 +449,7 @@
+
+ // RGB_subw = [MlamRigg][WP/YWp]
+ #ifdef USE_CIECAM97s2
+- MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, (LPVEC3) &lpMod -> WP);
++ MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &lpMod -> WP);
+ #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
+@@ -29,7 +29,7 @@
+ //
+ //
+ // Little cms
+-// Copyright (C) 1998-2006 Marti Maria
++// Copyright (C) 1998-2007 Marti Maria
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -65,22 +65,25 @@
+ // Persistence
+ LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
+ LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName);
+
+ // Properties
+ LCMSAPI const char* LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8);
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
+
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
+
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val);
+-LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char* cSubProp, const char *Val);
++LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer);
+
+ LCMSAPI const char* LCMSEXPORT cmsIT8GetProperty(LCMSHANDLE hIT8, const char* cProp);
+ LCMSAPI double LCMSEXPORT cmsIT8GetPropertyDbl(LCMSHANDLE hIT8, const char* cProp);
+-LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, char ***PropertyNames);
++LCMSAPI const char* LCMSEXPORT cmsIT8GetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char *cSubProp);
++LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, const char ***PropertyNames);
++LCMSAPI int LCMSEXPORT cmsIT8EnumPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char*** SubpropertyNames);
+
+ // Datasets
+
+@@ -89,10 +92,10 @@
+ LCMSAPI const char* LCMSEXPORT cmsIT8GetDataRowCol(LCMSHANDLE IT8, int row, int col);
+ LCMSAPI double LCMSEXPORT cmsIT8GetDataRowColDbl(LCMSHANDLE IT8, int col, int row);
[...6502 lines suppressed...]
++LCMS_INLINE void* _cmsCalloc(size_t nmemb, size_t size)
++{
++ size_t alloc = nmemb * size;
++ if (alloc < nmemb || alloc < size) {
++ return NULL;
++ }
++ return _cmsMalloc(alloc);
++}
++
++LCMS_INLINE void _cmsFree(void *Ptr)
++{
++ if (Ptr) free(Ptr);
++}
++
++#endif
++
+ // ------------------------------------------------------------------------------------------- end of inline functions
+
+ // Signal error from inside lcms code
+@@ -1542,8 +1554,8 @@
+ void cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
+ void cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
+ void cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
+-BOOL cdecl VEC3equal(LPWVEC3 a, LPWVEC3 b, double Tolerance);
+-BOOL cdecl VEC3equalF(LPVEC3 a, LPVEC3 b, double Tolerance);
++LCMSBOOL cdecl VEC3equal(LPWVEC3 a, LPWVEC3 b, double Tolerance);
++LCMSBOOL cdecl VEC3equalF(LPVEC3 a, LPVEC3 b, double Tolerance);
+ void cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
+ void cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
+ void cdecl VEC3saturate(LPVEC3 v);
+@@ -1554,13 +1566,13 @@
+ void cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
+ void cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
+ int cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
+-BOOL cdecl MAT3solve(LPVEC3 x, LPMAT3 a, LPVEC3 b);
++LCMSBOOL cdecl MAT3solve(LPVEC3 x, LPMAT3 a, LPVEC3 b);
+ double cdecl MAT3det(LPMAT3 m);
+ void cdecl MAT3eval(LPVEC3 r, LPMAT3 a, LPVEC3 v);
+ void cdecl MAT3toFix(LPWMAT3 r, LPMAT3 v);
+ void cdecl MAT3fromFix(LPMAT3 r, LPWMAT3 v);
+ void cdecl MAT3evalW(LPWVEC3 r, LPWMAT3 a, LPWVEC3 v);
+-BOOL cdecl MAT3isIdentity(LPWMAT3 a, double Tolerance);
++LCMSBOOL cdecl MAT3isIdentity(LPWMAT3 a, double Tolerance);
+ void cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
+
+ // Is a table linear?
+@@ -1609,7 +1621,7 @@
+ void cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
+ void cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
+ void cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
+- BOOL lUseTetrahedral, LPL16PARAMS p);
++ LCMSBOOL lUseTetrahedral, LPL16PARAMS p);
+
+ WORD cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
+ Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
+@@ -1693,7 +1705,7 @@
+
+ // Gray axes fixup. Only on v2 8-bit Lab LUT
+
+- BOOL FixGrayAxes;
++ LCMSBOOL FixGrayAxes;
+
+
+ // Parameters used for curve creation
+@@ -1704,7 +1716,7 @@
+ }; // LUT, FAR* LPLUT;
+
+
+-BOOL cdecl _cmsSmoothEndpoints(LPWORD Table, int nEntries);
++LCMSBOOL cdecl _cmsSmoothEndpoints(LPWORD Table, int nEntries);
+
+
+ // CRC of gamma tables
+@@ -1722,7 +1734,7 @@
+
+ void cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
+ void cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
+-BOOL cdecl cmsSmoothSampledCurve(LPSAMPLEDCURVE Tab, double SmoothingLambda);
++LCMSBOOL cdecl cmsSmoothSampledCurve(LPSAMPLEDCURVE Tab, double SmoothingLambda);
+ void cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
+
+ LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
+@@ -1756,7 +1768,7 @@
+ void cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
+ void cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
+
+-BOOL cdecl cmsReadICCMatrixRGB2XYZ(LPMAT3 r, cmsHPROFILE hProfile);
++LCMSBOOL cdecl cmsReadICCMatrixRGB2XYZ(LPMAT3 r, cmsHPROFILE hProfile);
+
+ LPMATSHAPER cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
+ LPMATSHAPER cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
+@@ -1764,11 +1776,11 @@
+
+
+ // White Point & Primary chromas handling
+-BOOL cdecl cmsAdaptationMatrix(LPMAT3 r, LPMAT3 ConeMatrix, LPcmsCIEXYZ FromIll, LPcmsCIEXYZ ToIll);
+-BOOL cdecl cmsAdaptMatrixToD50(LPMAT3 r, LPcmsCIExyY SourceWhitePt);
+-BOOL cdecl cmsAdaptMatrixFromD50(LPMAT3 r, LPcmsCIExyY DestWhitePt);
++LCMSBOOL cdecl cmsAdaptationMatrix(LPMAT3 r, LPMAT3 ConeMatrix, LPcmsCIEXYZ FromIll, LPcmsCIEXYZ ToIll);
++LCMSBOOL cdecl cmsAdaptMatrixToD50(LPMAT3 r, LPcmsCIExyY SourceWhitePt);
++LCMSBOOL cdecl cmsAdaptMatrixFromD50(LPMAT3 r, LPcmsCIExyY DestWhitePt);
+
+-BOOL cdecl cmsReadChromaticAdaptationMatrix(LPMAT3 r, cmsHPROFILE hProfile);
++LCMSBOOL cdecl cmsReadChromaticAdaptationMatrix(LPMAT3 r, cmsHPROFILE hProfile);
+
+ // Inter-PCS conversion routines. They assume D50 as white point.
+ void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
+@@ -1783,7 +1795,7 @@
+ LPcmsNAMEDCOLORLIST cdecl cmsAllocNamedColorList(int n);
+ int cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
+ void cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
+-BOOL cdecl cmsAppendNamedColor(cmsHTRANSFORM xform, const char* Name, WORD PCS[3], WORD Colorant[MAXCHANNELS]);
++LCMSBOOL cdecl cmsAppendNamedColor(cmsHTRANSFORM xform, const char* Name, WORD PCS[3], WORD Colorant[MAXCHANNELS]);
+
+
+ // I/O
+@@ -1827,8 +1839,8 @@
+
+ char PhysicalFile[MAX_PATH];
+
+- BOOL IsWrite;
+- BOOL SaveAs8Bits;
++ LCMSBOOL IsWrite;
++ LCMSBOOL SaveAs8Bits;
+
+ struct tm Created;
+
+@@ -1836,14 +1848,13 @@
+
+ size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
+
+- BOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset);
+- BOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
++ LCMSBOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset);
++ LCMSBOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
+ size_t (* Tell)(struct _lcms_iccprofile_struct* Icc);
+- BOOL (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
+
+ // Writting
+
+- BOOL (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr);
++ LCMSBOOL (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr);
+
+ size_t UsedSpace;
+
+@@ -1855,7 +1866,7 @@
+ cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
+
+ // Search into tag dictionary
+-icInt32Number cdecl _cmsSearchTag(LPLCMSICCPROFILE Profile, icTagSignature sig, BOOL lSignalError);
++icInt32Number cdecl _cmsSearchTag(LPLCMSICCPROFILE Profile, icTagSignature sig, LCMSBOOL lSignalError);
+
+ // Search for a particular tag, replace if found or add new one else
+ LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
+@@ -1871,6 +1882,7 @@
+
+ // These macros unpack format specifiers into integers
+
++#define T_DITHER(s) (((s)>>22)&1)
+ #define T_COLORSPACE(s) (((s)>>16)&31)
+ #define T_SWAPFIRST(s) (((s)>>14)&1)
+ #define T_FLAVOR(s) (((s)>>13)&1)
+@@ -1967,7 +1979,7 @@
+
+ // Flag for transform involving v4 profiles
+
+- BOOL lInputV4Lab, lOutputV4Lab;
++ LCMSBOOL lInputV4Lab, lOutputV4Lab;
+
+
+ // 1-pixel cache
+@@ -2014,7 +2026,7 @@
+
+ // Clamping & Gamut handling
+
+-BOOL cdecl _cmsEndPointsBySpace(icColorSpaceSignature Space,
++LCMSBOOL cdecl _cmsEndPointsBySpace(icColorSpaceSignature Space,
+ WORD **White, WORD **Black, int *nOutputs);
+
+ WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
+@@ -2043,7 +2055,7 @@
+ LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
+
+ // Hot fixes bad profiles
+-BOOL cdecl _cmsFixWhiteMisalignment(_LPcmsTRANSFORM p);
++LCMSBOOL cdecl _cmsFixWhiteMisalignment(_LPcmsTRANSFORM p);
+
+ // Marks LUT as 8 bit on input
+ LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
+@@ -2061,6 +2073,10 @@
+ // Build a tone curve for K->K' if possible (only works on CMYK)
+ LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
+
++// Validates a LUT
++LCMSBOOL cdecl _cmsValidateLUT(LPLUT NewLUT);
++
++
+ // These are two VITAL macros, from converting between 8 and 16 bit
+ // representation.
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- java-1.6.0-openjdk.spec 24 Mar 2009 11:58:34 -0000 1.113
+++ java-1.6.0-openjdk.spec 24 Mar 2009 18:47:00 -0000 1.114
@@ -120,7 +120,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 16.%{openjdkver}%{?dist}
+Release: 17.%{openjdkver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -925,6 +925,9 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-17.b14
+- Updated java-1.6.0-openjdk-lcms.patch.
+
* Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-16.b14
- Added java-1.6.0-openjdk-securitypatches.patch.
- Updated release.
More information about the fedora-extras-commits
mailing list