Mercurial > octave-antonio

comparison libinterp/octave-value/ov-float.cc @ 19863: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 19755f4fc851
children 2f2220bfd379
comparison
equal deleted inserted replaced
19862:6b851f6acd55 19863: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"
181 182
182 scalar = dtmp; 183 scalar = dtmp;
183 return true; 184 return true;
184 } 185 }
185 186
187 bool
188 octave_float_scalar::save_hdf5 (octave_hdf5_id loc_id, const char *name,
189 bool /* save_as_floats */)
190 {
186 #if defined (HAVE_HDF5) 191 #if defined (HAVE_HDF5)
187 192
188 bool
189 octave_float_scalar::save_hdf5 (hid_t loc_id, const char *name,
190 bool /* save_as_floats */)
191 {
192 hsize_t dimens[3]; 193 hsize_t dimens[3];
193 hid_t space_hid, data_hid; 194 hid_t space_hid, data_hid;
194 space_hid = data_hid = -1; 195 space_hid = data_hid = -1;
195 bool retval = true; 196 bool retval = true;
196 197
214 H5P_DEFAULT, &tmp) >= 0; 215 H5P_DEFAULT, &tmp) >= 0;
215 216
216 H5Dclose (data_hid); 217 H5Dclose (data_hid);
217 H5Sclose (space_hid); 218 H5Sclose (space_hid);
218 219
220 #else
221 gripe_save ("hdf5");
222 #endif
223
219 return retval; 224 return retval;
220 } 225 }
221 226
222 bool 227 bool
223 octave_float_scalar::load_hdf5 (hid_t loc_id, const char *name) 228 octave_float_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name)
224 { 229 {
230 #if defined (HAVE_HDF5)
231
225 #if HAVE_HDF5_18 232 #if HAVE_HDF5_18
226 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); 233 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT);
227 #else 234 #else
228 hid_t data_hid = H5Dopen (loc_id, name); 235 hid_t data_hid = H5Dopen (loc_id, name);
229 #endif 236 #endif
248 scalar = dtmp; 255 scalar = dtmp;
249 256
250 H5Dclose (data_hid); 257 H5Dclose (data_hid);
251 258
252 return true; 259 return true;
253 } 260
254 261 #else
255 #endif 262 gripe_load ("hdf5");
263 return false;
264 #endif
265 }
256 266
257 mxArray * 267 mxArray *
258 octave_float_scalar::as_mxArray (void) const 268 octave_float_scalar::as_mxArray (void) const
259 { 269 {
260 mxArray *retval = new mxArray (mxSINGLE_CLASS, 1, 1, mxREAL); 270 mxArray *retval = new mxArray (mxSINGLE_CLASS, 1, 1, mxREAL);