From 8d3f6e315bae1d3e7cc0de171aa4dab56bfd2d2d Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Sat, 3 Oct 2015 10:56:51 -0700
Subject: blocks: enable missing multiply_matrix_cc and backport fixes
* multiply_matrix_cc_impl.cc existed but did not have fixes from master
* multiply_matrix_cc_impl.cc was missing from CMakeLists.txt
* multiply_matrix_cc was missing from SWIG
* QA from from master branch was backported
---
gr-blocks/lib/multiply_matrix_cc_impl.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-blocks/lib/multiply_matrix_cc_impl.cc')
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.cc b/gr-blocks/lib/multiply_matrix_cc_impl.cc
index 603347d670..e9800c7599 100644
--- a/gr-blocks/lib/multiply_matrix_cc_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_cc_impl.cc
@@ -106,7 +106,7 @@ namespace gr {
);
for (size_t out_idx = 0; out_idx < noutput_ports; out_idx++) {
- if (d_A[out_idx][in_idx] == 0) {
+ if (d_A[out_idx][in_idx] == std::complex<float>(0, 0)) {
continue;
}
for (size_t i = 0; i < tags.size(); i++) {
--
cgit v1.2.3