Hi,
this adds the missing fields pointed out by JAPI (classpath vs. jdk-1.5).
Please comment/commit.
Thanks,
Carsten
2006-07-19 Carsten Neumann <[EMAIL PROTECTED]>
* ICC_Profile.java (icHdrProfileID): New field.
(icICCAbsoluteColorimetric): Likewise.
(icMediaRelativeColorimetric): Likewise.
(icSigBlueMatrixColumnTag): Likewise.
(icSigChromaticAdaptationTag): Likewise.
(icSigColorantOrderTag): Likewise.
(icSigColorantTableTag): Likewise.
(icSigGreenMatrixColumnTag): Likewise.
(icSigRedMatrixColumnTag): Likewise.
Index: java/awt/color/ICC_Profile.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/color/ICC_Profile.java,v
retrieving revision 1.13
diff -u -r1.13 ICC_Profile.java
--- java/awt/color/ICC_Profile.java 3 Oct 2005 17:21:07 -0000 1.13
+++ java/awt/color/ICC_Profile.java 19 Jul 2006 17:29:55 -0000
@@ -1,5 +1,5 @@
/* ICC_Profile.java -- color space profiling
- Copyright (C) 2000, 2002, 2004 Free Software Foundation
+ Copyright (C) 2000, 2002, 2004, 2006 Free Software Foundation
This file is part of GNU Classpath.
@@ -145,8 +145,10 @@
*/
public static final int icPerceptual = 0;
public static final int icRelativeColorimetric = 1;
+ public static final int icMediaRelativeColorimetric = 1;
public static final int icSaturation = 2;
public static final int icAbsoluteColorimetric = 3;
+ public static final int icICCAbsoluteColorimetric = 3;
/**
* Tag signatures
@@ -154,13 +156,17 @@
public static final int icSigAToB0Tag = 0x41324230; // 'A2B0'
public static final int icSigAToB1Tag = 0x41324231; // 'A2B1'
public static final int icSigAToB2Tag = 0x41324232; // 'A2B2'
- public static final int icSigBlueColorantTag = 0x6258595A; // 'bXYZ'
+ public static final int icSigBlueColorantTag = 0x6258595A; // 'bXYZ'
+ public static final int icSigBlueMatrixColumnTag = 0x6258595A; // 'bXYZ'
public static final int icSigBlueTRCTag = 0x62545243; // 'bTRC'
public static final int icSigBToA0Tag = 0x42324130; // 'B2A0'
public static final int icSigBToA1Tag = 0x42324131; // 'B2A1'
public static final int icSigBToA2Tag = 0x42324132; // 'B2A2'
public static final int icSigCalibrationDateTimeTag = 0x63616C74; // 'calt'
- public static final int icSigCharTargetTag = 0x74617267; // 'targ'
+ public static final int icSigCharTargetTag = 0x74617267; // 'targ'
+ public static final int icSigChromaticAdaptationTag = 0x63686164; // 'chad'
+ public static final int icSigColorantOrderTag = 0x636C726F; // 'clro'
+ public static final int icSigColorantTableTag = 0x636C7274; // 'clrt'
public static final int icSigCopyrightTag = 0x63707274; // 'cprt'
public static final int icSigCrdInfoTag = 0x63726469; // 'crdi'
public static final int icSigDeviceMfgDescTag = 0x646D6E64; // 'dmnd'
@@ -169,6 +175,7 @@
public static final int icSigGamutTag = 0x67616D74; // 'gamt'
public static final int icSigGrayTRCTag = 0x6b545243; // 'kTRC'
public static final int icSigGreenColorantTag = 0x6758595A; // 'gXYZ'
+ public static final int icSigGreenMatrixColumnTag = 0x6758595A; // 'gXYZ'
public static final int icSigGreenTRCTag = 0x67545243; // 'gTRC'
public static final int icSigLuminanceTag = 0x6C756d69; // 'lumi'
public static final int icSigMeasurementTag = 0x6D656173; // 'meas'
@@ -188,6 +195,7 @@
public static final int icSigPs2CSATag = 0x70733273; // 'ps2s'
public static final int icSigPs2RenderingIntentTag = 0x70733269; // 'ps2i'
public static final int icSigRedColorantTag = 0x7258595A; // 'rXYZ'
+ public static final int icSigRedMatrixColumnTag = 0x7258595A; // 'rXYZ'
public static final int icSigRedTRCTag = 0x72545243; // 'rTRC'
public static final int icSigScreeningDescTag = 0x73637264; // 'scrd'
public static final int icSigScreeningTag = 0x7363726E; // 'scrn'
@@ -214,6 +222,7 @@
public static final int icHdrDate = 24;
public static final int icHdrMagic = 36;
public static final int icHdrPlatform = 40;
+ public static final int icHdrProfileId = 84;
public static final int icHdrFlags = 44;
public static final int icHdrManufacturer = 48;
public static final int icHdrModel = 52;