summaryrefslogtreecommitdiff
path: root/rotord/src/rotor.h
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-09-10 13:16:59 +0100
committerTim Redfern <tim@eclectronics.org>2013-09-10 13:16:59 +0100
commit157d5cf3af1bc4e6d4391d51bb4aa3699022ee6b (patch)
treeb6f2b763523543c12c1bd160a8f879295fd1f23d /rotord/src/rotor.h
parent959b4591baa048b692e38c39c8db89317023ccea (diff)
remove cvimage pointer use in nodes: temporary fix
Diffstat (limited to 'rotord/src/rotor.h')
-rw-r--r--rotord/src/rotor.h8
1 files changed, 7 insertions, 1 deletions
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;