ukoethe · k-dominik · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 4, 2024
diff --git a/ci/build_unix.sh b/ci/build_unix.sh
@@ -17,6 +17,12 @@ if [[ `uname` == 'Darwin' ]]; then
     export SHLIB_EXT=".dylib"
     # I - hmaarrrfk - forget why the definition of LDFLAGS here is necessary
     export LDFLAGS="-undefined dynamic_lookup ${LDFLAGS}"
+
+    # clang14 introduced a new default that turns this flag on on osx arm64 leading
+    # to failing tests. Setting it off restores clang13 behavior and seems in line
+    # with x86 compilation.
+    # ref: https://github.com/llvm/llvm-project/issues/91824
+    export CXXFLAGS="-ffp-contract=off ${CXXFLAGS}"
 else
     export SHLIB_EXT=".so"
 fi

diff --git a/docsrc/Doxyfile.in b/docsrc/Doxyfile.in
@@ -783,7 +783,7 @@ HTML_STYLESHEET        = @PROJECT_SOURCE_DIR@/docsrc/vigra.css
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
-HTML_EXTRA_FILES       = @PROJECT_SOURCE_DIR@/src/examples/lenna_color.gif \
+HTML_EXTRA_FILES       = @PROJECT_SOURCE_DIR@/src/examples/astronaut_color.gif \
                          @PROJECT_SOURCE_DIR@/src/examples/lenna_gray.gif
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,

diff --git a/docsrc/examples.dxx b/docsrc/examples.dxx
@@ -7,7 +7,7 @@
     See <a href="Installation.html">Installation</a> for instructions on how these
     programs can be compiled. For convenience, the directory contains the test images 
     <a href="lenna_gray.gif">lenna_gray.gif</a> and 
-    <a href="lenna_color.gif">lenna_color.gif</a>.
+    <a href="astronaut_color.gif">astronaut_color.gif</a>.
 
     <ul>
 

diff --git a/docsrc/image_processing.dxx b/docsrc/image_processing.dxx
@@ -107,7 +107,7 @@
     And here are the results:
     <table cellspacing = "10">
     <TR valign = "bottom">
-    <TD> \image html lenna_color_small.gif "input file 1" </TD>
+    <TD> \image html astronaut_color_small.gif "input file 1" </TD>
     <TD> \image html oi_small.jpg "input file 2" </TD>
     <TD> \image html dissolved_color.gif "dissolved output file" </TD>
     </TR>
@@ -132,7 +132,7 @@
     And here are the results:
     <Table cellspacing = "10">
     <TR valign = "bottom">
-    <TD> \image html lenna_color_small.gif "input file" </TD>
+    <TD> \image html astronaut_color_small.gif "input file" </TD>
     <TD> \image html lenna_composite_color.gif "composite output file" </TD>
     </TR>
     </Table>

