blob: 7d9264e1244a73b9e29f48548a52f85522731378 [file] [log] [blame] [edit]
diff --git a/third_party/lcms/src/cmscgats.c b/third_party/lcms/src/cmscgats.c
index a0c25c024..55f74ede8 100644
--- a/third_party/lcms/src/cmscgats.c
+++ b/third_party/lcms/src/cmscgats.c
@@ -38,7 +38,10 @@
#define DEFAULT_DBL_FORMAT "%.10g" // Double formatting
#ifdef CMS_IS_WINDOWS_
-# include <io.h>
+//sunliang.liu modified 2010426 for wince error
+# ifndef _WIN32_WCE
+# include <io.h>
+# endif
# define DIR_CHAR '\\'
#else
# define DIR_CHAR '/'
diff --git a/third_party/lcms/src/cmsgamma.c b/third_party/lcms/src/cmsgamma.c
index eb3dd881c..6e36cf462 100644
--- a/third_party/lcms/src/cmsgamma.c
+++ b/third_party/lcms/src/cmsgamma.c
@@ -749,14 +749,19 @@ void CMSEXPORT cmsFreeToneCurve(cmsToneCurve* Curve)
{
cmsContext ContextID;
- if (Curve == NULL) return;
+ // added by Xiaochuan Liu
+ // Curve->InterpParams may be null
+ if (Curve == NULL || Curve->InterpParams == NULL) return;
ContextID = Curve ->InterpParams->ContextID;
_cmsFreeInterpParams(Curve ->InterpParams);
+ Curve ->InterpParams = NULL;
- if (Curve -> Table16)
+ if (Curve -> Table16) {
_cmsFree(ContextID, Curve ->Table16);
+ Curve ->Table16 = NULL;
+ }
if (Curve ->Segments) {
@@ -876,18 +881,25 @@ void CMSEXPORT cmsFreeToneCurve(cmsToneCurve* Curve)
if (Curve ->Segments[i].SampledPoints) {
_cmsFree(ContextID, Curve ->Segments[i].SampledPoints);
+ Curve ->Segments[i].SampledPoints = NULL;
}
- if (Curve ->SegInterp[i] != 0)
+ if (Curve ->SegInterp[i] != 0) {
_cmsFreeInterpParams(Curve->SegInterp[i]);
+ Curve->SegInterp[i] = NULL;
+ }
}
_cmsFree(ContextID, Curve ->Segments);
+ Curve ->Segments = NULL;
_cmsFree(ContextID, Curve ->SegInterp);
+ Curve ->SegInterp = NULL;
}
- if (Curve -> Evals)
+ if (Curve -> Evals) {
_cmsFree(ContextID, Curve -> Evals);
+ Curve -> Evals = NULL;
+ }
_cmsFree(ContextID, Curve);
}
diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
index 1b026488d..cc5f89064 100644
--- a/third_party/lcms/src/cmsio0.c
+++ b/third_party/lcms/src/cmsio0.c
@@ -479,6 +479,14 @@ cmsIOHANDLER* CMSEXPORT cmsGetProfileIOhandler(cmsHPROFILE hProfile)
return Icc->IOhandler;
}
+#ifdef _WIN32_WCE
+time_t wceex_time(time_t *timer);
+struct tm * wceex_gmtime(const time_t *timer);
+
+#define time wceex_time
+#define gmtime wceex_gmtime
+#endif
+
// Creates an empty structure holding all required parameters
cmsHPROFILE CMSEXPORT cmsCreateProfilePlaceholder(cmsContext ContextID)
{
@@ -570,6 +578,14 @@ int _cmsSearchTag(_cmsICCPROFILE* Icc, cmsTagSignature sig, cmsBool lFollowLinks
// Yes, follow link
if (LinkedSig != (cmsTagSignature) 0) {
+ // fix bug mantis id#0055942
+ // assume that TRCTag and ColorantTag can't be linked.
+ // Xiaochuan Liu 2014-04-23
+ if ((sig == cmsSigRedTRCTag || sig == cmsSigGreenTRCTag || sig == cmsSigBlueTRCTag) &&
+ (LinkedSig == cmsSigRedColorantTag || LinkedSig == cmsSigGreenColorantTag || LinkedSig == cmsSigBlueColorantTag))
+ {
+ return n;
+ }
sig = LinkedSig;
}
@@ -1363,6 +1379,12 @@ Error:
return 0;
}
+#ifdef _WIN32_WCE
+int wceex_unlink(const char *filename);
+#ifndef remove
+# define remove wceex_unlink
+#endif
+#endif
// Low-level save to disk.
cmsBool CMSEXPORT cmsSaveProfileToFile(cmsHPROFILE hProfile, const char* FileName)