diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 01:59:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 01:59:24 (GMT) |
| commit | e99906f5175e1516a9f28b3acbcffd962637ca89 (patch) | |
| tree | 71119df458d9eebee588761243ba6d5205ee816d /src/H5Zscaleoffset.c | |
| parent | 0836a8cf5652392f59d3917446a7ca2af9234e09 (diff) | |
| download | hdf5-e99906f5175e1516a9f28b3acbcffd962637ca89.zip hdf5-e99906f5175e1516a9f28b3acbcffd962637ca89.tar.gz hdf5-e99906f5175e1516a9f28b3acbcffd962637ca89.tar.bz2 | |
[svn-r17268] Description:
Bring r17266 from 1.8 branch to trunk:
Clean up various compiler warnings from IRIX64 build
Tested on:
Mac OS X/32 (amazon) debug & production
(yes, I know it's not an IRIX64 system :-)
Too minor to require h5committest
Diffstat (limited to 'src/H5Zscaleoffset.c')
| -rw-r--r-- | src/H5Zscaleoffset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c index d59499c..8e32ab7 100644 --- a/src/H5Zscaleoffset.c +++ b/src/H5Zscaleoffset.c @@ -916,7 +916,7 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu unsigned dtype_class; /* datatype class */ unsigned dtype_sign; /* integer datatype sign */ unsigned filavail; /* flag indicating if fill value is defined or not */ - H5Z_SO_scale_type_t scale_type = 0;/* scale type */ + H5Z_SO_scale_type_t scale_type = H5Z_SO_FLOAT_DSCALE;/* scale type */ int scale_factor = 0; /* scale factor */ double D_val = 0.0; /* decimal scale factor */ uint32_t minbits = 0; /* minimum number of bits to store values */ @@ -955,8 +955,8 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu dtype_class = cd_values[H5Z_SCALEOFFSET_PARM_CLASS]; dtype_sign = cd_values[H5Z_SCALEOFFSET_PARM_SIGN]; filavail = cd_values[H5Z_SCALEOFFSET_PARM_FILAVAIL]; - scale_factor = (int) cd_values[H5Z_SCALEOFFSET_PARM_SCALEFACTOR]; - scale_type = cd_values[H5Z_SCALEOFFSET_PARM_SCALETYPE]; + scale_factor = (int)cd_values[H5Z_SCALEOFFSET_PARM_SCALEFACTOR]; + scale_type = (H5Z_SO_scale_type_t)cd_values[H5Z_SCALEOFFSET_PARM_SCALETYPE]; /* check and assign proper values set by user to related parameters * scale type can be H5Z_SO_FLOAT_DSCALE (0), H5Z_SO_FLOAT_ESCALE (1) or H5Z_SO_INT (other) |