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

*** 28,38 ****
  // file:
  //
  //---------------------------------------------------------------------------------
  //
  //  Little Color Management System
! //  Copyright (c) 1998-2014 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,
*** 1165,1183 ****
      }
  
      // If no way, then force CLUT that for sure can be written
      if (AllowedLUT == NULL) {
  
          dwFlags |= cmsFLAGS_FORCE_CLUT;
          _cmsOptimizePipeline(ContextID, &LUT, xform ->RenderingIntent, &FrmIn, &FrmOut, &dwFlags);
  
          // Put identity curves if needed
!         if (cmsPipelineGetPtrToFirstStage(LUT) ->Type != cmsSigCurveSetElemType)
               if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, ChansIn)))
                   goto Error;
  
!         if (cmsPipelineGetPtrToLastStage(LUT) ->Type != cmsSigCurveSetElemType)
               if (!cmsPipelineInsertStage(LUT, cmsAT_END,   _cmsStageAllocIdentityCurves(ContextID, ChansOut)))
                   goto Error;
  
          AllowedLUT = FindCombination(LUT, Version >= 4.0, DestinationTag);
      }
--- 1165,1188 ----
      }
  
      // If no way, then force CLUT that for sure can be written
      if (AllowedLUT == NULL) {
  
+         cmsStage* FirstStage;
+         cmsStage* LastStage;
+ 
          dwFlags |= cmsFLAGS_FORCE_CLUT;
          _cmsOptimizePipeline(ContextID, &LUT, xform ->RenderingIntent, &FrmIn, &FrmOut, &dwFlags);
  
          // Put identity curves if needed
!         FirstStage = cmsPipelineGetPtrToFirstStage(LUT);
!         if (FirstStage != NULL && FirstStage ->Type != cmsSigCurveSetElemType)
               if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, ChansIn)))
                   goto Error;
  
!         LastStage = cmsPipelineGetPtrToLastStage(LUT);
!         if (LastStage != NULL && LastStage ->Type != cmsSigCurveSetElemType)
               if (!cmsPipelineInsertStage(LUT, cmsAT_END,   _cmsStageAllocIdentityCurves(ContextID, ChansOut)))
                   goto Error;
  
          AllowedLUT = FindCombination(LUT, Version >= 4.0, DestinationTag);
      }