diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-01-22 17:34:43 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-01-22 17:34:43 (GMT) |
| commit | 65c670d39cb5466185f23e6a39a743f02e4f4ae8 (patch) | |
| tree | ec16aa9ad5385c3b2a1a47a06280644f5a3170ff /tools/src/h5repack/h5repack_parse.c | |
| parent | 8aa520584463a5151699dc5768bcdef39f5564a6 (diff) | |
| parent | c5e311897444abe43b9dafcf0225e9fb880a3e2b (diff) | |
| download | hdf5-65c670d39cb5466185f23e6a39a743f02e4f4ae8.zip hdf5-65c670d39cb5466185f23e6a39a743f02e4f4ae8.tar.gz hdf5-65c670d39cb5466185f23e6a39a743f02e4f4ae8.tar.bz2 | |
Merge branch 'develop' into avoid_trunc_beta
Diffstat (limited to 'tools/src/h5repack/h5repack_parse.c')
| -rw-r--r-- | tools/src/h5repack/h5repack_parse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c index 05af197..03fcf0e 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 ',' */ } @@ -462,7 +462,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, return obj_list; } - + /*------------------------------------------------------------------------- * Function: parse_layout * |