Merge branch 'HDFGroup:develop' into develop-libaec-fix

HDFGroup · Jan 9, 2025 · f6b4210 · f6b4210
2 parents 6b5c39f + b0eac7d
commit f6b4210
Show file tree

Hide file tree

Showing 105 changed files with 29,196 additions and 47,342 deletions.
diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml
@@ -52,6 +52,7 @@ jobs:
             -DHDF5_BUILD_DOC:BOOL=OFF \
             -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DZLIB_USE_LOCALCONTENT:BOOL=OFF \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \
             -DBUILD_TESTING:BOOL=OFF \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
@@ -85,6 +85,7 @@ endif ()
 if(NOT DEFINED ZLIBNG_PACKAGE_NAME)
   set(ZLIBNG_PACKAGE_NAME "zlib-ng")
 endif ()
+option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" OFF)
 if (HDF5_ENABLE_ZLIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
@@ -160,6 +161,7 @@ set(H5_SZIP_FOUND FALSE)
 if(NOT DEFINED LIBAEC_PACKAGE_NAME)
   set(LIBAEC_PACKAGE_NAME "libaec")
 endif ()
+option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
@@ -1451,7 +1451,7 @@ test_read_string(H5File &file)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dset(const void *params)
+test_dset(void *params)
 {
     hid_t fapl_id;
     fapl_id     = h5_fileaccess(); // in h5test.c, returns a file access template

diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
@@ -138,20 +138,20 @@ verify_val(Type1 x, Type2 value, float epsilon, const char *msg, int line, const
 #ifdef __cplusplus
 extern "C" {
 #endif
-void test_array(const void *params);
-void test_attr(const void *params);
-void test_compound(const void *params);
-void test_dsproplist(const void *params);
-void test_file(const void *params);
-void test_filters(const void *params);
-void test_links(const void *params);
-void test_h5s(const void *params);
-void test_iterate(const void *params);
-void test_object(const void *params);
-void test_reference(const void *params);
-void test_types(const void *params);
-void test_vlstrings(const void *params);
-void test_dset(const void *params);
+void test_array(void *params);
+void test_attr(void *params);
+void test_compound(void *params);
+void test_dsproplist(void *params);
+void test_file(void *params);
+void test_filters(void *params);
+void test_links(void *params);
+void test_h5s(void *params);
+void test_iterate(void *params);
+void test_object(void *params);
+void test_reference(void *params);
+void test_types(void *params);
+void test_vlstrings(void *params);
+void test_dset(void *params);
 
 /* Prototypes for the cleanup routines */
 void cleanup_array(void *params);

diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
@@ -477,7 +477,7 @@ test_array_info()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_array(const void *params)
+test_array(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
@@ -1956,7 +1956,7 @@ test_attr_corder_create_basic(FileCreatPropList &fcpl, FileAccPropList &fapl)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_attr(const void *params)
+test_attr(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
@@ -729,7 +729,7 @@ test_compound_set_size()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_compound(const void *params)
+test_compound(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
@@ -114,7 +114,7 @@ test_transfplist()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dsproplist(const void *params)
+test_dsproplist(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
@@ -968,7 +968,7 @@ test_file_info()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_file(const void *params)
+test_file(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
@@ -227,7 +227,7 @@ test_szip_filter(H5File &file1)
  */
 const H5std_string FILE1("tfilters.h5");
 extern "C" void
-test_filters(const void *params)
+test_filters(void *params)
 {
     (void)params;
 

diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
@@ -471,7 +471,7 @@ test_h5s_compound_scalar_read()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_h5s(const void *params)
+test_h5s(void *params)
 {
     (void)params;
 

diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
@@ -440,7 +440,7 @@ test_HDFFV_9920()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_iterate(const void *params)
+test_iterate(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
@@ -709,7 +709,7 @@ test_visit(hid_t fapl_id, hbool_t new_format)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_links(const void *params)
+test_links(void *params)
 {
     hid_t    fapl_id, fapl2_id; /* File access property lists */
     unsigned new_format;        /* Whether to use the new format or not */

diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
@@ -712,7 +712,7 @@ test_intermediate_groups()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_object(const void *params)
+test_object(void *params)
 {
     (void)params;
 

diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
@@ -827,7 +827,7 @@ test_reference_region_1D()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_reference(const void *params)
+test_reference(void *params)
 {
     (void)params;
 

diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
@@ -1093,7 +1093,7 @@ test_operators()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_types(const void *params)
+test_types(void *params)
 {
     (void)params;
 

diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
@@ -934,7 +934,7 @@ test_vl_rewrite()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_vlstrings(const void *params)
+test_vlstrings(void *params)
 {
     (void)params;
 

diff --git a/doxygen/dox/FileFormatSpec.dox b/doxygen/dox/FileFormatSpec.dox
@@ -1,23 +1,7 @@
-/** \page FMT3 HDF5 File Format Specification Version 3.0
+\ref FMT3
 
-\htmlinclude H5.format.html
+\ref FMT2
 
-*/
+\ref FMT11
 
-/** \page FMT2 HDF5 File Format Specification Version 2.0
-
-\htmlinclude H5.format.2.0.html
-
-*/
-
-/** \page FMT11 HDF5 File Format Specification Version 1.1
-
-\htmlinclude H5.format.1.1.html
-
-*/
-
-/** \page FMT1 HDF5 File Format Specification Version 1.0
-
-\htmlinclude H5.format.1.0.html
-
-*/
+\ref FMT1