Mercurial > forge

comparison main/fixed/src/ov-fixed-mat.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
572 #if defined (HAVE_HDF5) 572 #if defined (HAVE_HDF5)
573 bool 573 bool
574 octave_fixed_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) 574 octave_fixed_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
575 { 575 {
576 hid_t group_hid = -1; 576 hid_t group_hid = -1;
577 group_hid = H5Gcreate (loc_id, name, 0); 577 group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
578 if (group_hid < 0 ) return false; 578 if (group_hid < 0 ) return false;
579 579
580 dim_vector d = dims (); 580 dim_vector d = dims ();
581 OCTAVE_LOCAL_BUFFER(hsize_t, hdims, d.length () > 2 ? d.length () : 3); 581 OCTAVE_LOCAL_BUFFER(hsize_t, hdims, d.length () > 2 ? d.length () : 3);
582 hid_t space_hid = -1, data_hid = -1; 582 hid_t space_hid = -1, data_hid = -1;
593 H5Gclose (group_hid); 593 H5Gclose (group_hid);
594 return false; 594 return false;
595 } 595 }
596 596
597 data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, 597 data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,
598 H5P_DEFAULT); 598 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
599 if (data_hid < 0) 599 if (data_hid < 0)
600 { 600 {
601 H5Sclose (space_hid); 601 H5Sclose (space_hid);
602 H5Gclose (group_hid); 602 H5Gclose (group_hid);
603 return false; 603 return false;
616 H5Gclose (group_hid); 616 H5Gclose (group_hid);
617 return false; 617 return false;
618 } 618 }
619 619
620 data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, 620 data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,
621 H5P_DEFAULT); 621 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
622 if (data_hid < 0) 622 if (data_hid < 0)
623 { 623 {
624 H5Sclose (space_hid); 624 H5Sclose (space_hid);
625 H5Gclose (group_hid); 625 H5Gclose (group_hid);
626 return false; 626 return false;
638 H5Gclose (group_hid); 638 H5Gclose (group_hid);
639 return false; 639 return false;
640 } 640 }
641 641
642 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, 642 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,
643 H5P_DEFAULT); 643 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
644 if (data_hid < 0) 644 if (data_hid < 0)
645 { 645 {
646 H5Sclose (space_hid); 646 H5Sclose (space_hid);
647 H5Gclose (group_hid); 647 H5Gclose (group_hid);
648 return false; 648 return false;
666 { 666 {
667 herr_t retval = -1; 667 herr_t retval = -1;
668 hid_t group_hid, data_hid, space_id; 668 hid_t group_hid, data_hid, space_id;
669 hsize_t rank, rank_old; 669 hsize_t rank, rank_old;
670 670
671 group_hid = H5Gopen (loc_id, name); 671 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
672 if (group_hid < 0 ) return false; 672 if (group_hid < 0 ) return false;
673 673
674 data_hid = H5Dopen (group_hid, "int"); 674 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
675 space_id = H5Dget_space (data_hid); 675 space_id = H5Dget_space (data_hid);
676 rank = H5Sget_simple_extent_ndims (space_id); 676 rank = H5Sget_simple_extent_ndims (space_id);
677 rank_old = rank; 677 rank_old = rank;
678 678
679 if (rank < 1 || rank > 2) 679 if (rank < 1 || rank > 2)
717 H5Gclose (group_hid); 717 H5Gclose (group_hid);
718 return false; 718 return false;
719 } 719 }
720 H5Dclose (data_hid); 720 H5Dclose (data_hid);
721 721
722 data_hid = H5Dopen (group_hid, "dec"); 722 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
723 space_id = H5Dget_space (data_hid); 723 space_id = H5Dget_space (data_hid);
724 rank = H5Sget_simple_extent_ndims (space_id); 724 rank = H5Sget_simple_extent_ndims (space_id);
725 725
726 if (rank != rank_old) 726 if (rank != rank_old)
727 { 727 {
764 H5Gclose (group_hid); 764 H5Gclose (group_hid);
765 return false; 765 return false;
766 } 766 }
767 H5Dclose (data_hid); 767 H5Dclose (data_hid);
768 768
769 data_hid = H5Dopen (group_hid, "num"); 769 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
770 space_id = H5Dget_space (data_hid); 770 space_id = H5Dget_space (data_hid);
771 rank = H5Sget_simple_extent_ndims (space_id); 771 rank = H5Sget_simple_extent_ndims (space_id);
772 772
773 if (rank != rank_old) 773 if (rank != rank_old)
774 { 774 {