src/share/native/sun/java2d/cmm/lcms/cmsio1.c

*** 337,348 ****
  // is adjusted here in order to create a LUT that takes care of all those details.
  // We add intent = -1 as a way to read matrix shaper always, no matter of other LUT
  cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent)
  {
      cmsTagTypeSignature OriginalType;
!     cmsTagSignature tag16    = Device2PCS16[Intent];
!     cmsTagSignature tagFloat = Device2PCSFloat[Intent];
      cmsContext ContextID = cmsGetProfileContextID(hProfile);
  
      // On named color, take the appropiate tag
      if (cmsGetDeviceClass(hProfile) == cmsSigNamedColorClass) {
  
--- 337,348 ----
  // is adjusted here in order to create a LUT that takes care of all those details.
  // We add intent = -1 as a way to read matrix shaper always, no matter of other LUT
  cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent)
  {
      cmsTagTypeSignature OriginalType;
!     cmsTagSignature tag16;
!     cmsTagSignature tagFloat;
      cmsContext ContextID = cmsGetProfileContextID(hProfile);
  
      // On named color, take the appropiate tag
      if (cmsGetDeviceClass(hProfile) == cmsSigNamedColorClass) {
  
*** 367,376 ****
--- 367,379 ----
  
      // This is an attempt to reuse this funtion to retrieve the matrix-shaper as pipeline no
      // matter other LUT are present and have precedence. Intent = -1 means just this.
      if (Intent != -1) {
  
+         tag16 = Device2PCS16[Intent];
+         tagFloat = Device2PCSFloat[Intent];
+ 
          if (cmsIsTag(hProfile, tagFloat)) {  // Float tag takes precedence
  
              // Floating point LUT are always V4, but the encoding range is no
              // longer 0..1.0, so we need to add an stage depending on the color space
              return _cmsReadFloatInputTag(hProfile, tagFloat);
*** 609,625 ****
  
  // Create an output MPE LUT from agiven profile. Version mismatches are handled here
  cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent)
  {
      cmsTagTypeSignature OriginalType;
!     cmsTagSignature tag16    = PCS2Device16[Intent];
!     cmsTagSignature tagFloat = PCS2DeviceFloat[Intent];
      cmsContext ContextID     = cmsGetProfileContextID(hProfile);
  
  
      if (Intent != -1) {
  
          if (cmsIsTag(hProfile, tagFloat)) {  // Float tag takes precedence
  
              // Floating point LUT are always V4
              return _cmsReadFloatOutputTag(hProfile, tagFloat);
          }
--- 612,631 ----
  
  // Create an output MPE LUT from agiven profile. Version mismatches are handled here
  cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent)
  {
      cmsTagTypeSignature OriginalType;
!     cmsTagSignature tag16;
!     cmsTagSignature tagFloat;
      cmsContext ContextID  = cmsGetProfileContextID(hProfile);
  
  
      if (Intent != -1) {
  
+         tag16 = PCS2Device16[Intent];
+         tagFloat = PCS2DeviceFloat[Intent];
+ 
          if (cmsIsTag(hProfile, tagFloat)) {  // Float tag takes precedence
  
              // Floating point LUT are always V4
              return _cmsReadFloatOutputTag(hProfile, tagFloat);
          }
*** 933,943 ****
  // Dump the contents of profile sequence in both tags (if v4 available)
  cmsBool _cmsWriteProfileSequence(cmsHPROFILE hProfile, const cmsSEQ* seq)
  {
      if (!cmsWriteTag(hProfile, cmsSigProfileSequenceDescTag, seq)) return FALSE;
  
!     if (cmsGetProfileVersion(hProfile) >= 4.0) {
  
              if (!cmsWriteTag(hProfile, cmsSigProfileSequenceIdTag, seq)) return FALSE;
      }
  
      return TRUE;
--- 939,949 ----
  // Dump the contents of profile sequence in both tags (if v4 available)
  cmsBool _cmsWriteProfileSequence(cmsHPROFILE hProfile, const cmsSEQ* seq)
  {
      if (!cmsWriteTag(hProfile, cmsSigProfileSequenceDescTag, seq)) return FALSE;
  
!     if (cmsGetEncodedICCversion(hProfile) >= 0x4000000) {
  
              if (!cmsWriteTag(hProfile, cmsSigProfileSequenceIdTag, seq)) return FALSE;
      }
  
      return TRUE;