Merge branch 'master' of eclectronics.org@eclectronics.org:rotor

1 files changed, 4 insertions, 1 deletions

diff --git a/rotord/src/cvimage.h b/rotord/src/cvimage.h
index 2f9ed3b..336c41b 100644
--- a/rotord/src/cvimage.h
+++ b/rotord/src/cvimage.h
@@ -87,6 +87,9 @@ namespace Rotor {
 				h=0;
 				ownsRGBdata=ownsAdata=ownsZdata=false;
 			}
+			//space out to 32 bit RGB padding for cairo
+			void convert24();
+			void convert32();
 			int getStride(){
 				return w*3;
 			}
@@ -155,7 +158,7 @@ namespace Rotor {
 				t->w=w;
 				t->h=h;
 				t->RGBdata=t->rgb.data; //can move to use the bare pointer eventually
-				t->ownsRGBdata=false; //will not be necessary
+				t->ownsRGBdata=false; //always just deallocate cv::Mat from stack
 				/*
 				for (int i=0;i<w*h*3;i++) {
 					t->RGBdata[i]=RGBdata[i];