remove cvimage pointer use in nodes: temporary fix

2 files changed, 10 insertions, 2 deletions

diff --git a/rotord/src/rendercontext.h b/rotord/src/rendercontext.h
index d7d220e..f15ca31 100644
--- a/rotord/src/rendercontext.h
+++ b/rotord/src/rendercontext.h
@@ -74,7 +74,9 @@ namespace Rotor {
 			void runTask();
 			void add_queue(Session_task item);
 			void session_command(const Session_command& command,xmlIO& XML,Poco::Net::HTTPResponse::HTTPStatus& status);
-			void cancel();									//interrupt locking process
+			void cancel(){
+				graph.clear();
+			}								//interrupt locking process
 			Render_status get_render_status(const string &uid){
 
 				//cerr<<"render status requested: "<<uid<<" status: "<<renders[uid].status<<endl;
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index fbefa66..d59197a 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -605,11 +605,17 @@ namespace Rotor {
 								image=image.add_wrap(*in2);
 								break;
 							case BLEND_blend: //has to be last because of initialser of *in? go figure
-								//problem here with leak
+								
 								image*=(1.0f-parameters["amount"]->value);
+								/* //problem here with leak
+								//opencv handles not being released
 								Image *in=(*in2)*parameters["amount"]->value;
 								image+=(*in);
 								delete in;
+								*/
+								Image in=(*in2);
+								in*=parameters["amount"]->value;
+								image+=in;
 								break;
 						}
 						return &image;