diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-23 15:03:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-23 15:03:15 (GMT) |
| commit | 1062b4f9d7080a3e439df7d3d527aee43f96d085 (patch) | |
| tree | 0b47d618799f9e9f34f6ef0dbde80a06013d73e7 /src/H5Zpublic.h | |
| parent | 1202e83013bdbce9592d0bd70f41e84c83f6c2d5 (diff) | |
| download | hdf5-1062b4f9d7080a3e439df7d3d527aee43f96d085.zip hdf5-1062b4f9d7080a3e439df7d3d527aee43f96d085.tar.gz hdf5-1062b4f9d7080a3e439df7d3d527aee43f96d085.tar.bz2 | |
[svn-r12802] Description:
Clean up code in passing...
Tested on:
Linux/32 2.4 (heping)
Linux/64 2.4 (mir)
FreeBSD/32 4.11(sleipnir)
Mac OS/32 10.4.8 (amazon)
Diffstat (limited to 'src/H5Zpublic.h')
| -rw-r--r-- | src/H5Zpublic.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index a559174..c632c65 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -27,25 +27,29 @@ * appear in the HDF5 files. */ typedef int H5Z_filter_t; + +/* Filter IDs */ #define H5Z_FILTER_ERROR (-1) /*no filter */ #define H5Z_FILTER_NONE 0 /*reserved indefinitely */ -#define H5Z_FILTER_ALL 0 /*symbol to remove all filters in H5Premove_filter */ #define H5Z_FILTER_DEFLATE 1 /*deflation like gzip */ #define H5Z_FILTER_SHUFFLE 2 /*shuffle the data */ -#define H5Z_FILTER_FLETCHER32 3 /*fletcher32 checksum of EDC */ -#define H5Z_FILTER_SZIP 4 /*szip compression */ -#define H5Z_FILTER_NBIT 5 /*nbit compression */ -#define H5Z_FILTER_SCALEOFFSET 6 /*scaleoffset compression */ -#define H5Z_FILTER_RESERVED 256 /*filter ids below this value are reserved */ +#define H5Z_FILTER_FLETCHER32 3 /*fletcher32 checksum of EDC */ +#define H5Z_FILTER_SZIP 4 /*szip compression */ +#define H5Z_FILTER_NBIT 5 /*nbit compression */ +#define H5Z_FILTER_SCALEOFFSET 6 /*scale+offset compression */ +#define H5Z_FILTER_RESERVED 256 /*filter ids below this value are reserved for library use */ #define H5Z_FILTER_MAX 65535 /*maximum filter id */ + +/* General macros */ +#define H5Z_FILTER_ALL 0 /* Symbol to remove all filters in H5Premove_filter */ #define H5Z_MAX_NFILTERS 32 /* Maximum number of filters allowed in a pipeline (should probably be allowed to be an unlimited amount) */ -/* Flags for filter definition */ +/* Flags for filter definition (stored) */ #define H5Z_FLAG_DEFMASK 0x00ff /*definition flag mask */ #define H5Z_FLAG_MANDATORY 0x0000 /*filter is mandatory */ #define H5Z_FLAG_OPTIONAL 0x0001 /*filter is optional */ -/* Additional flags for filter invocation */ +/* Additional flags for filter invocation (not stored) */ #define H5Z_FLAG_INVMASK 0xff00 /*invocation flag mask */ #define H5Z_FLAG_REVERSE 0x0100 /*reverse direction; read */ #define H5Z_FLAG_SKIP_EDC 0x0200 /*skip EDC filters for read */ @@ -174,7 +178,7 @@ typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, * contain a pointers to the filter function and timing statistics. */ typedef struct H5Z_class_t { - int version; /* Version number of the H5Z_class_t struct */ + int version; /* Version number of the H5Z_class_t struct */ H5Z_filter_t id; /* Filter ID number */ unsigned encoder_present; /* Does this filter have an encoder? */ unsigned decoder_present; /* Does this filter have a decoder? */ |