diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-22 17:22:27 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-22 17:22:27 (GMT) |
commit | 233afe3b6f77a487baed555569ee0524ca7a4d24 (patch) | |
tree | bd247af8868be2a861374ce3a3d670547c62548f /tools/src/h5repack/h5repack_parse.c | |
parent | a3afda29f501e166d4d40ef1ad1fd320dbfe1974 (diff) | |
download | hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.zip hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.gz hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.bz2 |
HDFFV-10385,10392,10393 merge from develop
Diffstat (limited to 'tools/src/h5repack/h5repack_parse.c')
-rw-r--r-- | tools/src/h5repack/h5repack_parse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c index 05af197..f646ee7 100644 --- a/tools/src/h5repack/h5repack_parse.c +++ b/tools/src/h5repack/h5repack_parse.c @@ -45,9 +45,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, int f, k, l, p, q, end_obj = -1, no_param = 0; unsigned j, n; char sobj[MAX_NC_NAME]; - char scomp[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - char stype[6] = {0, 0, 0, 0, 0, 0}; - char smask[3] = {0, 0, 0}; + char scomp[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + char stype[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + char smask[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; obj_list_t* obj_list = NULL; unsigned pixels_per_block; @@ -116,7 +116,6 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, if (c == '=' || i == len - 1) { if (c == '=') { /*one more parameter */ scomp[k] = '\0'; /*cut space */ - /*------------------------------------------------------------------------- * H5Z_FILTER_SZIP * szip has the format SZIP=<pixels per block,coding> @@ -236,8 +235,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, filt->cd_nelmts = HDstrtoull(stype, NULL, 0); p = 0; } - else + else { filt->cd_values[j++] = (unsigned)HDstrtoul(stype, NULL, 0); + } q = 0; u++; /* skip ',' */ } |