diff options
| author | mm2 <marti.maria@littlecms.com> | 2021-01-22 18:01:16 +0100 |
|---|---|---|
| committer | mm2 <marti.maria@littlecms.com> | 2021-01-22 18:01:16 +0100 |
| commit | 5087277e8a83a10bb0f3be35ded231828f32999a (patch) | |
| tree | 9e5d8e1e9b6136e3dc399548bd957541daa5057b /testbed | |
| parent | 72925af4548b1f33d6cb3589083f2e7758c7283e (diff) | |
| download | lcms2-5087277e8a83a10bb0f3be35ded231828f32999a.tar.gz | |
fix some compiler warnings
Thanks to Noel Carboni to report them
Diffstat (limited to 'testbed')
| -rw-r--r-- | testbed/testcms2.c | 42 | ||||
| -rwxr-xr-x | testbed/zoo_icc.c | 2 |
2 files changed, 22 insertions, 22 deletions
diff --git a/testbed/testcms2.c b/testbed/testcms2.c index 59021ce..7c4227d 100644 --- a/testbed/testcms2.c +++ b/testbed/testcms2.c @@ -460,7 +460,7 @@ cmsFloat64Number Clip(cmsFloat64Number v) } static -cmsInt32Number ForwardSampler(register const cmsUInt16Number In[], cmsUInt16Number Out[], void* Cargo) +cmsInt32Number ForwardSampler(CMSREGISTER const cmsUInt16Number In[], cmsUInt16Number Out[], void* Cargo) { FakeCMYKParams* p = (FakeCMYKParams*) Cargo; cmsFloat64Number rgb[3], cmyk[4]; @@ -490,7 +490,7 @@ cmsInt32Number ForwardSampler(register const cmsUInt16Number In[], cmsUInt16Numb static -cmsInt32Number ReverseSampler(register const cmsUInt16Number In[], register cmsUInt16Number Out[], register void* Cargo) +cmsInt32Number ReverseSampler(CMSREGISTER const cmsUInt16Number In[], CMSREGISTER cmsUInt16Number Out[], CMSREGISTER void* Cargo) { FakeCMYKParams* p = (FakeCMYKParams*) Cargo; cmsFloat64Number c, m, y, k, rgb[3]; @@ -1726,9 +1726,9 @@ cmsUInt16Number Fn8D3(cmsUInt16Number a1, cmsUInt16Number a2, cmsUInt16Number a3 static -cmsInt32Number Sampler3D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler3D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], 0, 0, 0, 0, 0, 3); @@ -1742,9 +1742,9 @@ cmsInt32Number Sampler3D(register const cmsUInt16Number In[], } static -cmsInt32Number Sampler4D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler4D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], In[3], 0, 0, 0, 0, 4); @@ -1757,9 +1757,9 @@ cmsInt32Number Sampler4D(register const cmsUInt16Number In[], } static -cmsInt32Number Sampler5D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler5D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], In[3], In[4], 0, 0, 0, 5); @@ -1772,9 +1772,9 @@ cmsInt32Number Sampler5D(register const cmsUInt16Number In[], } static -cmsInt32Number Sampler6D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler6D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], In[3], In[4], In[5], 0, 0, 6); @@ -1787,9 +1787,9 @@ cmsInt32Number Sampler6D(register const cmsUInt16Number In[], } static -cmsInt32Number Sampler7D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler7D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], In[3], In[4], In[5], In[6], 0, 7); @@ -1802,9 +1802,9 @@ cmsInt32Number Sampler7D(register const cmsUInt16Number In[], } static -cmsInt32Number Sampler8D(register const cmsUInt16Number In[], - register cmsUInt16Number Out[], - register void * Cargo) +cmsInt32Number Sampler8D(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + CMSREGISTER void * Cargo) { Out[0] = Fn8D1(In[0], In[1], In[2], In[3], In[4], In[5], In[6], In[7], 8); @@ -4943,7 +4943,7 @@ cmsBool CheckOneStr(cmsMLU* mlu, cmsInt32Number n) static -void SetOneStr(cmsMLU** mlu, wchar_t* s1, wchar_t* s2) +void SetOneStr(cmsMLU** mlu, const wchar_t* s1, const wchar_t* s2) { *mlu = cmsMLUalloc(DbgThread(), 0); cmsMLUsetWide(*mlu, "en", "US", s1); diff --git a/testbed/zoo_icc.c b/testbed/zoo_icc.c index a220db7..0d99101 100755 --- a/testbed/zoo_icc.c +++ b/testbed/zoo_icc.c @@ -81,7 +81,7 @@ void PrintInfo(cmsHPROFILE h, cmsInfoType Info) len = cmsGetProfileInfo(h, Info, "en", "US", NULL, 0); if (len == 0) return; - text = _cmsMalloc(id, len); + text = (wchar_t*) _cmsMalloc(id, len); cmsGetProfileInfo(h, Info, "en", "US", text, len); wprintf(L"%s\n", text); |