diff options
| author | Tim Redfern <tim@herge.(none)> | 2013-07-17 10:34:37 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@herge.(none)> | 2013-07-17 10:34:37 +0100 |
| commit | 3057a3ab06909fe9eecef119414d257019414ebf (patch) | |
| tree | 9778115f3b72825c55de00b318e8a3128b7a2f2c | |
| parent | f7fcf8cdea57a043b99d90549407195ea1148042 (diff) | |
alpha merge and blend
| -rw-r--r-- | rotord/cvimage.cpp | 2 | ||||
| -rwxr-xr-x | rotord/rotor.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rotord/cvimage.cpp b/rotord/cvimage.cpp index 2130fc6..8cb1f9c 100644 --- a/rotord/cvimage.cpp +++ b/rotord/cvimage.cpp @@ -62,7 +62,7 @@ namespace Rotor { //merge(compchans,rgb); //rgb+=other.rgb; for (int i=0;i<w*h*3;i++) { - rgb.data[i]=(uint8_t)(((((int)rgb.data[i])*(0xFF-((int)other.alpha.data[i/3])))>>8)+((((int)other.rgb.data[i])*((int)other.alpha.data[i/3])>>8))); + rgb.data[i]=(uint8_t)(((((int)rgb.data[i])*(0xFF-other.alpha.data[i/3]))>>8)+((((int)other.rgb.data[i])*((int)other.alpha.data[i/3]))>>8)); } } diff --git a/rotord/rotor.h b/rotord/rotor.h index 1f4c423..055d0b7 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -1268,7 +1268,7 @@ namespace Rotor { image=(((Image_node*)image_inputs[0]->connection)->get_output(frame))->clone(); if (image_inputs.size()>1) { if (image_inputs[1]->connection) { - image->alpha_merge(*((Image_node*)image_inputs[0]->connection)->get_output(frame)); + image->alpha_merge(*((Image_node*)image_inputs[1]->connection)->get_output(frame)); } } //if there aren't 2 image inputs connected just return the first |