Mercurial > forge

comparison main/fixed/src/ov-fixed.cc @ 9931:58d36e8880db octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Description: Make the package compile against HDF5 1.8 Author: Rafael Laboissiere <rafael@laboissiere.net>
author jordigh
date Fri, 30 Mar 2012 15:59:45 +0000
parents d84d2fea3c90
children 2deb6b24d293
comparison
equal deleted inserted replaced
9930:d30cfca46e8a 9931:58d36e8880db
289 #if defined (HAVE_HDF5) 289 #if defined (HAVE_HDF5)
290 bool 290 bool
291 octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) 291 octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
292 { 292 {
293 hid_t group_hid = -1; 293 hid_t group_hid = -1;
294 group_hid = H5Gcreate (loc_id, name, 0); 294 group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
295 if (group_hid < 0 ) return false; 295 if (group_hid < 0 ) return false;
296 296
297 hsize_t dims[3]; 297 hsize_t dims[3];
298 hid_t space_hid = -1, data_hid = -1; 298 hid_t space_hid = -1, data_hid = -1;
299 bool retval = true; 299 bool retval = true;
306 H5Gclose (group_hid); 306 H5Gclose (group_hid);
307 return false; 307 return false;
308 } 308 }
309 309
310 data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, 310 data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,
311 H5P_DEFAULT); 311 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
312 if (data_hid < 0) 312 if (data_hid < 0)
313 { 313 {
314 H5Sclose (space_hid); 314 H5Sclose (space_hid);
315 H5Gclose (group_hid); 315 H5Gclose (group_hid);
316 return false; 316 return false;
326 H5Gclose (group_hid); 326 H5Gclose (group_hid);
327 return false; 327 return false;
328 } 328 }
329 329
330 data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, 330 data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,
331 H5P_DEFAULT); 331 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
332 if (data_hid < 0) 332 if (data_hid < 0)
333 { 333 {
334 H5Sclose (space_hid); 334 H5Sclose (space_hid);
335 H5Gclose (group_hid); 335 H5Gclose (group_hid);
336 return false; 336 return false;
346 H5Gclose (group_hid); 346 H5Gclose (group_hid);
347 return false; 347 return false;
348 } 348 }
349 349
350 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, 350 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,
351 H5P_DEFAULT); 351 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
352 if (data_hid < 0) 352 if (data_hid < 0)
353 { 353 {
354 H5Sclose (space_hid); 354 H5Sclose (space_hid);
355 H5Gclose (group_hid); 355 H5Gclose (group_hid);
356 return false; 356 return false;
372 char intsize, decsize; 372 char intsize, decsize;
373 unsigned int number; 373 unsigned int number;
374 hid_t group_hid, data_hid, space_id; 374 hid_t group_hid, data_hid, space_id;
375 hsize_t rank; 375 hsize_t rank;
376 376
377 group_hid = H5Gopen (loc_id, name); 377 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
378 if (group_hid < 0 ) return false; 378 if (group_hid < 0 ) return false;
379 379
380 data_hid = H5Dopen (group_hid, "int"); 380 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
381 space_id = H5Dget_space (data_hid); 381 space_id = H5Dget_space (data_hid);
382 rank = H5Sget_simple_extent_ndims (space_id); 382 rank = H5Sget_simple_extent_ndims (space_id);
383 383
384 if (rank != 0) 384 if (rank != 0)
385 { 385 {
396 return false; 396 return false;
397 } 397 }
398 398
399 399
400 H5Dclose (data_hid); 400 H5Dclose (data_hid);
401 data_hid = H5Dopen (group_hid, "dec"); 401 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
402 space_id = H5Dget_space (data_hid); 402 space_id = H5Dget_space (data_hid);
403 rank = H5Sget_simple_extent_ndims (space_id); 403 rank = H5Sget_simple_extent_ndims (space_id);
404 404
405 if (rank != 0) 405 if (rank != 0)
406 { 406 {
416 H5Gclose (group_hid); 416 H5Gclose (group_hid);
417 return false; 417 return false;
418 } 418 }
419 419
420 H5Dclose (data_hid); 420 H5Dclose (data_hid);
421 data_hid = H5Dopen (group_hid, "num"); 421 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
422 space_id = H5Dget_space (data_hid); 422 space_id = H5Dget_space (data_hid);
423 rank = H5Sget_simple_extent_ndims (space_id); 423 rank = H5Sget_simple_extent_ndims (space_id);
424 424
425 if (rank != 0) 425 if (rank != 0)
426 { 426 {