aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/scaler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp
index fcf88c6b94..1252a61866 100644
--- a/common/scaler.cpp
+++ b/common/scaler.cpp
@@ -96,17 +96,17 @@ static inline int GetResult(uint32 A, uint32 B, uint32 C, uint32 D) {
}
static inline uint32 INTERPOLATE(uint32 A, uint32 B) {
- if (A != B) {
- return (((A & colorMask) + (B & colorMask)) >> 1) + (A & B & lowPixelMask);
+ if (A != B) {
+ return (((A & colorMask) >> 1) + ((B & colorMask) >> 1) + (A & B & lowPixelMask));
} else
return A;
}
static inline uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D) {
- register uint32 x = ((A & qcolorMask) + (B & qcolorMask) + (C & qcolorMask) + (D & qcolorMask))>>2;
- register uint32 y = (A & qlowpixelMask) + (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
+ register uint32 x = ((A & qcolorMask) >> 2) + ((B & qcolorMask) >> 2) + ((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2);
+ register uint32 y = ((A & qlowpixelMask) + (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask)) >> 2;
- y = (y >> 2) & qlowpixelMask;
+ y &= qlowpixelMask;
return x + y;
}