diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-01-05 16:22:59 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-01-05 16:22:59 (GMT) |
commit | 85d3499528a3d990f42ef2b7904fe3cf95d850b3 (patch) | |
tree | 47be813ebcf8b46671d4bcc93f458caa847eae3b /tools/h5dump | |
parent | 4b3bdd519c02476e98d484f4af873e577fc25604 (diff) | |
download | hdf5-85d3499528a3d990f42ef2b7904fe3cf95d850b3.zip hdf5-85d3499528a3d990f42ef2b7904fe3cf95d850b3.tar.gz hdf5-85d3499528a3d990f42ef2b7904fe3cf95d850b3.tar.bz2 |
[svn-r19912] Add instruction to get native type before checking the type against H5T_NATIVE_xxxx
Tested: heiwa where it had failed
Diffstat (limited to 'tools/h5dump')
-rw-r--r-- | tools/h5dump/h5dump.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 937c869..a4e7473 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2702,35 +2702,36 @@ static void dump_packed_bits(unsigned int packed_index, hid_t type) { int packed_bits_size = 0; - if(H5Tget_class(type)==H5T_INTEGER) { - if(H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) { + hid_t n_type = h5tools_get_native_type(type); + if(H5Tget_class(n_type)==H5T_INTEGER) { + if(H5Tequal(n_type, H5T_NATIVE_SCHAR) == TRUE) { packed_bits_size = 8 * sizeof(char); } - else if(H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_UCHAR) == TRUE) { packed_bits_size = 8 * sizeof(unsigned char); } - else if(H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_SHORT) == TRUE) { packed_bits_size = 8 * sizeof(short); } - else if(H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_USHORT) == TRUE) { packed_bits_size = 8 * sizeof(unsigned short); } - else if(H5Tequal(type, H5T_NATIVE_INT) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_INT) == TRUE) { packed_bits_size = 8 * sizeof(int); } - else if(H5Tequal(type, H5T_NATIVE_UINT) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_UINT) == TRUE) { packed_bits_size = 8 * sizeof(unsigned int); } - else if(H5Tequal(type, H5T_NATIVE_LONG) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_LONG) == TRUE) { packed_bits_size = 8 * sizeof(long); } - else if(H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_ULONG) == TRUE) { packed_bits_size = 8 * sizeof(unsigned long); } - else if(H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_LLONG) == TRUE) { packed_bits_size = 8 * sizeof(long long); } - else if(H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) { + else if(H5Tequal(n_type, H5T_NATIVE_ULLONG) == TRUE) { packed_bits_size = 8 * sizeof(unsigned long long); } else |