src/java.desktop/share/native/liblcms/cmscnvrt.c

*** 28,38 ****
  // file:
  //
  //---------------------------------------------------------------------------------
  //
  //  Little Color Management System
! //  Copyright (c) 1998-2012 Marti Maria Saguer
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
  // to deal in the Software without restriction, including without limitation
  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
--- 28,38 ----
  // file:
  //
  //---------------------------------------------------------------------------------
  //
  //  Little Color Management System
! //  Copyright (c) 1998-2016 Marti Maria Saguer
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
  // to deal in the Software without restriction, including without limitation
  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
*** 134,144 ****
      { INTENT_PRESERVE_K_PLANE_RELATIVE_COLORIMETRIC,"Relative colorimetric preserving black plane", BlackPreservingKPlaneIntents, &DefaultIntents[9] },
      { INTENT_PRESERVE_K_PLANE_SATURATION,           "Saturation preserving black plane",            BlackPreservingKPlaneIntents, NULL }
  };
  
  
! // A pointer to the begining of the list
  _cmsIntentsPluginChunkType _cmsIntentsPluginChunk = { NULL };
  
  // Duplicates the zone of memory used by the plug-in in the new context
  static
  void DupPluginIntentsList(struct _cmsContext_struct* ctx,
--- 134,144 ----
      { INTENT_PRESERVE_K_PLANE_RELATIVE_COLORIMETRIC,"Relative colorimetric preserving black plane", BlackPreservingKPlaneIntents, &DefaultIntents[9] },
      { INTENT_PRESERVE_K_PLANE_SATURATION,           "Saturation preserving black plane",            BlackPreservingKPlaneIntents, NULL }
  };
  
  
! // A pointer to the beginning of the list
  _cmsIntentsPluginChunkType _cmsIntentsPluginChunk = { NULL };
  
  // Duplicates the zone of memory used by the plug-in in the new context
  static
  void DupPluginIntentsList(struct _cmsContext_struct* ctx,
*** 297,306 ****
--- 297,307 ----
                                 cmsMAT3* m)
  {
      cmsMAT3 Scale, m1, m2, m3, m4;
  
      // TODO: Follow Marc Mahy's recommendation to check if CHAD is same by using M1*M2 == M2*M1. If so, do nothing.
+     // TODO: Add support for ArgyllArts tag
  
      // Adaptation state
      if (AdaptationState == 1.0) {
  
          // Observer is fully adapted. Keep chromatic adaptation.
*** 915,925 ****
          // Cannot find a suitable value, so use colorimetric xform
          // which is already stored in Out[]
          return TRUE;
      }
  
!     // Make sure to pass thru K (which now is fixed)
      Outf[3] = LabK[3];
  
      // Apply TAC if needed
      SumCMY   = Outf[0]  + Outf[1] + Outf[2];
      SumCMYK  = SumCMY + Outf[3];
--- 916,926 ----
          // Cannot find a suitable value, so use colorimetric xform
          // which is already stored in Out[]
          return TRUE;
      }
  
!     // Make sure to pass through K (which now is fixed)
      Outf[3] = LabK[3];
  
      // Apply TAC if needed
      SumCMY   = Outf[0]  + Outf[1] + Outf[2];
      SumCMYK  = SumCMY + Outf[3];
*** 983,993 ****
  
  
      memset(&bp, 0, sizeof(bp));
  
      // We need the input LUT of the last profile, assuming this one is responsible of
!     // black generation. This LUT will be seached in inverse order.
      bp.LabK2cmyk = _cmsReadInputLUT(hProfiles[nProfiles-1], INTENT_RELATIVE_COLORIMETRIC);
      if (bp.LabK2cmyk == NULL) goto Cleanup;
  
      // Get total area coverage (in 0..1 domain)
      bp.MaxTAC = cmsDetectTAC(hProfiles[nProfiles-1]) / 100.0;
--- 984,994 ----
  
  
      memset(&bp, 0, sizeof(bp));
  
      // We need the input LUT of the last profile, assuming this one is responsible of
!     // black generation. This LUT will be searched in inverse order.
      bp.LabK2cmyk = _cmsReadInputLUT(hProfiles[nProfiles-1], INTENT_RELATIVE_COLORIMETRIC);
      if (bp.LabK2cmyk == NULL) goto Cleanup;
  
      // Get total area coverage (in 0..1 domain)
      bp.MaxTAC = cmsDetectTAC(hProfiles[nProfiles-1]) / 100.0;