summaryrefslogtreecommitdiff
path: root/rotord
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-09-10 09:47:39 +0100
committerTim Redfern <tim@eclectronics.org>2013-09-10 09:47:39 +0100
commitdf0d3f135685c77b401be24596fb381f822e7f96 (patch)
treed1de8287535b6d9707a6c546966182df800a926e /rotord
parent79af8bf904b9ddb50b11ac231a2db517f1bdd55b (diff)
blend node issue
Diffstat (limited to 'rotord')
-rw-r--r--rotord/src/cvimage.cpp1
-rwxr-xr-xrotord/src/rotor.h6
2 files changed, 4 insertions, 3 deletions
diff --git a/rotord/src/cvimage.cpp b/rotord/src/cvimage.cpp
index adf4267..e5ea50b 100644
--- a/rotord/src/cvimage.cpp
+++ b/rotord/src/cvimage.cpp
@@ -178,6 +178,7 @@ namespace Rotor {
return *this;
}
Image * Image::operator*(const float &amount) {
+ //LEAK!! even if the image is deleted!! opencv??
Image *other=new Image(w,h);
other->rgb=rgb*amount;
return other;
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index a247c66..7a26a5b 100755
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -606,9 +606,9 @@ namespace Rotor {
break;
case BLEND_blend: //has to be last because of initialser of *in? go figure
image*=(1.0f-parameters["amount"]->value);
- Image *in=(*in2)*parameters["amount"]->value;
- image+=(*in);
- delete in;
+ Image in=(*in2);
+ in*=parameters["amount"]->value;
+ image+=in;
break;
}
return &image;