diff armadillo-3.900.4/include/armadillo_bits/fn_histc.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_histc.hpp	Thu Jun 13 10:25:24 2013 +0100
@@ -0,0 +1,26 @@
+// Copyright (C) 2012 NICTA (www.nicta.com.au)
+// Copyright (C) 2012 Conrad Sanderson
+// Copyright (C) 2012 Boris Sabanin
+// 
+// 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/.
+
+
+
+template<typename T1, typename T2>
+inline
+const mtGlue<uword,T1,T2,glue_histc>
+histc
+  (
+  const Base<typename T1::elem_type,T1>& A,
+  const Base<typename T1::elem_type,T2>& B,
+  const uword dim = 0,
+  const typename arma_not_cx<typename T1::elem_type>::result* junk = 0
+  )
+  {
+  arma_extra_debug_sigprint();
+  arma_ignore(junk);
+  
+  return mtGlue<uword,T1,T2,glue_histc>( A.get_ref(), B.get_ref(), dim );
+  }