summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarti Maria <marti.maria@littlecms.com>2022-01-23 15:22:14 +0100
committerMarti Maria <marti.maria@littlecms.com>2022-01-23 15:22:14 +0100
commitda3da4bca90ef9ad10f9e2e5a3452a680a66c979 (patch)
tree6d085c1c9836d5b2dfd632f83bf5f5611b181b20
parenta86da49564a952a2253373dd45f60a57d34441b0 (diff)
downloadlcms2-da3da4bca90ef9ad10f9e2e5a3452a680a66c979.tar.gz
turn off some warnings
Should not affect any functionality
-rw-r--r--src/cmscgats.c2
-rw-r--r--src/cmstypes.c18
2 files changed, 10 insertions, 10 deletions
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 772d1af..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,21 +3572,21 @@ 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);
@@ -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;
}