diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2009-05-08 13:59:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2009-05-08 13:59:54 (GMT) |
| commit | 0c1b7185adee382ec6c1d81b11a044a628dec8b0 (patch) | |
| tree | d9cc6b5a4932997f433c145bfa7b58085fc39d44 /tools/h5dump | |
| parent | 72af05c9ecda4477d8417a68be415bd991d93d77 (diff) | |
| download | hdf5-0c1b7185adee382ec6c1d81b11a044a628dec8b0.zip hdf5-0c1b7185adee382ec6c1d81b11a044a628dec8b0.tar.gz hdf5-0c1b7185adee382ec6c1d81b11a044a628dec8b0.tar.bz2 | |
[svn-r16927] Added multiple packed bits loop.
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/h5dump.c | 16 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index f7fe292..b2b790d 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2194,6 +2194,8 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset) hid_t type, space; unsigned attr_crt_order_flags; hid_t dcpl_id; /* dataset creation property list ID */ + int data_loop = 1; + int i; if ((dcpl_id = H5Dget_create_plist(did)) < 0) @@ -2226,10 +2228,16 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset) if(display_dcpl) dump_dcpl(dcpl_id, type, did); - if(display_packed_bits) - dump_packed_bits(packed_output-1); + if(display_data) { + if(display_packed_bits) + data_loop = packed_output; + for(i=0;i<data_loop;i++) { + if(display_packed_bits) { + dump_packed_bits(i); + packed_counter = packed_mask[i]; + packed_normalize = packed_offset[i]; + } - if(display_data) switch(H5Tget_class(type)) { case H5T_TIME: indentation(indent + COL); @@ -2252,6 +2260,8 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset) default: break; } /* end switch */ + } + } indent += COL; diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 16b4b04..07ed852 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -515,6 +515,7 @@ TOOLTEST textlinkfar.ddl textlinkfar.h5 # test for dataset packed bits TOOLTEST tpackedbits.ddl -d /dset1 -M 0,2 tdset.h5 +TOOLTEST tpackedbits2.ddl -d /dset1 -M 0,2,2,1 tdset.h5 if test $nerrors -eq 0 ; then |