From 646ac3850720155ced3851cf0c5ecf52a72857c4 Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Tue, 1 Apr 2003 10:27:45 -0500 Subject: [svn-r6550] Purpose: To support szip compression in HDF5 Description: szip compression support is required by NASA ESDIS. The compression algorithm is a good compression algorithm for scientific data. In HDF5, we add another filter function to make szip as a default compression package as we did for gzip(or zlib). H5config.in needs to be regenerated by autoheader for SZIP flags. Solution: A new file called H5Zszip.c will be added in the Makefile.in Flags like: HAVE_FILTER_SZIP should be auto-generated by autoheader. Platforms tested: Since there are changes of configure.in and configure,I didn't use h5committest. I tested with four platforms. 1) Linux 2.4 (eirene) 2) Solaris 2.7(arabica) 3) windows 2000(VS 6.0) 4) SGI IRIX6.5-64(modi4) For test 1)-3), only basic C tests were done For modi4 test, I tested 64-bit C,parallel and fortran. All tests passed, except a warning message from szip library when checksum is used in some order, which doesn't cause any real problems. Misc. update: --- src/H5config.h.in | 15 ++++++++++++--- src/Makefile.in | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/H5config.h.in b/src/H5config.h.in index 9397a22..eb59a6d 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -21,15 +21,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FEATURES_H -/* Define if support for Fletcher32 checksum is enabled */ -#undef HAVE_FILTER_FLETCHER32 - /* Define if support for deflate filter is enabled */ #undef HAVE_FILTER_DEFLATE +/* Define if support for Fletcher32 checksum is enabled */ +#undef HAVE_FILTER_FLETCHER32 + /* Define if support for shuffle filter is enabled */ #undef HAVE_FILTER_SHUFFLE +/* Define if support for szip filter is enabled */ +#undef HAVE_FILTER_SZIP + /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -161,6 +164,9 @@ /* Define to 1 if you have the `ssl' library (-lssl). */ #undef HAVE_LIBSSL +/* Define to 1 if you have the `sz' library (-lsz). */ +#undef HAVE_LIBSZ + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -281,6 +287,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SZLIB_H + /* Define if we have thread safe support */ #undef HAVE_THREADSAFE diff --git a/src/Makefile.in b/src/Makefile.in index 2fe150b..b108e47 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -42,7 +42,7 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcontig.c \ H5Tcompound.c H5Tconv.c H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c \ H5Tfloat.c H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c H5Torder.c \ H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5TB.c H5TS.c H5V.c H5Z.c \ - H5Zdeflate.c H5Zshuffle.c H5Zfletcher32.c + H5Zdeflate.c H5Zszip.c H5Zshuffle.c H5Zfletcher32.c LIB_OBJ=$(LIB_SRC:.c=.lo) -- cgit v0.12