Skip to content

Commit 2021357

Browse files
committed
More fixes from Artifex
More fixes from Artifex Thank you!
1 parent d881cc6 commit 2021357

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/cmsplugin.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n)
187187
return TRUE;
188188
#elif defined (__BORLANDC__)
189189
return TRUE;
190+
#elif !defined(_MSC_VER) && (defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L)
191+
return TRUE;
190192
#else
191193

192194
// fpclassify() required by C99 (only provided by MSVC >= 1800, VS2013 onwards)

src/cmsps2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,14 +432,14 @@ void EmitLab2XYZ(cmsIOHANDLER* m)
432432
}
433433

434434
static
435-
void EmitSafeGuardBegin(cmsIOHANDLER* m, char* name)
435+
void EmitSafeGuardBegin(cmsIOHANDLER* m, const char* name)
436436
{
437437
_cmsIOPrintf(m, "%%LCMS2: Save previous definition of %s on the operand stack\n", name);
438438
_cmsIOPrintf(m, "currentdict /%s known { /%s load } { null } ifelse\n", name, name);
439439
}
440440

441441
static
442-
void EmitSafeGuardEnd(cmsIOHANDLER* m, char* name, int depth)
442+
void EmitSafeGuardEnd(cmsIOHANDLER* m, const char* name, int depth)
443443
{
444444
_cmsIOPrintf(m, "%%LCMS2: Restore previous definition of %s\n", name);
445445
if (depth > 1) {
@@ -452,7 +452,7 @@ void EmitSafeGuardEnd(cmsIOHANDLER* m, char* name, int depth)
452452
// Outputs a table of words. It does use 16 bits
453453

454454
static
455-
void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table, char* name)
455+
void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table, const char* name)
456456
{
457457
cmsUInt32Number i;
458458
cmsFloat64Number gamma;
@@ -538,7 +538,7 @@ cmsBool GammaTableEquals(cmsUInt16Number* g1, cmsUInt16Number* g2, cmsUInt32Numb
538538
// Does write a set of gamma curves
539539

540540
static
541-
void EmitNGamma(cmsIOHANDLER* m, cmsUInt32Number n, cmsToneCurve* g[], char* nameprefix)
541+
void EmitNGamma(cmsIOHANDLER* m, cmsUInt32Number n, cmsToneCurve* g[], const char* nameprefix)
542542
{
543543
cmsUInt32Number i;
544544
static char buffer[2048];

src/lcms2_internal.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
#define isinf(x) (!_finite((x)))
113113
# endif
114114

115+
#if !defined(_MSC_VER) && (defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L)
116+
#if !defined(isinf)
117+
#define isinf(x) (!finite((x)))
118+
#endif
119+
#endif
120+
121+
115122
#endif
116123

117124
// A fast way to convert from/to 16 <-> 8 bits

0 commit comments

Comments
 (0)