summaryrefslogtreecommitdiff
path: root/rotord/cvimage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/cvimage.cpp')
-rw-r--r--rotord/cvimage.cpp2
1 files changed, 1 insertions, 1 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));
}
}