Skip to content

Commit be382c9

Browse files
committed
Fix blendColor type mismatch in ADD mode
1 parent 0823620 commit be382c9

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/Processing.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3702,9 +3702,9 @@ inline color blendColor(color c1, color c2, int mode) {
37023702
return colorVal(r,g,b,255);
37033703
}
37043704
if (mode == ADD) {
3705-
int r=::std::min(((c1.value>>16)&0xFF)+((c2.value>>16)&0xFF),255);
3706-
int g=::std::min(((c1.value>>8)&0xFF)+((c2.value>>8)&0xFF),255);
3707-
int b=::std::min((c1.value&0xFF)+(c2.value&0xFF),255);
3705+
int r=::std::min((int)(((c1.value>>16)&0xFF)+((c2.value>>16)&0xFF)),255);
3706+
int g=::std::min((int)(((c1.value>>8)&0xFF)+((c2.value>>8)&0xFF)),255);
3707+
int b=::std::min((int)((c1.value&0xFF)+(c2.value&0xFF)),255);
37083708
return colorVal(r,g,b,255);
37093709
}
37103710
return c2; // fallback

0 commit comments

Comments
 (0)