Mercurial > hg > octave-nkf
diff libinterp/octave-value/ov-bool-sparse.cc @ 20070:09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
* oct-hdf5-id.cc, oct-hdf5-id.h: New files.
* libinterp/corefcn/module.mk: Update.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Remove
$(HDF5_CPPFLAGS) from the list.
* load-save.h (enum load_save_format_type): Always include LS_HDF5
in the list of values.
* ls-hdf5.cc (read_hdf5_data, save_hdf5_data):
Call check_hdf5_id_type.
* oct-hdf5.h: Also #define HDF5_SAVE_TYPE.
* ov.h, ov-base.h: Include oct-hdf5-id.h instead of oct-hdf5.h.
Always declare load_hdf5 and save_hdf5 functions.
* ov-base-int.cc, ov-base-int.h, ov-base.cc, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h,
ov-complex.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-mat.h,
ov-cx-sparse.cc, ov-cx-sparse.h, ov-fcn-handle.cc, ov-fcn-handle.h,
ov-fcn-inline.cc, ov-fcn-inline.h, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-mat.cc,
ov-flt-cx-mat.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-lazy-idx.h, ov-oncleanup.cc,
ov-oncleanup.h, ov-range.cc ov-range.h, ov-re-mat.cc, ov-re-mat.h,
ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h,
ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc,
ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Move #ifdef HAVE_HDF5 inside
load_hdf5 and save_hdf5 functions. Always declare and define
load_hdf5 and save_hdf5 functions.
| author | John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> |
|---|---|
| date | Thu, 26 Feb 2015 10:49:20 -0500 |
| parents | 4197fc428c7d |
| children | aa36fb998a4d |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-bool-sparse.cc +++ b/libinterp/octave-value/ov-bool-sparse.cc @@ -40,6 +40,8 @@ #include "ops.h" #include "oct-locbuf.h" +#include "oct-hdf5.h" + #include "ov-re-sparse.h" #include "ov-cx-sparse.h" #include "ov-bool-sparse.h" @@ -336,11 +338,13 @@ return true; } +bool +octave_sparse_bool_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool) +{ + bool retval = false; + #if defined (HAVE_HDF5) -bool -octave_sparse_bool_matrix::save_hdf5 (hid_t loc_id, const char *name, bool) -{ dim_vector dv = dims (); int empty = save_hdf5_empty (loc_id, name, dv); if (empty) @@ -359,7 +363,6 @@ hid_t space_hid, data_hid; space_hid = data_hid = -1; - bool retval = true; SparseBoolMatrix m = sparse_bool_matrix_value (); octave_idx_type tmp; hsize_t hdims[2]; @@ -545,12 +548,20 @@ H5Sclose (space_hid); H5Gclose (group_hid); +#else + gripe_save ("hdf5"); +#endif + return retval; } bool -octave_sparse_bool_matrix::load_hdf5 (hid_t loc_id, const char *name) +octave_sparse_bool_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name) { + bool retval = false; + +#if defined (HAVE_HDF5) + octave_idx_type nr, nc, nz; hid_t group_hid, data_hid, space_hid; hsize_t rank; @@ -759,7 +770,7 @@ } OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nz); - bool retval = false; + if (H5Dread (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, H5P_DEFAULT, htmp) >= 0 && m.indices_ok ()) @@ -776,11 +787,13 @@ H5Dclose (data_hid); H5Gclose (group_hid); +#else + gripe_load ("hdf5"); +#endif + return retval; } -#endif - mxArray * octave_sparse_bool_matrix::as_mxArray (void) const {