Merge branch 'master' of https://github.com/mm2/Little-CMS

mm2 · Nov 1, 2022 · 5cab2e5 · 5cab2e5
2 parents 4ca72f8 + 496293a
commit 5cab2e5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 19 deletions.
diff --git a/Projects/VC2022/testbed/testbed.vcxproj b/Projects/VC2022/testbed/testbed.vcxproj
@@ -281,7 +281,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\testbed\fuzzer.c" />
     <ClCompile Include="..\..\..\testbed\testcms2.c" />
     <ClCompile Include="..\..\..\testbed\testplugin.c" />
     <ClCompile Include="..\..\..\testbed\zoo_icc.c" />

diff --git a/Projects/VC2022/testbed/testbed.vcxproj.filters b/Projects/VC2022/testbed/testbed.vcxproj.filters
@@ -24,8 +24,5 @@
     <ClCompile Include="..\..\..\testbed\zoo_icc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\testbed\fuzzer.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/configure b/configure
@@ -17701,7 +17701,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <emmintrin.h>
-    main() { __m128i n = _mm_set1_epi8(42); }
+    int main() { __m128i n = _mm_set1_epi8(42); }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_supports_sse2=yes

diff --git a/plugins/fast_float/src/fast_float_tethra.c b/plugins/fast_float/src/fast_float_tethra.c
@@ -134,9 +134,9 @@ void FloatCLUTEval(struct _cmstransform_struct* CMMcargo,
             py = g * p->Domain[1];
             pz = b * p->Domain[2];
 
-            x0 = _cmsQuickFloor(px); rx = (px - (cmsFloat32Number)x0);
-            y0 = _cmsQuickFloor(py); ry = (py - (cmsFloat32Number)y0);
-            z0 = _cmsQuickFloor(pz); rz = (pz - (cmsFloat32Number)z0);
+            x0 = (int) floorf(px); rx = (px - (cmsFloat32Number)x0);
+            y0 = (int) floorf(py); ry = (py - (cmsFloat32Number)y0);
+            z0 = (int) floorf(pz); rz = (pz - (cmsFloat32Number)z0);
 
 
             X0 = p->opta[2] * x0;

diff --git a/testbed/testcms2.c b/testbed/testcms2.c
@@ -9249,13 +9249,6 @@ int main(int argc, char* argv[])
             CHDIR(argv[2]);
         }
 
-#ifdef LCMS_FAST_EXTENSIONS
-   printf("Installing fast float extension ...");   
-   cmsPlugin(cmsFastFloatExtensions());
-   printf("done.\n");
-#endif
-
-
     printf("Installing debug memory plug-in ... ");
     cmsPlugin(&DebugMemHandler);
     printf("done.\n");

diff --git a/testbed/testcms2.h b/testbed/testcms2.h
@@ -29,10 +29,6 @@
 
 #include "lcms2_internal.h"
 
-#ifdef LCMS_FAST_EXTENSIONS
-#   include "fast_float_internal.h"
-#endif
-
 // On Visual Studio, use debug CRT
 #ifdef _MSC_VER
 #    include "crtdbg.h"