From 9462492cae4d94157538f353d67f2f6daaa45259 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Tue, 5 Nov 2013 20:25:00 +0000
Subject: overlay

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

diff --git a/rotord/src/cvimage.cpp b/rotord/src/cvimage.cpp
index 8f2c181..2d0f8e2 100644
--- a/rotord/src/cvimage.cpp
+++ b/rotord/src/cvimage.cpp
@@ -138,14 +138,14 @@ namespace Rotor {
 		//}
 		return *this;
 	}
-	Image & Image::overlay(cv::Mat &other){
+	Image & Image::overlay(const Image &other){
 		if (other.w!=w||other.h!=h) {
 			cerr<<"Rotor: cannot overlay images with different sizes! (wanted "<<w<<"x"<<h<<", got "<<other.w<<"x"<<other.h<<")"<<endl;
 			//why not??
 		}
 		else {
 			for (int i=0;i<h*w*3;i++) {
-			rgb.data[i]=pixels.overlsy[rgb.data[i]][other.rgb.data[i]];
+			rgb.data[i]=pixels.overlay[rgb.data[i]][other.rgb.data[i]];
 			}
 		}
 		return *this;
-- 
cgit v1.2.3