From 43585b3f01c39e28fef302690ecca699e690b255 Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh.klontz@gmail.com>
Date: Tue, 23 Apr 2013 12:53:42 -0400
Subject: [PATCH] tweaked fusion to allow Identity matrix

---
 openbr/core/fuse.cpp | 5 ++++-
 openbr/core/fuse.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openbr/core/fuse.cpp b/openbr/core/fuse.cpp
index 7ced476..fe4136b 100644
--- a/openbr/core/fuse.cpp
+++ b/openbr/core/fuse.cpp
@@ -75,7 +75,7 @@ static void normalizeMatrix(Mat &matrix, const Mat &mask, const QString &method)
     }
 }
 
-void br::Fuse(const QStringList &inputSimmats, const QString &mask, const QString &normalization, const QString &fusion, const QString &outputSimmat)
+void br::Fuse(const QStringList &inputSimmats, File mask, const QString &normalization, const QString &fusion, const QString &outputSimmat)
 {
     qDebug("Fusing %d to %s", inputSimmats.size(), qPrintable(outputSimmat));
     QList<Mat> matrices;
@@ -83,6 +83,9 @@ void br::Fuse(const QStringList &inputSimmats, const QString &mask, const QStrin
         matrices.append(BEE::readSimmat(simmat));
     if ((matrices.size() < 2) && (fusion != "None")) qFatal("Expected at least two similarity matrices.");
     if ((matrices.size() > 1) && (fusion == "None")) qFatal("Expected exactly one similarity matrix.");
+
+    mask.set("rows", matrices.first().rows);
+    mask.set("columns", matrices.first().cols);
     Mat matrix_mask = BEE::readMask(mask);
 
     for (int i=0; i<matrices.size(); i++)
diff --git a/openbr/core/fuse.h b/openbr/core/fuse.h
index 137e704..6521d58 100644
--- a/openbr/core/fuse.h
+++ b/openbr/core/fuse.h
@@ -22,7 +22,7 @@
 
 namespace br
 {
-    void Fuse(const QStringList &inputSimmats, const QString &mask, const QString &normalization, const QString &fusion, const QString &outputSimmat);
+    void Fuse(const QStringList &inputSimmats, File mask, const QString &normalization, const QString &fusion, const QString &outputSimmat);
 }
 
 #endif // __FUSE_H
--
libgit2 0.21.4