| arma_version.hpp | arma_version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 18 | skipping to change at line 18 | |||
| // Lesser General Public License (LGPL) as published | // Lesser General Public License (LGPL) as published | |||
| // by the Free Software Foundation, either version 3 | // by the Free Software Foundation, either version 3 | |||
| // of the License or (at your option) any later version. | // of the License or (at your option) any later version. | |||
| // (see http://www.opensource.org/licenses for more info) | // (see http://www.opensource.org/licenses for more info) | |||
| //! \addtogroup arma_version | //! \addtogroup arma_version | |||
| //! @{ | //! @{ | |||
| #define ARMA_VERSION_MAJOR 2 | #define ARMA_VERSION_MAJOR 2 | |||
| #define ARMA_VERSION_MINOR 4 | #define ARMA_VERSION_MINOR 4 | |||
| #define ARMA_VERSION_PATCH 1 | #define ARMA_VERSION_PATCH 2 | |||
| #define ARMA_VERSION_NAME "Loco Lounge Lizard" | #define ARMA_VERSION_NAME "Loco Lounge Lizard" | |||
| 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 | |||
| op_resize_meat.hpp | op_resize_meat.hpp | |||
|---|---|---|---|---|
| skipping to change at line 47 | skipping to change at line 47 | |||
| Mat<eT>& out = alias ? B : actual_out; | Mat<eT>& out = alias ? B : actual_out; | |||
| out.set_size(out_n_rows, out_n_cols); | out.set_size(out_n_rows, out_n_cols); | |||
| if( (out_n_rows > A_n_rows) || (out_n_cols > A_n_cols) ) | if( (out_n_rows > A_n_rows) || (out_n_cols > A_n_cols) ) | |||
| { | { | |||
| out.zeros(); | out.zeros(); | |||
| } | } | |||
| if(out.n_elem > 0) | if( (out.n_elem > 0) && (A.n_elem > 0) ) | |||
| { | { | |||
| const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; | const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; | |||
| const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; | const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; | |||
| out.submat(0, 0, end_row, end_col) = A.submat(0, 0, end_row, end_col); | out.submat(0, 0, end_row, end_col) = A.submat(0, 0, end_row, end_col); | |||
| } | } | |||
| if(alias) | if(alias) | |||
| { | { | |||
| actual_out.steal_mem(B); | actual_out.steal_mem(B); | |||
| skipping to change at line 95 | skipping to change at line 95 | |||
| Cube<eT>& out = alias ? B : actual_out; | Cube<eT>& out = alias ? B : actual_out; | |||
| out.set_size(out_n_rows, out_n_cols, out_n_slices); | out.set_size(out_n_rows, out_n_cols, out_n_slices); | |||
| if( (out_n_rows > A_n_rows) || (out_n_cols > A_n_cols) || (out_n_slices > A_n_slices) ) | if( (out_n_rows > A_n_rows) || (out_n_cols > A_n_cols) || (out_n_slices > A_n_slices) ) | |||
| { | { | |||
| out.zeros(); | out.zeros(); | |||
| } | } | |||
| if(out.n_elem > 0) | if( (out.n_elem > 0) && (A.n_elem > 0) ) | |||
| { | { | |||
| const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; | const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; | |||
| const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; | const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; | |||
| const uword end_slice = (std::min)(out_n_slices, A_n_slices) - 1; | const uword end_slice = (std::min)(out_n_slices, A_n_slices) - 1; | |||
| out.subcube(0, 0, 0, end_row, end_col, end_slice) = A.subcube(0, 0, 0, end_row, end_col, end_slice); | out.subcube(0, 0, 0, end_row, end_col, end_slice) = A.subcube(0, 0, 0, end_row, end_col, end_slice); | |||
| } | } | |||
| if(alias) | if(alias) | |||
| { | { | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||