[h5py] 298/455: Update to lzf 3.5

[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 119a62f31d8b3d88544f63cb8d570723f71d0d5b
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Thu Jul 16 21:07:40 2009 +0000

    Update to lzf 3.5
---
 lzf/lzf/lzf_c.c  | 7 ++++---
 lzf/lzf_filter.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lzf/lzf/lzf_c.c b/lzf/lzf/lzf_c.c
index 99dab09..0b5d816 100644
--- a/lzf/lzf/lzf_c.c
+++ b/lzf/lzf/lzf_c.c
@@ -170,12 +170,13 @@ lzf_compress (const void *const in_data, unsigned int in_len,
           unsigned int maxlen = in_end - ip - len;
           maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
 
+          if (expect_false (op + 3 + 1 >= out_end)) /* first a faster conservative test */
+            if (op - !lit + 3 + 1 >= out_end) /* second the exact but rare test */
+              return 0;
+
           op [- lit - 1] = lit - 1; /* stop run */
           op -= !lit; /* undo run if length is zero */
 
-          if (expect_false (op + 3 + 1 >= out_end))
-            return 0;
-
           for (;;)
             {
               if (expect_true (maxlen > 16))
diff --git a/lzf/lzf_filter.h b/lzf/lzf_filter.h
index 7cf4b9b..27dff83 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 3
+#define H5PY_FILTER_LZF_VERSION 4
 
 /* 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