summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-02 19:40:20 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-02 19:40:20 (GMT)
commit7e1d3904911acfe1f3d092c0e3de8d402b2896a7 (patch)
tree91104819f370ea254a7264fb5bc9bc0b0bb04bcf /src
parent8a2c76ed6904f1b9a20560dc6d4835f17133f053 (diff)
downloadhdf5-7e1d3904911acfe1f3d092c0e3de8d402b2896a7.zip
hdf5-7e1d3904911acfe1f3d092c0e3de8d402b2896a7.tar.gz
hdf5-7e1d3904911acfe1f3d092c0e3de8d402b2896a7.tar.bz2
[svn-r14360] New function has_filters (replace has_filters for each object and for global filters): verify if all requested filters in the array FILTER obtained from user input are present in the property list PID obtained from the output file. All the filter comparison of client data values is done here instead of the previous filtcmp
TO DO: szip, nbit and scale offset NOTE: the symbol H5Z_SHUFFLE_TOTAL_NPARMS was made public Tested: windows, teragrid with icc 8.1, linux (kagiso), solaris (linew)
Diffstat (limited to 'src')
-rw-r--r--src/H5Zpublic.h4
-rw-r--r--src/H5Zshuffle.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 1fac71c..6c238fe 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -74,6 +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, private */
+#define H5Z_SHUFFLE_TOTAL_NPARMS 1
+
+
/* Special parameters for ScaleOffset filter*/
#define H5Z_SO_INT_MINBITS_DEFAULT 0
typedef enum H5Z_SO_scale_type_t {
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index c203ed9..57e4346 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -45,7 +45,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_TOTAL_NPARMS 1 /* Total number of parameters for filter */
#define H5Z_SHUFFLE_PARM_SIZE 0 /* "Local" parameter for shuffling size */