diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-15 00:18:29 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-15 00:18:29 (GMT) |
| commit | be4ca1f67ec5e43806378913e280cc3ca4f9d5bc (patch) | |
| tree | 82d910906e265f8a45d80d9f2bc189c0cf159e42 /tools/lib | |
| parent | 7fc10c0ea7e447408ccc747d16516b5505dcffa6 (diff) | |
| download | hdf5-be4ca1f67ec5e43806378913e280cc3ca4f9d5bc.zip hdf5-be4ca1f67ec5e43806378913e280cc3ca4f9d5bc.tar.gz hdf5-be4ca1f67ec5e43806378913e280cc3ca4f9d5bc.tar.bz2 | |
[svn-r14414] revert the subsetting calls of h5dump to 1 size block, still a bug with size > 1
tested: linux
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5tools.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 045d875..77a8bb3 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -835,12 +835,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset { temp_start[ i ] = sset->start[ i ]; temp_count[ i ] = sset->count[ i ]; - - if (ctx.ndims > 1) - temp_block[ i ] = 1; /* block size is considered in temp_count later */ - else - temp_block[ i ] = sset->block[ i ]; - + temp_block[ i ] = sset->block[ i ]; max_start[ i ] = 0; } @@ -863,16 +858,13 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset if (ctx.ndims > 1) { - /* count is the number of iterations to display all the rows - consider how many blocks */ + /* count is the number of iterations to display all the rows, + the block size count times */ count = sset->count[ row_dim ] * sset->block[ row_dim ]; - temp_count[ row_dim ] = 1; /* always 1 row at a time */ - /* but consider the block size in temp_count for columns */ - temp_count[ row_dim + 1 ] = sset->count[ row_dim + 1 ] - * sset->block[ row_dim + 1 ]; - - + /* always 1 row at a time, that is a block of size 1, 1 time */ + temp_count[ row_dim ] = 1; + temp_block[ row_dim ] = 1; } /* for the 1D case */ |