From ad0e8b3e7f1d8889244f15134a00d1ac4803d9c3 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Tue, 20 Aug 2013 02:47:59 +0100
Subject: difference matte

---
 rotord/src/cvimage.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'rotord/src/cvimage.cpp')

diff --git a/rotord/src/cvimage.cpp b/rotord/src/cvimage.cpp
index 361999b..adf4267 100644
--- a/rotord/src/cvimage.cpp
+++ b/rotord/src/cvimage.cpp
@@ -126,6 +126,18 @@ namespace Rotor {
 		}
 		return *this;
 	}
+	Image & Image::alpha_from_cv(cv::Mat &other){
+		//if (other.w!=w||other.h!=h) {
+		//	cerr<<"Rotor: cannot merge alpha with different size! (wanted "<<w<<"x"<<h<<", got "<<other.w<<"x"<<other.h<<")"<<endl;
+		//}
+		//else {
+			if (other.channels()==1) {
+				alpha=other;
+	 		}
+			else cv::cvtColor(other,alpha,CV_RGB2GRAY);
+		//}
+		return *this;
+	}
 	Image & Image::operator=(const Image &other) {
 		//can be optimised? was trying to use other.data.clone()
 		setup(other.w,other.h);
-- 
cgit v1.2.3