[h5py] 295/455: Filter code update

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 1.3.0
in repository h5py.

commit 2b1a09c80b8822437ccb2e68ed12263787333d94
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Wed Jul 15 18:29:32 2009 +0000

    Filter code update
---
 lzf/README.txt   | 21 +++++++++++++++++----
 lzf/lzf_filter.c |  4 ++--
 lzf/lzf_filter.h |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lzf/README.txt b/lzf/README.txt
index 0cfd767..c6ad62c 100644
--- a/lzf/README.txt
+++ b/lzf/README.txt
@@ -1,15 +1,15 @@
 ===============================
-LZF filter for HDF5, revision 2
+LZF filter for HDF5, revision 3
 ===============================
 
 The LZF filter provides high-speed compression with acceptable compression
 performance, resulting in much faster performance than DEFLATE, at the
-cost of a slightly worse compression ratio. It's appropriate for large
+cost of a slightly lower compression ratio. It's appropriate for large
 datasets of low to moderate complexity, for which some compression is
 much better than none, but for which the speed of DEFLATE is unacceptable.
 
-Both HDF5 versions 1.6 and 1.8 are supported.  This code is released under
-the BSD license.
+This filter has been tested against HDF5 versions 1.6.5 through 1.8.3.  It
+is released under the BSD license (see LICENSE.txt for details).
 
 
 Using the filter from HDF5
@@ -65,6 +65,19 @@ filter by default.
 * Contact email:  h5py at alfven dot org
 
 
+History of changes
+------------------
+
+Revision 3 (6/25/09)
+    Fix issue with changed filter struct definition under HDF5 1.8.3.
+
+Revision 2
+    Minor speed enhancement.
+
+Revision 1
+    Initial release.
+
+
 
 
 
diff --git a/lzf/lzf_filter.c b/lzf/lzf_filter.c
index a08fc39..c6dd4b0 100644
--- a/lzf/lzf_filter.c
+++ b/lzf/lzf_filter.c
@@ -50,13 +50,13 @@
     (3) The old class should be used for HDF5 1.8 >= 1.8.3 only if the
         macro H5_USE_16_API is set
 */
-#define H5PY_H5Z_NEWCLS 0   
 
 #if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 8 && (H5_VERS_RELEASE < 3 || !H5_USE_16_API)
 #define H5PY_H5Z_NEWCLS 1
+#else
+#define H5PY_H5Z_NEWCLS 0   
 #endif
 
-
 size_t lzf_filter(unsigned flags, size_t cd_nelmts,
 		    const unsigned cd_values[], size_t nbytes,
 		    size_t *buf_size, void **buf);
diff --git a/lzf/lzf_filter.h b/lzf/lzf_filter.h
index 921ba9a..7cf4b9b 100644
--- a/lzf/lzf_filter.h
+++ b/lzf/lzf_filter.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 /* Filter revision number, starting at 1 */
-#define H5PY_FILTER_LZF_VERSION 2
+#define H5PY_FILTER_LZF_VERSION 3
 
 /* Filter ID registered with the HDF Group as of 2/6/09.  For maintenance
    requests, contact the filter author directly. */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git