diff --git a/src/examples/astronaut_color.gif b/src/examples/astronaut_color.gif
diff --git a/src/examples/astronaut_color_small.gif b/src/examples/astronaut_color_small.gif
diff --git a/src/examples/lenna_color.gif b/src/examples/lenna_color.gif
diff --git a/src/examples/lenna_color_small.gif b/src/examples/lenna_color_small.gif
diff --git a/src/examples/tutorial/astronaut_color.gif b/src/examples/tutorial/astronaut_color.gif
diff --git a/src/examples/tutorial/astronaut_color_small.gif b/src/examples/tutorial/astronaut_color_small.gif
diff --git a/src/examples/tutorial/lenna_color.gif b/src/examples/tutorial/lenna_color.gif
diff --git a/src/examples/tutorial/lenna_color_small.gif b/src/examples/tutorial/lenna_color_small.gif
diff --git a/src/images/astronaut_color.gif b/src/images/astronaut_color.gif
diff --git a/src/images/astronaut_color_small.gif b/src/images/astronaut_color_small.gif
diff --git a/src/images/lenna_color.gif b/src/images/lenna_color.gif
diff --git a/src/images/lenna_color_small.gif b/src/images/lenna_color_small.gif
diff --git a/test/convolution/CMakeLists.txt b/test/convolution/CMakeLists.txt
@@ -1,3 +1,3 @@
 VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
 
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
+VIGRA_COPY_TEST_DATA(astronaut128.xv astronaut_simple_sharpening_orig.xv astronaut_gaussian_sharpening_orig.xv astronaut128sepgrad.xv astronauthessxx.xv astronautstxx.xv astronaut128recgrad.xv astronaut128nonlinear.xv resampling.xv astronauthessyy.xv astronautstyy.xv astronauthessxy.xv astronautstxy.xv astronaut128rgb.xv astronaut128rgbsepgrad.xv astronaut_level-2.xv astronaut_level-1.xv astronaut_level1.xv astronaut_level2.xv astronaut_levellap0.xv astronaut_levellap1.xv astronaut_levellap2.xv astronautrgbst.xv)
diff --git a/test/convolution/astronaut128.xv b/test/convolution/astronaut128.xv
diff --git a/test/convolution/astronaut128nonlinear.xv b/test/convolution/astronaut128nonlinear.xv
diff --git a/test/convolution/astronaut128recgrad.xv b/test/convolution/astronaut128recgrad.xv
diff --git a/test/convolution/astronaut128rgb.xv b/test/convolution/astronaut128rgb.xv
diff --git a/test/convolution/astronaut128rgbsepgrad.xv b/test/convolution/astronaut128rgbsepgrad.xv
diff --git a/test/convolution/astronaut128sepgrad.xv b/test/convolution/astronaut128sepgrad.xv
diff --git a/test/convolution/astronaut_gaussian_sharpening_orig.xv b/test/convolution/astronaut_gaussian_sharpening_orig.xv
diff --git a/test/convolution/astronaut_level-1.xv b/test/convolution/astronaut_level-1.xv
diff --git a/test/convolution/astronaut_level-2.xv b/test/convolution/astronaut_level-2.xv
diff --git a/test/convolution/astronaut_level1.xv b/test/convolution/astronaut_level1.xv
diff --git a/test/convolution/astronaut_level2.xv b/test/convolution/astronaut_level2.xv
diff --git a/test/convolution/astronaut_levellap0.xv b/test/convolution/astronaut_levellap0.xv
diff --git a/test/convolution/astronaut_levellap1.xv b/test/convolution/astronaut_levellap1.xv
diff --git a/test/convolution/astronaut_levellap2.xv b/test/convolution/astronaut_levellap2.xv
diff --git a/test/convolution/astronaut_simple_sharpening_orig.xv b/test/convolution/astronaut_simple_sharpening_orig.xv
diff --git a/test/convolution/astronauthessxx.xv b/test/convolution/astronauthessxx.xv
diff --git a/test/convolution/astronauthessxy.xv b/test/convolution/astronauthessxy.xv
diff --git a/test/convolution/astronauthessyy.xv b/test/convolution/astronauthessyy.xv
diff --git a/test/convolution/astronautrgbst.xv b/test/convolution/astronautrgbst.xv
diff --git a/test/convolution/astronautstxx.xv b/test/convolution/astronautstxx.xv
diff --git a/test/convolution/astronautstxy.xv b/test/convolution/astronautstxy.xv
diff --git a/test/convolution/astronautstyy.xv b/test/convolution/astronautstyy.xv
diff --git a/test/convolution/lenna128.xv b/test/convolution/lenna128.xv
diff --git a/test/convolution/lenna128nonlinear.xv b/test/convolution/lenna128nonlinear.xv
diff --git a/test/convolution/lenna128recgrad.xv b/test/convolution/lenna128recgrad.xv
diff --git a/test/convolution/lenna128rgb.xv b/test/convolution/lenna128rgb.xv
diff --git a/test/convolution/lenna128rgbsepgrad.xv b/test/convolution/lenna128rgbsepgrad.xv
diff --git a/test/convolution/lenna128sepgrad.xv b/test/convolution/lenna128sepgrad.xv
diff --git a/test/convolution/lenna_gaussian_sharpening_orig.xv b/test/convolution/lenna_gaussian_sharpening_orig.xv
diff --git a/test/convolution/lenna_level-1.xv b/test/convolution/lenna_level-1.xv
diff --git a/test/convolution/lenna_level-2.xv b/test/convolution/lenna_level-2.xv
diff --git a/test/convolution/lenna_level1.xv b/test/convolution/lenna_level1.xv
diff --git a/test/convolution/lenna_level2.xv b/test/convolution/lenna_level2.xv
diff --git a/test/convolution/lenna_levellap0.xv b/test/convolution/lenna_levellap0.xv
diff --git a/test/convolution/lenna_levellap1.xv b/test/convolution/lenna_levellap1.xv
diff --git a/test/convolution/lenna_levellap2.xv b/test/convolution/lenna_levellap2.xv
diff --git a/test/convolution/lenna_simple_sharpening_orig.xv b/test/convolution/lenna_simple_sharpening_orig.xv
diff --git a/test/convolution/lennahessxx.xv b/test/convolution/lennahessxx.xv
diff --git a/test/convolution/lennahessxy.xv b/test/convolution/lennahessxy.xv
diff --git a/test/convolution/lennahessyy.xv b/test/convolution/lennahessyy.xv
diff --git a/test/convolution/lennargbst.xv b/test/convolution/lennargbst.xv
diff --git a/test/convolution/lennastxx.xv b/test/convolution/lennastxx.xv
diff --git a/test/convolution/lennastxy.xv b/test/convolution/lennastxy.xv
diff --git a/test/convolution/lennastyy.xv b/test/convolution/lennastyy.xv
diff --git a/test/convolution/resampling.xv b/test/convolution/resampling.xv