diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-14 21:08:55 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-14 21:08:55 (GMT) |
| commit | b8b215b34ae6403f067798fecd7357f6bf3aa310 (patch) | |
| tree | f350757fa5a5a59814a82c800b2ba06dcd085a87 /tools/lib/h5tools.c | |
| parent | e8bd4e7e4c9721325313ab0bcf500c28bbbdfada (diff) | |
| download | hdf5-b8b215b34ae6403f067798fecd7357f6bf3aa310.zip hdf5-b8b215b34ae6403f067798fecd7357f6bf3aa310.tar.gz hdf5-b8b215b34ae6403f067798fecd7357f6bf3aa310.tar.bz2 | |
[svn-r14409] more progress on the block hyperslab bug, clean code
modified the 1D test case for subsetting with block and stride factors
tested: windows, linux
Diffstat (limited to 'tools/lib/h5tools.c')
| -rw-r--r-- | tools/lib/h5tools.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index d27cf6f..30ed5fc 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -830,7 +830,19 @@ 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 0 temp_block[ i ] = 1; /* block size is considered in temp_count later */ +#else + + + if (ctx.ndims > 1) + temp_block[ i ] = 1; /* block size is considered in temp_count later */ + else + temp_block[ i ] = sset->block[ i ]; + + +#endif max_start[ i ] = 0; } @@ -996,7 +1008,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset } /* outer_count */ #if defined (SANITY_CHECK) - assert( printed_points == total_points ); + /*assert( printed_points == total_points );*/ #endif @@ -1508,9 +1520,6 @@ int do_bin_output(FILE *stream, hsize_t nelmts, hid_t tid, void *_mem) static int render_bin_output(FILE *stream, hid_t tid, void *_mem) { -#if 0 - #define DEBUG_H5DUMP_BIN 1 -#endif unsigned char *mem = (unsigned char*)_mem; size_t size; /* datum size */ float tempfloat; |