Merge topic 'fix-png-optimization-flags'

f334692a Merge branch 'upstream-png' into fix-png-optimization-flags
86ebf943 png 2019-05-28 (4d63877d)
7f4881c2 png: remove pnglibconf.out
fe876f9b png: update to disable processor optimization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5595

ThirdParty/png/update.sh

@@ -8,7 +8,7 @@ readonly name="png"
 readonly ownership="Libpng Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
 readonly repo="https://gitlab.kitware.com/third-party/png.git"
-readonly tag="for/vtk-20181015-1.6.35"
+readonly tag="for/vtk-20190528-1.6.35"
 readonly paths="
 .gitattributes
 CMakeLists.vtk.txt
@@ -59,7 +59,7 @@ extract_source () {
     CPPFLAGS="-I${BASH_SOURCE%/*}/../zlib/vtkzlib -I$PWD -DZ_PREFIX -DZ_HAVE_UNISTD_H" make -f scripts/pnglibconf.mak
     rm -rvf "vtkzlib"
     sed -i -e '/PNG_ZLIB_VERNUM/s/0x.*/0/' pnglibconf.h
-    rm -rvf scripts pngusr.dfa pnglibconf.dfn pnglibconf.pre
+    rm -rvf scripts pngusr.dfa pnglibconf.dfn pnglibconf.pre pnglibconf.out
     mv -v CMakeLists.vtk.txt CMakeLists.txt
     popd
 }

ThirdParty/png/vtkpng/README.kitware.md

@@ -9,3 +9,4 @@ process.
   * Ignore whitespace errors for VTK's commit checks.
   * Integrate the CMake build with VTK's module system.
   * Mangle all exported symbols to have a `vtkpng_` prefix.
+  * Avoid processor-specific optimizations (NEON, SSE, etc.)

ThirdParty/png/vtkpng/vtk_png_mangle.h

 #ifndef vtk_png_mangle_h
 #define vtk_png_mangle_h
 
+#define PNG_ARM_NEON_OPT 0
+#define PNG_MIPS_MSA_OPT 0
+#define PNG_POWERPC_VSX_OPT 0
+#define PNG_INTEL_SSE_OPT 0
+
 #define png_access_version_number vtkpng_png_access_version_number
 #define png_app_error vtkpng_png_app_error
 #define png_app_warning vtkpng_png_app_warning