Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mm2/Little-CMS.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarti Maria <marti.maria@littlecms.com>2020-10-02 23:09:43 +0300
committerMarti Maria <marti.maria@littlecms.com>2020-10-02 23:09:43 +0300
commita1614d52ae2199f777c2606c106214c354d11060 (patch)
treee21c6bca58d51307493fe79d85991e2c917e2dfc /plugins
parent887057fb25ae585959dade9c8fa3881c63c2b610 (diff)
fast float plugin now can be compiled as C++
Fixed some glitches that prevent linking when mixing C and C++
Diffstat (limited to 'plugins')
-rw-r--r--plugins/fast_float/src/fast_float_internal.h3
-rw-r--r--plugins/fast_float/testbed/fast_float_testbed.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/fast_float/src/fast_float_internal.h b/plugins/fast_float/src/fast_float_internal.h
index 92b377a..87e004d 100644
--- a/plugins/fast_float/src/fast_float_internal.h
+++ b/plugins/fast_float/src/fast_float_internal.h
@@ -141,9 +141,8 @@ cmsINLINE cmsFloat32Number flerp(const cmsFloat32Number LutTable[], cmsFloat32Nu
-
// Some secret sauce from lcms
-int _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags);
+cmsUInt32Number _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags);
diff --git a/plugins/fast_float/testbed/fast_float_testbed.c b/plugins/fast_float/testbed/fast_float_testbed.c
index 71f05bc..695552b 100644
--- a/plugins/fast_float/testbed/fast_float_testbed.c
+++ b/plugins/fast_float/testbed/fast_float_testbed.c
@@ -1777,7 +1777,7 @@ void TestGrayTransformPerformance()
pixels = 256 * 256 * 256;
Mb = pixels* 2*sizeof(float);
- In = malloc(Mb);
+ In = (float*) malloc(Mb);
for (j = 0; j < pixels*2; j++)
In[j] = (j % 256) / 255.0f;
@@ -1827,7 +1827,7 @@ void TestGrayTransformPerformance1()
pixels = 256 * 256 * 256;
Mb = pixels* sizeof(float);
- In = malloc(Mb);
+ In = (float*) malloc(Mb);
for (j = 0; j < pixels; j++)
In[j] = (j % 256) / 255.0f;