Support for ICC Parametric curves type 1-4 (#1691)

* Support for ICC Parametric curves type 1-4

Signed-off-by: Rémi Achard <[email protected]>

* Add warning about paraCurve characteristics, fix clamp and improve unit tests

Signed-off-by: Rémi Achard <[email protected]>

* Windows CI fixes

Signed-off-by: Rémi Achard <[email protected]>

Signed-off-by: Rémi Achard <[email protected]>

Author: remia

ext/sampleicc/src/include/iccProfileReader.h

@@ -486,7 +486,7 @@ namespace SampleICC
     class IccParametricCurveTypeReader : public IccTypeReader
     {
     public:
-        IccParametricCurveTypeReader() : mnNumParam(0), mParam(NULL) {}
+        IccParametricCurveTypeReader() : mFunctionType(0), mnNumParam(0), mParam(NULL) {}
         ~IccParametricCurveTypeReader()
         {
             if (mParam)
@@ -498,7 +498,6 @@ namespace SampleICC
         virtual bool Read(std::istream & istream, icUInt32Number size)
         {
             // Tag size include sig that has already been read.
-            icUInt16Number functionType;
             icUInt16Number res16;
             icUInt32Number res32;
 
@@ -517,15 +516,10 @@ namespace SampleICC
                 return false;
 
             if (!Read32(istream, &res32, 1)
-                || !Read16(istream, &functionType, 1)
+                || !Read16(istream, &mFunctionType, 1)
                 || !Read16(istream, &res16, 1))
                 return false;
 
-            if (0 != functionType) {
-                // unsupported function type
-                return false;
-            }
-
             if (!mnNumParam) {
                 mnNumParam = (icUInt16Number)((size - nHdrSize) / sizeof(icS15Fixed16Number));
                 mParam = new icS15Fixed16Number[mnNumParam];
@@ -535,14 +529,21 @@ namespace SampleICC
                 if (nHdrSize + mnNumParam * sizeof(icS15Fixed16Number) > size)
                     return false;
 
-                if (!Read32(istream, mParam, 1)) {
-                    return false;
+                for (int i = 0; i < mnNumParam; ++i) {
+                    if (!Read32(istream, mParam + i, 1)) {
+                        return false;
+                    }
                 }
             }
 
             return true;
         }
 
+        const icUInt16Number GetFunctionType() const
+        {
+            return mFunctionType;
+        }
+
         const icS15Fixed16Number * GetParam() const
         {
             return mParam;
@@ -554,6 +555,7 @@ namespace SampleICC
         }
 
     private:
+        icUInt16Number      mFunctionType;
         icUInt16Number      mnNumParam;
         icS15Fixed16Number *mParam;
 
@@ -802,4 +804,3 @@ namespace SampleICC
 }
 
 #endif
-