Mercurial > octave-nkf

comparison libinterp/octave-value/ov-scalar.cc @ 19897:09ed6f7538dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c6224b4e7774
comparison
equal deleted inserted replaced
19896:6b851f6acd55 19897:09ed6f7538dd
33 33
34 #include "defun.h" 34 #include "defun.h"
35 #include "gripes.h" 35 #include "gripes.h"
36 #include "mxarray.h" 36 #include "mxarray.h"
37 #include "oct-obj.h" 37 #include "oct-obj.h"
38 #include "oct-hdf5.h"
38 #include "oct-stream.h" 39 #include "oct-stream.h"
39 #include "ov-scalar.h" 40 #include "ov-scalar.h"
40 #include "ov-float.h" 41 #include "ov-float.h"
41 #include "ov-base.h" 42 #include "ov-base.h"
42 #include "ov-base-scalar.h" 43 #include "ov-base-scalar.h"
196 197
197 scalar = dtmp; 198 scalar = dtmp;
198 return true; 199 return true;
199 } 200 }
200 201
202 bool
203 octave_scalar::save_hdf5 (octave_hdf5_id loc_id, const char *name,
204 bool /* save_as_floats */)
205 {
206 bool retval = false;
207
201 #if defined (HAVE_HDF5) 208 #if defined (HAVE_HDF5)
202 209
203 bool
204 octave_scalar::save_hdf5 (hid_t loc_id, const char *name,
205 bool /* save_as_floats */)
206 {
207 hsize_t dimens[3]; 210 hsize_t dimens[3];
208 hid_t space_hid, data_hid; 211 hid_t space_hid, data_hid;
209 space_hid = data_hid = -1; 212 space_hid = data_hid = -1;
210 bool retval = true;
211 213
212 space_hid = H5Screate_simple (0, dimens, 0); 214 space_hid = H5Screate_simple (0, dimens, 0);
213 if (space_hid < 0) return false; 215 if (space_hid < 0) return false;
214 216
215 #if HAVE_HDF5_18 217 #if HAVE_HDF5_18
230 H5P_DEFAULT, &tmp) >= 0; 232 H5P_DEFAULT, &tmp) >= 0;
231 233
232 H5Dclose (data_hid); 234 H5Dclose (data_hid);
233 H5Sclose (space_hid); 235 H5Sclose (space_hid);
234 236
237 #else
238 gripe_save ("hdf5");
239 #endif
240
235 return retval; 241 return retval;
236 } 242 }
237 243
238 bool 244 bool
239 octave_scalar::load_hdf5 (hid_t loc_id, const char *name) 245 octave_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name)
240 { 246 {
247 #if defined (HAVE_HDF5)
248
241 #if HAVE_HDF5_18 249 #if HAVE_HDF5_18
242 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); 250 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT);
243 #else 251 #else
244 hid_t data_hid = H5Dopen (loc_id, name); 252 hid_t data_hid = H5Dopen (loc_id, name);
245 #endif 253 #endif
264 scalar = dtmp; 272 scalar = dtmp;
265 273
266 H5Dclose (data_hid); 274 H5Dclose (data_hid);
267 275
268 return true; 276 return true;
269 } 277
270 278 #else
279 gripe_load ("hdf5");
280 return false;
271 #endif 281 #endif
282 }
272 283
273 mxArray * 284 mxArray *
274 octave_scalar::as_mxArray (void) const 285 octave_scalar::as_mxArray (void) const
275 { 286 {
276 mxArray *retval = new mxArray (mxDOUBLE_CLASS, 1, 1, mxREAL); 287 mxArray *retval = new mxArray (mxDOUBLE_CLASS, 1, 1, mxREAL);