summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-04 19:52:19 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-04 19:52:19 (GMT)
commit6d53c1882b8481421400c5d47df09020e48c1dd3 (patch)
tree81b0f9dcbbfd0c3b9986f53f8abcadc767c4f8f3 /src
parentf18555481439e8b6409f80ee54edc84b468834f9 (diff)
downloadhdf5-6d53c1882b8481421400c5d47df09020e48c1dd3.zip
hdf5-6d53c1882b8481421400c5d47df09020e48c1dd3.tar.gz
hdf5-6d53c1882b8481421400c5d47df09020e48c1dd3.tar.bz2
[svn-r14376] moved a couple more private filter symbols to the public side, needed by h5repack
tested: windows, linux
Diffstat (limited to 'src')
-rw-r--r--src/H5Znbit.c2
-rw-r--r--src/H5Zpublic.h7
-rw-r--r--src/H5Zshuffle.c1
3 files changed, 5 insertions, 5 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 */