Mercurial > octave-nkf
annotate src/ov-base-int.cc @ 11542:695141f1c05c ss-3-3-55
snapshot 3.3.55
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 15 Jan 2011 04:53:04 -0500 |
| parents | fd0a3ac60b0e |
| children | 12df7854fa7c |
| rev | line source |
|---|---|
| 4903 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 2004-2011 John W. Eaton |
| 4903 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 4903 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 4903 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include <climits> | |
| 28 | |
| 29 #include <iostream> | |
| 30 #include <vector> | |
| 31 | |
| 32 #include "lo-ieee.h" | |
| 33 #include "lo-utils.h" | |
| 34 #include "mx-base.h" | |
| 35 #include "quit.h" | |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
7534
diff
changeset
|
36 #include "oct-locbuf.h" |
| 4903 | 37 |
| 38 #include "defun.h" | |
| 39 #include "gripes.h" | |
| 40 #include "oct-obj.h" | |
| 41 #include "oct-lvalue.h" | |
| 4944 | 42 #include "oct-stream.h" |
| 4903 | 43 #include "ops.h" |
| 44 #include "ov-base.h" | |
| 45 #include "ov-base-mat.h" | |
| 46 #include "ov-base-mat.cc" | |
| 47 #include "ov-base-scalar.h" | |
| 48 #include "ov-base-scalar.cc" | |
| 49 #include "ov-base-int.h" | |
| 50 #include "ov-int-traits.h" | |
| 51 #include "pr-output.h" | |
| 52 #include "variables.h" | |
| 53 | |
| 54 #include "byte-swap.h" | |
| 55 #include "ls-oct-ascii.h" | |
| 56 #include "ls-utils.h" | |
| 57 #include "ls-hdf5.h" | |
| 58 | |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
59 // We have all the machinery below (octave_base_int_helper and |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
60 // octave_base_int_helper_traits) to avoid a few warnings from GCC |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
61 // about comparisons always false due to limited range of data types. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
62 // Ugh. The cure may be worse than the disease. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
63 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
64 template <class T, bool is_signed = true, bool can_be_too_big = true> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
65 struct octave_base_int_helper |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
66 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
67 static bool |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
68 char_value_out_of_range (T val) { return val < 0 || val > UCHAR_MAX; } |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
69 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
70 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
71 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
72 struct octave_base_int_helper<T, false, false> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
73 { |
|
9149
7120fbbecf97
ov-base-int.cc: correct result for template specialization
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
74 static bool char_value_out_of_range (T) { return false; } |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
75 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
76 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
77 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
78 struct octave_base_int_helper<T, false, true> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
79 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
80 static bool char_value_out_of_range (T val) { return val > UCHAR_MAX; } |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
81 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
82 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
83 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
84 struct octave_base_int_helper<T, true, false> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
85 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
86 static bool char_value_out_of_range (T val) { return val < 0; } |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
87 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
88 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
89 // For all types other than char, signed char, and unsigned char, we |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
90 // assume that the upper limit for the range of allowable values is |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
91 // larger than the range for unsigned char. If that's not true, we |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
92 // are still OK, but will see the warnings again for any other types |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
93 // that do not meet this assumption. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
94 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
95 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
96 struct octave_base_int_helper_traits |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
98 static const bool can_be_larger_than_uchar_max = true; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
99 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
100 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
101 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
102 struct octave_base_int_helper_traits<char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
103 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
104 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
105 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
106 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
107 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
108 struct octave_base_int_helper_traits<signed char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
109 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
110 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
111 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
112 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
113 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
114 struct octave_base_int_helper_traits<unsigned char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
115 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
116 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
117 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
118 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
119 |
| 4903 | 120 template <class T> |
| 5759 | 121 octave_base_value * |
| 4903 | 122 octave_base_int_matrix<T>::try_narrowing_conversion (void) |
| 123 { | |
| 5759 | 124 octave_base_value *retval = 0; |
| 4903 | 125 |
| 4932 | 126 if (this->matrix.nelem () == 1) |
| 127 retval = new typename octave_value_int_traits<T>::scalar_type (this->matrix (0)); | |
| 4903 | 128 |
| 129 return retval; | |
| 130 } | |
| 131 | |
| 132 template <class T> | |
| 5992 | 133 octave_value |
| 134 octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const | |
| 135 { | |
| 136 octave_value retval; | |
| 137 dim_vector dv = this->dims (); | |
| 138 octave_idx_type nel = dv.numel (); | |
| 139 | |
| 140 charNDArray chm (dv); | |
| 141 | |
| 142 bool warned = false; | |
| 143 | |
| 144 for (octave_idx_type i = 0; i < nel; i++) | |
| 145 { | |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
146 octave_quit (); |
| 5992 | 147 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8377
diff
changeset
|
148 typename T::element_type tmp = this->matrix(i); |
| 5992 | 149 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8377
diff
changeset
|
150 typedef typename T::element_type::val_type val_type; |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
151 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
152 val_type ival = tmp.value (); |
| 5992 | 153 |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
154 static const bool is_signed = std::numeric_limits<val_type>::is_signed; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
155 static const bool can_be_larger_than_uchar_max |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
156 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
157 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
158 if (octave_base_int_helper<val_type, is_signed, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
159 can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
160 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
161 // FIXME -- is there something better we could do? |
| 5992 | 162 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
163 ival = 0; |
| 5992 | 164 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
165 if (! warned) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
166 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
167 ::warning ("range error for conversion to character value"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
168 warned = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
169 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
170 } |
| 5992 | 171 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
172 chm (i) = static_cast<char> (ival); |
| 5992 | 173 } |
| 174 | |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9149
diff
changeset
|
175 retval = octave_value (chm, type); |
| 5992 | 176 |
| 177 return retval; | |
| 178 } | |
| 179 | |
| 180 template <class T> | |
| 4903 | 181 bool |
| 6974 | 182 octave_base_int_matrix<T>::save_ascii (std::ostream& os) |
| 4903 | 183 { |
| 4932 | 184 dim_vector d = this->dims (); |
| 4903 | 185 |
| 186 os << "# ndims: " << d.length () << "\n"; | |
| 187 | |
| 188 for (int i = 0; i < d.length (); i++) | |
| 189 os << " " << d (i); | |
| 190 | |
| 4932 | 191 os << "\n" << this->matrix; |
| 4903 | 192 |
| 193 return true; | |
| 194 } | |
| 195 | |
| 196 template <class T> | |
| 197 bool | |
| 198 octave_base_int_matrix<T>::load_ascii (std::istream& is) | |
| 199 { | |
| 200 int mdims = 0; | |
| 201 bool success = true; | |
| 202 | |
| 203 if (extract_keyword (is, "ndims", mdims, true)) | |
| 204 { | |
| 205 if (mdims >= 0) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
206 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
207 dim_vector dv; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
208 dv.resize (mdims); |
| 4903 | 209 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
210 for (int i = 0; i < mdims; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
211 is >> dv(i); |
| 4903 | 212 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
213 T tmp(dv); |
| 4903 | 214 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
215 is >> tmp; |
| 4903 | 216 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
217 if (!is) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
218 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
219 error ("load: failed to load matrix constant"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
220 success = false; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
221 } |
| 4903 | 222 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
223 this->matrix = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
224 } |
| 4903 | 225 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
226 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
227 error ("load: failed to extract number of rows and columns"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
228 success = false; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
229 } |
| 4903 | 230 } |
| 231 else | |
| 232 error ("load: failed to extract number of dimensions"); | |
| 233 | |
| 234 return success; | |
| 235 } | |
| 236 | |
| 237 template <class T> | |
| 238 bool | |
| 4917 | 239 octave_base_int_matrix<T>::save_binary (std::ostream& os, bool&) |
| 4903 | 240 { |
| 4932 | 241 dim_vector d = this->dims (); |
| 4903 | 242 if (d.length() < 1) |
| 243 return false; | |
| 244 | |
| 245 // Use negative value for ndims to differentiate with old format!! | |
| 5828 | 246 int32_t tmp = - d.length(); |
| 5760 | 247 os.write (reinterpret_cast<char *> (&tmp), 4); |
| 4903 | 248 for (int i=0; i < d.length (); i++) |
| 249 { | |
| 250 tmp = d(i); | |
| 5760 | 251 os.write (reinterpret_cast<char *> (&tmp), 4); |
| 4903 | 252 } |
| 253 | |
| 5760 | 254 os.write (reinterpret_cast<const char *> (this->matrix.data()), this->byte_size()); |
| 4903 | 255 |
| 256 return true; | |
| 257 } | |
| 258 | |
| 259 template <class T> | |
| 260 bool | |
| 261 octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
262 oct_mach_info::float_format ) |
| 4903 | 263 { |
| 5828 | 264 int32_t mdims; |
| 5760 | 265 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
| 4903 | 266 return false; |
| 267 if (swap) | |
| 4944 | 268 swap_bytes<4> (&mdims); |
| 4917 | 269 if (mdims >= 0) |
| 270 return false; | |
| 4903 | 271 |
| 4917 | 272 mdims = - mdims; |
| 5828 | 273 int32_t di; |
| 4917 | 274 dim_vector dv; |
| 275 dv.resize (mdims); | |
| 4903 | 276 |
| 4917 | 277 for (int i = 0; i < mdims; i++) |
| 4903 | 278 { |
| 5760 | 279 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
280 return false; |
| 4903 | 281 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
282 swap_bytes<4> (&di); |
| 4917 | 283 dv(i) = di; |
| 4903 | 284 } |
| 285 | |
| 5157 | 286 // Convert an array with a single dimension to be a row vector. |
| 287 // Octave should never write files like this, other software | |
| 288 // might. | |
| 289 | |
| 290 if (mdims == 1) | |
| 291 { | |
| 292 mdims = 2; | |
| 293 dv.resize (mdims); | |
| 294 dv(1) = dv(0); | |
| 295 dv(0) = 1; | |
| 296 } | |
| 297 | |
| 4917 | 298 T m (dv); |
| 299 | |
| 5760 | 300 if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ())) |
| 4917 | 301 return false; |
| 4903 | 302 |
| 4917 | 303 if (swap) |
| 304 { | |
| 305 int nel = dv.numel (); | |
| 306 int bytes = nel / m.byte_size(); | |
| 307 for (int i = 0; i < nel; i++) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
308 switch (bytes) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
309 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
310 case 8: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
311 swap_bytes<8> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
312 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
313 case 4: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
314 swap_bytes<4> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
315 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
316 case 2: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
317 swap_bytes<2> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
318 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
319 case 1: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
320 default: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
321 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
322 } |
| 4917 | 323 } |
| 324 | |
| 4932 | 325 this->matrix = m; |
| 4903 | 326 return true; |
| 327 } | |
| 328 | |
| 329 #if defined (HAVE_HDF5) | |
| 330 | |
| 331 template <class T> | |
| 332 bool | |
| 4917 | 333 octave_base_int_matrix<T>::save_hdf5 (hid_t loc_id, const char *name, bool) |
| 4903 | 334 { |
| 4917 | 335 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 336 bool retval = true; |
| 4932 | 337 dim_vector dv = this->dims (); |
| 4903 | 338 int empty = save_hdf5_empty (loc_id, name, dv); |
| 339 if (empty) | |
| 340 return (empty > 0); | |
| 341 | |
| 342 int rank = dv.length (); | |
| 343 hid_t space_hid = -1, data_hid = -1; | |
| 344 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 345 | |
| 346 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 347 for (int i = 0; i < rank; i++) | |
| 348 hdims[i] = dv (rank-i-1); | |
| 349 | |
| 350 space_hid = H5Screate_simple (rank, hdims, 0); | |
| 351 | |
| 352 if (space_hid < 0) return false; | |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
353 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
354 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
355 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
356 #else |
| 4903 | 357 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
358 H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
359 #endif |
| 4903 | 360 if (data_hid < 0) |
| 361 { | |
| 362 H5Sclose (space_hid); | |
| 363 return false; | |
| 364 } | |
| 365 | |
| 4917 | 366 retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
367 H5P_DEFAULT, this->matrix.data()) >= 0; |
| 4903 | 368 |
| 369 H5Dclose (data_hid); | |
| 370 H5Sclose (space_hid); | |
| 371 | |
| 372 return retval; | |
| 373 } | |
| 374 | |
| 375 template <class T> | |
| 376 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9689
diff
changeset
|
377 octave_base_int_matrix<T>::load_hdf5 (hid_t loc_id, const char *name) |
| 4903 | 378 { |
| 4917 | 379 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 380 bool retval = false; |
| 381 dim_vector dv; | |
| 382 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 383 if (empty > 0) | |
| 4932 | 384 this->matrix.resize(dv); |
| 4903 | 385 if (empty) |
| 386 return (empty > 0); | |
| 387 | |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
388 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
389 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
390 #else |
| 4903 | 391 hid_t data_hid = H5Dopen (loc_id, name); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
392 #endif |
| 4903 | 393 hid_t space_id = H5Dget_space (data_hid); |
| 394 | |
| 395 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 396 | |
| 397 if (rank < 1) | |
| 398 { | |
| 399 H5Sclose (space_id); | |
| 400 H5Dclose (data_hid); | |
| 401 return false; | |
| 402 } | |
| 403 | |
| 404 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 405 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 406 | |
| 407 H5Sget_simple_extent_dims (space_id, hdims, maxdims); | |
| 408 | |
| 409 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 410 if (rank == 1) | |
| 411 { | |
| 412 dv.resize (2); | |
| 413 dv(0) = 1; | |
| 414 dv(1) = hdims[0]; | |
| 415 } | |
| 416 else | |
| 417 { | |
| 418 dv.resize (rank); | |
| 419 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
420 dv(j) = hdims[i]; |
| 4903 | 421 } |
| 422 | |
| 4917 | 423 T m (dv); |
| 424 if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
425 H5P_DEFAULT, m.fortran_vec()) >= 0) |
| 4903 | 426 { |
| 427 retval = true; | |
| 4932 | 428 this->matrix = m; |
| 4903 | 429 } |
| 430 | |
| 431 H5Sclose (space_id); | |
| 432 H5Dclose (data_hid); | |
| 433 | |
| 434 return retval; | |
| 435 } | |
| 436 | |
| 437 #endif | |
| 438 | |
| 439 template <class T> | |
| 440 void | |
| 441 octave_base_int_matrix<T>::print_raw (std::ostream& os, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
442 bool pr_as_read_syntax) const |
| 4903 | 443 { |
| 4932 | 444 octave_print_internal (os, this->matrix, pr_as_read_syntax, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
445 this->current_print_indent_level ()); |
| 4903 | 446 } |
| 447 | |
| 448 template <class T> | |
| 5992 | 449 octave_value |
| 450 octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const | |
| 451 { | |
| 452 octave_value retval; | |
| 453 | |
| 454 T tmp = this->scalar; | |
| 455 | |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
456 typedef typename T::val_type val_type; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
457 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
458 val_type ival = tmp.value (); |
| 5992 | 459 |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
460 static const bool is_signed = std::numeric_limits<val_type>::is_signed; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
461 static const bool can_be_larger_than_uchar_max |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
462 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
463 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
464 if (octave_base_int_helper<val_type, is_signed, |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
465 can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) |
| 5992 | 466 { |
| 467 // FIXME -- is there something better we could do? | |
| 468 | |
| 469 ival = 0; | |
| 470 | |
| 471 ::warning ("range error for conversion to character value"); | |
| 472 } | |
| 473 else | |
| 474 retval = octave_value (std::string (1, static_cast<char> (ival)), type); | |
| 475 | |
| 476 return retval; | |
| 477 } | |
| 478 | |
| 479 template <class T> | |
| 4903 | 480 bool |
| 6974 | 481 octave_base_int_scalar<T>::save_ascii (std::ostream& os) |
| 4903 | 482 { |
| 4932 | 483 os << this->scalar << "\n"; |
| 4903 | 484 return true; |
| 485 } | |
| 486 | |
| 487 template <class T> | |
| 488 bool | |
| 489 octave_base_int_scalar<T>::load_ascii (std::istream& is) | |
| 490 { | |
| 4932 | 491 is >> this->scalar; |
| 4903 | 492 if (!is) |
| 493 { | |
| 494 error ("load: failed to load scalar constant"); | |
| 495 return false; | |
| 496 } | |
| 497 return true; | |
| 498 } | |
| 499 | |
| 500 template <class T> | |
| 501 bool | |
| 4917 | 502 octave_base_int_scalar<T>::save_binary (std::ostream& os, bool&) |
| 4903 | 503 { |
| 5760 | 504 os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size()); |
| 4903 | 505 return true; |
| 506 } | |
| 507 | |
| 508 template <class T> | |
| 509 bool | |
| 510 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
511 oct_mach_info::float_format) |
| 4903 | 512 { |
| 4917 | 513 T tmp; |
| 5760 | 514 if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size())) |
| 4903 | 515 return false; |
| 516 | |
| 4917 | 517 if (swap) |
| 4932 | 518 switch (this->byte_size()) |
| 4917 | 519 { |
| 520 case 8: | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
521 swap_bytes<8> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
522 break; |
| 4917 | 523 case 4: |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
524 swap_bytes<4> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
525 break; |
| 4917 | 526 case 2: |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
527 swap_bytes<2> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
528 break; |
| 4917 | 529 case 1: |
| 530 default: | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
531 break; |
| 4917 | 532 } |
| 4932 | 533 this->scalar = tmp; |
| 4903 | 534 return true; |
| 535 } | |
| 536 | |
| 537 #if defined (HAVE_HDF5) | |
| 4944 | 538 |
| 4903 | 539 template <class T> |
| 540 bool | |
| 4917 | 541 octave_base_int_scalar<T>::save_hdf5 (hid_t loc_id, const char *name, bool) |
| 4903 | 542 { |
| 4917 | 543 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 544 bool retval = true; |
| 545 hsize_t dimens[3]; | |
| 546 hid_t space_hid = -1, data_hid = -1; | |
| 547 | |
| 548 space_hid = H5Screate_simple (0, dimens, 0); | |
| 549 if (space_hid < 0) return false; | |
| 550 | |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
551 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
552 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
553 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
554 #else |
| 4917 | 555 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
556 H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
557 #endif |
| 4903 | 558 if (data_hid < 0) |
| 559 { | |
| 560 H5Sclose (space_hid); | |
| 561 return false; | |
| 562 } | |
| 563 | |
| 4917 | 564 retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
565 H5P_DEFAULT, &(this->scalar)) >= 0; |
| 4903 | 566 |
| 567 H5Dclose (data_hid); | |
| 568 H5Sclose (space_hid); | |
| 569 | |
| 570 return retval; | |
| 571 } | |
| 572 | |
| 573 template <class T> | |
| 574 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9689
diff
changeset
|
575 octave_base_int_scalar<T>::load_hdf5 (hid_t loc_id, const char *name) |
| 4903 | 576 { |
| 4917 | 577 hid_t save_type_hid = HDF5_SAVE_TYPE; |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
578 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
579 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
580 #else |
| 4903 | 581 hid_t data_hid = H5Dopen (loc_id, name); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
582 #endif |
| 4903 | 583 hid_t space_id = H5Dget_space (data_hid); |
| 584 | |
| 585 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 586 | |
| 587 if (rank != 0) | |
| 588 { | |
| 589 H5Dclose (data_hid); | |
| 590 return false; | |
| 591 } | |
| 592 | |
| 4917 | 593 T tmp; |
| 594 if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
595 H5P_DEFAULT, &tmp) < 0) |
| 4903 | 596 { |
| 597 H5Dclose (data_hid); | |
| 598 return false; | |
| 599 } | |
| 600 | |
| 4932 | 601 this->scalar = tmp; |
| 4903 | 602 |
| 603 H5Dclose (data_hid); | |
| 604 | |
| 605 return true; | |
| 606 } | |
| 4944 | 607 |
| 4903 | 608 #endif |