From 71e345cd4ecad162854a8f3621693f6ef9bac641 Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Wed, 31 Aug 2005 17:10:54 -0500 Subject: [svn-r11326] Purpose: Updating scale offset filter. Description: Using enum to represent scale_offset type. Change the order of parameters of H5Pset_scaleoffset. Solution: Platforms tested: sol 2.9, Liunx 2.4, AIX 5.1 Misc. update: --- src/H5Ppublic.h | 2 +- src/H5Zpublic.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 0a37721..e6f5a7f 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -268,7 +268,7 @@ H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression); H5_DLL herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block); H5_DLL herr_t H5Pset_shuffle(hid_t plist_id); H5_DLL herr_t H5Pset_nbit(hid_t plist_id); -H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, int scale_factor, unsigned scale_type); +H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, H5_SO_scale_type scale_type, int scale_factor); H5_DLL herr_t H5Pset_fletcher32(hid_t plist_id); H5_DLL herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check); H5_DLL H5Z_EDC_t H5Pget_edc_check(hid_t plist_id); diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 38134f3..c6fd426 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -61,10 +61,12 @@ typedef int H5Z_filter_t; #define H5_SZIP_MAX_PIXELS_PER_BLOCK 32 /* Special parameters for ScaleOffset filter*/ -#define H5_SO_FLOAT_DSCALE 0 -#define H5_SO_FLOAT_ESCALE 1 -#define H5_SO_INT 2 -#define H5_SO_INT_MINIMUMBITS_DEFAULT 0 +#define H5_SO_INT_MINBITS_DEFAULT 0 +typedef enum H5_SO_scale_type { + H5_SO_FLOAT_DSCALE = 0, + H5_SO_FLOAT_ESCALE = 1, + H5_SO_INT = 2 +} H5_SO_scale_type; /* Current version of the H5Z_class_t struct */ #define H5Z_CLASS_T_VERS (1) -- cgit v0.12