From 6d53c1882b8481421400c5d47df09020e48c1dd3 Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Fri, 4 Jan 2008 14:52:19 -0500
Subject: [svn-r14376] moved a couple more private filter symbols to the public
 side, needed by h5repack

tested: windows, linux
---
 src/H5Znbit.c                    | 2 +-
 src/H5Zpublic.h                  | 7 ++++---
 src/H5Zshuffle.c                 | 1 -
 tools/h5repack/h5repack_verify.c | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 7a29d45..8f95006 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -1409,4 +1409,4 @@ static void H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned c
 
    *buffer_size = j + 1; /* sometimes is catually j, but to be safe */
 }
-#endif /* H5_HAVE_FILTER_NZIP */
+#endif /* H5_HAVE_FILTER_NBIT */
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index df02af8..a671d1a 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -74,9 +74,10 @@ typedef int H5Z_filter_t;
 #define H5_SZIP_NN_OPTION_MASK          32
 #define H5_SZIP_MAX_PIXELS_PER_BLOCK    32
 
-/* Total number of parameters for the shuffle filter */
-#define H5Z_SHUFFLE_TOTAL_NPARMS   1    
-
+/* Macros for the shuffle filter */
+#define H5Z_SHUFFLE_USER_NPARMS    0    /* Number of parameters that users can set */
+#define H5Z_SHUFFLE_TOTAL_NPARMS   1    /* Total number of parameters for filter */
+ 
 /* Macros for the szip filter */
 #define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
 #define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index 57e4346..3f40707 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -44,7 +44,6 @@ const H5Z_class_t H5Z_SHUFFLE[1] = {{
 }};
 
 /* Local macros */
-#define H5Z_SHUFFLE_USER_NPARMS    0       /* Number of parameters that users can set */
 #define H5Z_SHUFFLE_PARM_SIZE      0       /* "Local" parameter for shuffling size */
 
 
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index c4495c2..a878621 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -489,7 +489,7 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
         case H5Z_FILTER_SHUFFLE:
             
             /* 1 private client value is returned by DCPL */
-            if ( cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != 0 )
+            if ( cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SHUFFLE_USER_NPARMS )
                 return 0;
             
             /* get dataset's type size */
@@ -519,6 +519,8 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
         case H5Z_FILTER_NBIT:
             
             /* TO DO */
+
+            ;
           
             
             
@@ -527,6 +529,8 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
         case H5Z_FILTER_SCALEOFFSET:
             
             /* TO DO */
+
+            ;
             
             
             
-- 
cgit v0.12