diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-14 20:16:40 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-14 20:16:40 (GMT) |
| commit | e8bd4e7e4c9721325313ab0bcf500c28bbbdfada (patch) | |
| tree | 0060884741d8e689fb9b3cc2cc17a9f881aec0ad | |
| parent | cdc33803ee17ce2cd8a67a5be14c11d8b3f39fa7 (diff) | |
| download | hdf5-e8bd4e7e4c9721325313ab0bcf500c28bbbdfada.zip hdf5-e8bd4e7e4c9721325313ab0bcf500c28bbbdfada.tar.gz hdf5-e8bd4e7e4c9721325313ab0bcf500c28bbbdfada.tar.bz2 | |
[svn-r14408]
more progress on the block hyperslab bug, clean code
tested: windows, linux
| -rw-r--r-- | tools/lib/h5tools.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 287e257..d27cf6f 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -862,6 +862,8 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset temp_count[ row_dim + 1 ] = sset->count[ row_dim + 1 ] * sset->block[ row_dim + 1 ]; + + } /* for the 1D case */ else @@ -879,7 +881,6 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset temp_start, sset->stride, temp_count, - /*sset->block);*/ temp_block); sm_nelmts = H5Sget_select_npoints(f_space); @@ -967,8 +968,9 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset /* set start to original from current_outer_dim up */ for (i = current_outer_dim + 1; i < ctx.ndims; i++) { - temp_start[ i ] = sset->start[ i ]; + temp_start[ i ] = sset->start[ i ]; } + /* increment start dimension */ do @@ -978,6 +980,11 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset if (temp_start[ current_outer_dim ] >= max_start[ current_outer_dim ]) { temp_start[ current_outer_dim ] = sset->start[ current_outer_dim ]; + + /* consider block */ + if ( sset->block[ current_outer_dim ] > 1 ) + temp_start[ current_outer_dim ]++; + current_outer_dim--; reset_dim = 1; } |