diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2009-07-13 16:26:24 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2009-07-13 16:26:24 (GMT) |
| commit | 8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5 (patch) | |
| tree | 89b912ff750a20ae63bd8f8d31801f69f7379504 /tools | |
| parent | 39ad4fae0f60e34d09a4fff4322fb3767eea2e56 (diff) | |
| download | hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.zip hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.tar.gz hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.tar.bz2 | |
[svn-r17177] In H5Odtype.c, the decoding function used to mark the datatype as on disk (see bug
#1585). I changed it to undefined and let the caller functions decide the location
of the datatype. For H5Tdecode, it should mark the datatype as in memory. For other
callers like H5Dopen or H5Aopen, they should makr it as on disk.
Tested it on jam, smirom, linew.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testfiles/tvlstr.h5 | bin | 8192 -> 8192 bytes | |||
| -rw-r--r-- | tools/testfiles/tvlstr.h5.xml | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/testfiles/tvlstr.h5 b/tools/testfiles/tvlstr.h5 Binary files differindex 769d811..acd8a1f 100644 --- a/tools/testfiles/tvlstr.h5 +++ b/tools/testfiles/tvlstr.h5 diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml index 5999abd..507f0eb 100644 --- a/tools/testfiles/tvlstr.h5.xml +++ b/tools/testfiles/tvlstr.h5.xml @@ -3,19 +3,19 @@ Expected output for 'h5dump --xml tvlstr.h5' ############################# <?xml version="1.0" encoding="UTF-8"?> <hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> -<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> +<hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="test_scalar"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_1576" H5Path="/vl_string_type" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_1400" H5Path="/vl_string_type" /> <hdf5:Data> <hdf5:DataFromFile> "This is the string for the attribute" </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_800" H5Path= "/Dataset1" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -46,7 +46,7 @@ Expected output for 'h5dump --xml tvlstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1576" H5Path="/vl_string_type" Parents="xid_928" H5ParentPaths="/"> + <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1400" H5Path="/vl_string_type" Parents="xid_96" H5ParentPaths="/"> <hdf5:DataType> <hdf5:AtomicType> <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLPAD"/> |