Merge commit 'b86055454903bcac6e9f0958075c4d8197e23d61' into update-d…

…ependencies
silx-kit · Jul 4, 2024 · 6f1bcbb · 6f1bcbb
2 parents e475b44 + b860554
commit 6f1bcbb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/src/SZ/sz/CMakeLists.txt b/src/SZ/sz/CMakeLists.txt
@@ -92,11 +92,23 @@ set_target_properties (SZ PROPERTIES
     OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
   )
 
-target_link_libraries (SZ PUBLIC ${ZLIB_dep} ${ZSTD_dep} m)
+if (WIN32 AND NOT MINGW)
+    target_link_libraries (SZ PUBLIC ${ZLIB_dep} ${ZSTD_dep})
+else ()
+    target_link_libraries (SZ PUBLIC ${ZLIB_dep} ${ZSTD_dep} m)
+endif ()
 
-target_compile_options(SZ
-	PRIVATE $<$<CONFIG:Debug>:-Wall -Wextra -Wpedantic -Wno-unused-parameter>
-	)
+if (WIN32 AND NOT MINGW)
+    message(STATUS "Native windows compiler detected, adding compile flags")
+    target_compile_options(SZ
+        PRIVATE $<$<CONFIG:Debug>:-Wall>
+    )
+else ()
+    message(STATUS "GCC detected, adding compile flags")
+    target_compile_options(SZ
+        PRIVATE $<$<CONFIG:Debug>:-Wall -Wextra -Wpedantic -Wno-unused-parameter>
+    )
+endif()
 
 if(BUILD_OPENMP)
   target_link_libraries(SZ PRIVATE OpenMP::OpenMP_C)

diff --git a/src/SZ/sz/src/sz.c b/src/SZ/sz/src/sz.c
@@ -485,7 +485,16 @@ unsigned char *SZ_compress_rev(int dataType, void *data, void *reservedValue, si
 
 void *SZ_decompress(int dataType, unsigned char *bytes, size_t byteLength, size_t r5, size_t r4, size_t r3, size_t r2, size_t r1)
 {
-	if(confparams_dec==NULL)
+    //correct dimension if needed
+    size_t _r[5];
+    filterDimension(r5, r4, r3, r2, r1, _r);
+    r5 = _r[4];
+    r4 = _r[3];
+    r3 = _r[2];
+    r2 = _r[1];
+    r1 = _r[0];
+
+    if(confparams_dec==NULL)
 		confparams_dec = (sz_params*)malloc(sizeof(sz_params));
 	memset(confparams_dec, 0, sizeof(sz_params));
 	if(exe_params==NULL)

diff --git a/src/SZ/zlib/CMakeLists.txt b/src/SZ/zlib/CMakeLists.txt
@@ -4,6 +4,10 @@ else ()
   set (BUILD_EXT_LIBS_TYPE "STATIC")
 endif ()
 
+if (WIN32 AND NOT MINGW)
+  set (BUILD_EXT_LIBS_TYPE "STATIC")
+endif ()
+
 add_library(ZLIB ${BUILD_EXT_LIBS_TYPE} 
   ./gzclose.c
   ./uncompr.c

diff --git a/src/SZ/zstd/CMakeLists.txt b/src/SZ/zstd/CMakeLists.txt
@@ -4,6 +4,10 @@ else ()
   set (BUILD_EXT_LIBS_TYPE "STATIC")
 endif ()
 
+if (WIN32 AND NOT MINGW)
+  set (BUILD_EXT_LIBS_TYPE "STATIC")
+endif ()
+
 add_library(zstd ${BUILD_EXT_LIBS_TYPE} 
   ./common/entropy_common.c
   ./common/pool.c