arma_ostream_meat.hpp   arma_ostream_meat.hpp 
skipping to change at line 700 skipping to change at line 700
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
const arma_ostream_state stream_state(o); const arma_ostream_state stream_state(o);
o.unsetf(ios::showbase); o.unsetf(ios::showbase);
o.unsetf(ios::uppercase); o.unsetf(ios::uppercase);
o.unsetf(ios::showpos); o.unsetf(ios::showpos);
o.setf(ios::fixed); o.setf(ios::fixed);
o << S.n_rows << 'x' << S.n_cols << '\n'; o << S.n_rows << 'x' << S.n_cols;
stream_state.restore(o); stream_state.restore(o);
} }
inline inline
void void
arma_ostream::print(std::ostream& o, const SizeCube& S) arma_ostream::print(std::ostream& o, const SizeCube& S)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
const arma_ostream_state stream_state(o); const arma_ostream_state stream_state(o);
o.unsetf(ios::showbase); o.unsetf(ios::showbase);
o.unsetf(ios::uppercase); o.unsetf(ios::uppercase);
o.unsetf(ios::showpos); o.unsetf(ios::showpos);
o.setf(ios::fixed); o.setf(ios::fixed);
o << S.n_rows << 'x' << S.n_cols << 'x' << S.n_slices << '\n'; o << S.n_rows << 'x' << S.n_cols << 'x' << S.n_slices;
stream_state.restore(o); stream_state.restore(o);
} }
//! @} //! @}
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 arma_version.hpp   arma_version.hpp 
skipping to change at line 13 skipping to change at line 13
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
//! \addtogroup arma_version //! \addtogroup arma_version
//! @{ //! @{
#define ARMA_VERSION_MAJOR 4 #define ARMA_VERSION_MAJOR 4
#define ARMA_VERSION_MINOR 300 #define ARMA_VERSION_MINOR 300
#define ARMA_VERSION_PATCH 8 #define ARMA_VERSION_PATCH 9
#define ARMA_VERSION_NAME "Medieval Cornea Scraper" #define ARMA_VERSION_NAME "Medieval Cornea Scraper"
struct arma_version struct arma_version
{ {
static const unsigned int major = ARMA_VERSION_MAJOR; static const unsigned int major = ARMA_VERSION_MAJOR;
static const unsigned int minor = ARMA_VERSION_MINOR; static const unsigned int minor = ARMA_VERSION_MINOR;
static const unsigned int patch = ARMA_VERSION_PATCH; static const unsigned int patch = ARMA_VERSION_PATCH;
static static
inline inline
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 diskio_meat.hpp   diskio_meat.hpp 
skipping to change at line 3512 skipping to change at line 3512
// Octave tends to store the datasets in a group, with the actual dat aset being referred to as "value". // Octave tends to store the datasets in a group, with the actual dat aset being referred to as "value".
// So we will search for "dataset" and "value", and if those are not found we will take the first dataset we do find. // So we will search for "dataset" and "value", and if those are not found we will take the first dataset we do find.
std::vector<std::string> searchNames; std::vector<std::string> searchNames;
searchNames.push_back("dataset"); searchNames.push_back("dataset");
searchNames.push_back("value"); searchNames.push_back("value");
hid_t dataset = hdf5_misc::search_hdf5_file(searchNames, fid, 3, fals e); hid_t dataset = hdf5_misc::search_hdf5_file(searchNames, fid, 3, fals e);
if(dataset >= 0) if(dataset >= 0)
{ {
hid_t filespace = H5Dget_space(dataset); hid_t filespace = arma_H5Dget_space(dataset);
// This must be <= 3 due to our search rules. // This must be <= 3 due to our search rules.
const int ndims = arma_H5Sget_simple_extent_ndims(filespace); const int ndims = arma_H5Sget_simple_extent_ndims(filespace);
hsize_t dims[3]; hsize_t dims[3];
const herr_t query_status = arma_H5Sget_simple_extent_dims(filespac e, dims, NULL); const herr_t query_status = arma_H5Sget_simple_extent_dims(filespac e, dims, NULL);
// arma_check(query_status < 0, "Cube::load(): cannot get size of H DF5 dataset"); // arma_check(query_status < 0, "Cube::load(): cannot get size of H DF5 dataset");
if(query_status < 0) if(query_status < 0)
{ {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/