diff options
author | Marti Maria <mmaria@abindustries.com> | 2022-01-24 12:00:28 +0100 |
---|---|---|
committer | Marti Maria <mmaria@abindustries.com> | 2022-01-24 12:00:28 +0100 |
commit | 63dc7a4b166a9427086111d2f0544051ad2131e0 (patch) | |
tree | 1648ce3897af9c91f0ebe714ee68ef2cdf332b30 | |
parent | fac0411e85ab1c84b71c06dd2328553eef0618d0 (diff) | |
parent | ca7d833d54c164311d32cf842b6e08216cf1467c (diff) | |
download | lcms2-63dc7a4b166a9427086111d2f0544051ad2131e0.tar.gz |
Merge branch 'master' of https://github.com/mm2/Little-CMS
-rw-r--r-- | include/lcms2.h | 2 | ||||
-rw-r--r-- | src/cmsalpha.c | 12 | ||||
-rw-r--r-- | src/cmscgats.c | 2 | ||||
-rw-r--r-- | src/cmstypes.c | 20 | ||||
-rw-r--r-- | src/cmsvirt.c | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/include/lcms2.h b/include/lcms2.h index 4a1d497..89c3120 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -23,7 +23,7 @@ // //--------------------------------------------------------------------------------- // -// Version 2.13rc1 +// Version 2.13rc2 // #ifndef _lcms2_H diff --git a/src/cmsalpha.c b/src/cmsalpha.c index ac5cc58..5e30172 100644 --- a/src/cmsalpha.c +++ b/src/cmsalpha.c @@ -191,21 +191,21 @@ static void fromFLTto8(void* dst, const void* src) { cmsFloat32Number n = *(cmsFloat32Number*)src; - *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f); + *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0); } static void fromFLTto16(void* dst, const void* src) { cmsFloat32Number n = *(cmsFloat32Number*)src; - *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f); + *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0); } static void fromFLTto16SE(void* dst, const void* src) { cmsFloat32Number n = *(cmsFloat32Number*)src; - cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0f); + cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0); *(cmsUInt16Number*)dst = CHANGE_ENDIAN(i); } @@ -243,7 +243,7 @@ void fromHLFto8(void* dst, const void* src) { #ifndef CMS_NO_HALF_SUPPORT cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src); - *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f); + *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0); #else cmsUNUSED_PARAMETER(dst); cmsUNUSED_PARAMETER(src); @@ -256,7 +256,7 @@ void fromHLFto16(void* dst, const void* src) { #ifndef CMS_NO_HALF_SUPPORT cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src); - *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f); + *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0); #else cmsUNUSED_PARAMETER(dst); cmsUNUSED_PARAMETER(src); @@ -268,7 +268,7 @@ void fromHLFto16SE(void* dst, const void* src) { #ifndef CMS_NO_HALF_SUPPORT cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src); - cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0f); + cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0); *(cmsUInt16Number*)dst = CHANGE_ENDIAN(i); #else cmsUNUSED_PARAMETER(dst); diff --git a/src/cmscgats.c b/src/cmscgats.c index a5b1130..051c3dc 100644 --- a/src/cmscgats.c +++ b/src/cmscgats.c @@ -1187,7 +1187,7 @@ char *AllocString(cmsIT8* it8, const char* str) ptr = (char *) AllocChunk(it8, Size); - if (ptr) strncpy (ptr, str, Size-1); + if (ptr) memcpy(ptr, str, Size-1); return ptr; } diff --git a/src/cmstypes.c b/src/cmstypes.c index b855d2e..1a0d874 100644 --- a/src/cmstypes.c +++ b/src/cmstypes.c @@ -3213,8 +3213,8 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER if (!_cmsWriteUInt32Number(io, nColors)) return FALSE; if (!_cmsWriteUInt32Number(io, NamedColorList ->ColorantCount)) return FALSE; - strncpy(prefix, (const char*) NamedColorList->Prefix, 32); - strncpy(suffix, (const char*) NamedColorList->Suffix, 32); + memcpy(prefix, (const char*) NamedColorList->Prefix, sizeof(prefix)); + memcpy(suffix, (const char*) NamedColorList->Suffix, sizeof(suffix)); suffix[32] = prefix[32] = 0; @@ -3572,28 +3572,28 @@ void *Type_UcrBg_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm // First curve is Under color removal - if (SignedSizeOfTag < sizeof(cmsUInt32Number)) return NULL; + if (SignedSizeOfTag < (cmsInt32Number) sizeof(cmsUInt32Number)) return NULL; if (!_cmsReadUInt32Number(io, &CountUcr)) return NULL; SignedSizeOfTag -= sizeof(cmsUInt32Number); n ->Ucr = cmsBuildTabulatedToneCurve16(self ->ContextID, CountUcr, NULL); if (n ->Ucr == NULL) goto error; - if (SignedSizeOfTag < (cmsInt32Number)CountUcr * sizeof(cmsUInt16Number)) goto error; + if (SignedSizeOfTag < (cmsInt32Number)(CountUcr * sizeof(cmsUInt16Number))) goto error; if (!_cmsReadUInt16Array(io, CountUcr, n ->Ucr->Table16)) goto error; SignedSizeOfTag -= CountUcr * sizeof(cmsUInt16Number); // Second curve is Black generation - if (SignedSizeOfTag < sizeof(cmsUInt32Number)) goto error; + if (SignedSizeOfTag < (cmsInt32Number)sizeof(cmsUInt32Number)) goto error; if (!_cmsReadUInt32Number(io, &CountBg)) goto error; SignedSizeOfTag -= sizeof(cmsUInt32Number); n ->Bg = cmsBuildTabulatedToneCurve16(self ->ContextID, CountBg, NULL); if (n ->Bg == NULL) goto error; - if (SignedSizeOfTag < (cmsInt32Number) CountBg * sizeof(cmsUInt16Number)) goto error; + if (SignedSizeOfTag < (cmsInt32Number) (CountBg * sizeof(cmsUInt16Number))) goto error; if (!_cmsReadUInt16Array(io, CountBg, n ->Bg->Table16)) goto error; SignedSizeOfTag -= CountBg * sizeof(cmsUInt16Number); @@ -5033,7 +5033,7 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, // Read column arrays for (i=0; i < Count; i++) { - if (SignedSizeOfTag < 4 * sizeof(cmsUInt32Number)) return FALSE; + if (SignedSizeOfTag < 4 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; SignedSizeOfTag -= 4 * sizeof(cmsUInt32Number); if (!ReadOneElem(io, &a -> Name, i, BaseOffset)) return FALSE; @@ -5041,7 +5041,7 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, if (Length > 16) { - if (SignedSizeOfTag < 2 * sizeof(cmsUInt32Number)) return FALSE; + if (SignedSizeOfTag < 2 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; SignedSizeOfTag -= 2 * sizeof(cmsUInt32Number); if (!ReadOneElem(io, &a ->DisplayName, i, BaseOffset)) return FALSE; @@ -5050,8 +5050,8 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, if (Length > 24) { - if (SignedSizeOfTag < 2 * sizeof(cmsUInt32Number)) return FALSE; - SignedSizeOfTag -= 2 * sizeof(cmsUInt32Number); + if (SignedSizeOfTag < 2 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; + SignedSizeOfTag -= 2 * (cmsInt32Number) sizeof(cmsUInt32Number); if (!ReadOneElem(io, & a -> DisplayValue, i, BaseOffset)) return FALSE; } diff --git a/src/cmsvirt.c b/src/cmsvirt.c index 6ab820b..b2adb97 100644 --- a/src/cmsvirt.c +++ b/src/cmsvirt.c @@ -368,7 +368,7 @@ int InkLimitingSampler(CMSREGISTER const cmsUInt16Number In[], CMSREGISTER cmsUI InkLimit = (InkLimit * 655.35); - SumCMY = In[0] + In[1] + In[2]; + SumCMY = (cmsFloat64Number) In[0] + In[1] + In[2]; SumCMYK = SumCMY + In[3]; if (SumCMYK > InkLimit) { |