Mercurial > hg > octave-nkf
changeset 5060:34a904ac130d
[project @ 2004-11-02 03:08:10 by jwe]
author | jwe |
---|---|
date | Tue, 02 Nov 2004 03:08:10 +0000 |
parents | 38dd53c8935e |
children | 4689ee5e88ec |
files | src/ChangeLog src/ls-hdf5.cc src/ov-cell.cc src/ov-list.cc src/ov-struct.cc |
diffstat | 5 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-11-01 Claude Lacoursiere <claude@hpc2n.umu.se>a + + * ls-hdf5.cc (read_hdf5_data): Expect num_obj to be in distinct group. + * ov-cell.cc (octave_cell::load_hdf5): Likewise. + * ov-list.cc (octave_list::load_hdf5): Likewise. + * ov-struct.cc (octave_struct::load_hdf5): Likewise. + 2004-11-01 David Bateman <dbateman@free.fr> * DLD-FUNCTIONS/filter.cc (filter (MArray<T>&, MArray<T>&,
--- a/src/ls-hdf5.cc +++ b/src/ls-hdf5.cc @@ -546,7 +546,9 @@ #ifdef HAVE_H5GGET_NUM_OBJS hsize_t num_obj = 0; - H5Gget_num_objs (hs.file_id, &num_obj); + hid_t group_id = H5Gopen (hs.file_id, "/"); + H5Gget_num_objs (group_id, &num_obj); + H5Gclose (group_id); if (hs.current_item < static_cast<int> (num_obj)) #endif H5Giterate_retval = H5Giterate (hs.file_id, "/", &hs.current_item,
--- a/src/ov-cell.cc +++ b/src/ov-cell.cc @@ -840,7 +840,9 @@ #ifdef HAVE_H5GGET_NUM_OBJS hsize_t num_obj = 0; - H5Gget_num_objs (loc_id, &num_obj); + group_id = H5Gopen (loc_id, name); + H5Gget_num_objs (group_id, &num_obj); + H5Gclose (group_id); #endif for (int i = 0; i < dv.numel (); i++)
--- a/src/ov-list.cc +++ b/src/ov-list.cc @@ -712,7 +712,9 @@ int current_item = 0; #ifdef HAVE_H5GGET_NUM_OBJS hsize_t num_obj = 0; - H5Gget_num_objs (loc_id, &num_obj); + hid_t group_id = H5Gopen (loc_id, name); + H5Gget_num_objs (group_id, &num_obj); + H5Gclose (group_id); while (current_item < static_cast<int> (num_obj) && (retval2 = H5Giterate (loc_id, name, ¤t_item,
--- a/src/ov-struct.cc +++ b/src/ov-struct.cc @@ -1172,7 +1172,9 @@ int current_item = 0; #ifdef HAVE_H5GGET_NUM_OBJS hsize_t num_obj = 0; - H5Gget_num_objs (loc_id, &num_obj); + hid_t group_id = H5Gopen (loc_id, name); + H5Gget_num_objs (group_id, &num_obj); + H5Gclose (group_id); while (current_item < static_cast<int> (num_obj) && (retval2 = H5Giterate (loc_id, name, ¤t_item,