diff armadillo-3.900.4/include/armadillo_bits/fn_reshape.hpp @ 49:1ec0e2823891

Switch to using subrepo copies of qm-dsp, nnls-chroma, vamp-plugin-sdk; update Armadillo version; assume build without external BLAS/LAPACK

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/armadillo-3.900.4/include/armadillo_bits/fn_reshape.hpp	Thu Jun 13 10:25:24 2013 +0100
@@ -0,0 +1,42 @@
+// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2011 Conrad Sanderson
+// 
+// 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
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+//! \addtogroup fn_reshape
+//! @{
+
+
+
+template<typename T1>
+inline
+const Op<T1, op_reshape>
+reshape(const Base<typename T1::elem_type,T1>& X, const uword in_n_rows, const uword in_n_cols, const uword dim = 0)
+  {
+  arma_extra_debug_sigprint();
+  
+  arma_debug_check( (dim > 1), "reshape(): dim must be 0 or 1");
+  
+  return Op<T1, op_reshape>(X.get_ref(), in_n_rows, in_n_cols, dim, 'j');
+  }
+
+
+
+template<typename T1>
+inline
+const OpCube<T1, op_reshape>
+reshape(const BaseCube<typename T1::elem_type,T1>& X, const uword in_n_rows, const uword in_n_cols, const uword in_n_slices, const uword dim = 0)
+  {
+  arma_extra_debug_sigprint();
+  
+  arma_debug_check( (dim > 1), "reshape(): dim must be 0 or 1");
+  
+  return OpCube<T1, op_reshape>(X.get_ref(), in_n_rows, in_n_cols, in_n_slices, dim, 'j');
+  }
+
+
+
+//! @}