More fixes from Artifex

More fixes from Artifex Thank you!
mm2 · May 26, 2020 · 2021357 · 2021357
1 parent d881cc6
commit 2021357
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/cmsplugin.c b/src/cmsplugin.c
@@ -187,6 +187,8 @@ cmsBool CMSEXPORT  _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n)
            return TRUE;
         #elif defined (__BORLANDC__)
            return TRUE;
+        #elif !defined(_MSC_VER) && (defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L)
+           return TRUE;
         #else
 
            // fpclassify() required by C99 (only provided by MSVC >= 1800, VS2013 onwards)

diff --git a/src/cmsps2.c b/src/cmsps2.c
@@ -432,14 +432,14 @@ void EmitLab2XYZ(cmsIOHANDLER* m)
 }
 
 static
-void EmitSafeGuardBegin(cmsIOHANDLER* m, char* name)
+void EmitSafeGuardBegin(cmsIOHANDLER* m, const char* name)
 {
     _cmsIOPrintf(m, "%%LCMS2: Save previous definition of %s on the operand stack\n", name);
     _cmsIOPrintf(m, "currentdict /%s known { /%s load } { null } ifelse\n", name, name);
 }
 
 static
-void EmitSafeGuardEnd(cmsIOHANDLER* m, char* name, int depth)
+void EmitSafeGuardEnd(cmsIOHANDLER* m, const char* name, int depth)
 {
     _cmsIOPrintf(m, "%%LCMS2: Restore previous definition of %s\n", name);
     if (depth > 1) {
@@ -452,7 +452,7 @@ void EmitSafeGuardEnd(cmsIOHANDLER* m, char* name, int depth)
 // Outputs a table of words. It does use 16 bits
 
 static
-void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table, char* name)
+void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table, const char* name)
 {
     cmsUInt32Number i;
     cmsFloat64Number gamma;
@@ -538,7 +538,7 @@ cmsBool GammaTableEquals(cmsUInt16Number* g1, cmsUInt16Number* g2, cmsUInt32Numb
 // Does write a set of gamma curves
 
 static
-void EmitNGamma(cmsIOHANDLER* m, cmsUInt32Number n, cmsToneCurve* g[], char* nameprefix)
+void EmitNGamma(cmsIOHANDLER* m, cmsUInt32Number n, cmsToneCurve* g[], const char* nameprefix)
 {
     cmsUInt32Number i;
     static char buffer[2048];

diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h
@@ -112,6 +112,13 @@
         #define isinf(x) (!_finite((x)))
 # endif
 
+#if !defined(_MSC_VER) && (defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L)
+        #if !defined(isinf)
+        #define isinf(x) (!finite((x)))
+        #endif
+#endif
+
+
 #endif
 
 // A fast way to convert from/to 16 <-> 8 bits