From d7538510516f74995885d9803401074af5a48156 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Thu, 23 Apr 2015 10:24:32 -0400 Subject: [PATCH] Added support for more than two matrices in blend --- openbr/plugins/imgproc/blend.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/openbr/plugins/imgproc/blend.cpp b/openbr/plugins/imgproc/blend.cpp index f1f7dc6..ebfd16c 100644 --- a/openbr/plugins/imgproc/blend.cpp +++ b/openbr/plugins/imgproc/blend.cpp @@ -29,13 +29,22 @@ namespace br class BlendTransform : public UntrainableMetaTransform { Q_OBJECT - Q_PROPERTY(float alpha READ get_alpha WRITE set_alpha RESET reset_alpha STORED false) - BR_PROPERTY(float, alpha, 0.5) + Q_PROPERTY(QList alpha READ get_alpha WRITE set_alpha RESET reset_alpha STORED false) + BR_PROPERTY(QList, alpha, QList() << 0.5) void project(const Template &src, Template &dst) const { - if (src.size() != 2) qFatal("Expected two source matrices."); - addWeighted(src[0], alpha, src[1], 1-alpha, 0, dst); + dst.file = src.file; + + if (src.size() != 2) { + dst.m() = Mat::zeros(src.m().rows, src.m().cols, src.m().type()); + for (int i=0; i