aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorEric Culp2012-06-28 15:56:39 -0400
committerFilippos Karapetis2019-04-01 00:29:23 +0300
commitc2ddab7dd2f7778bac14be2479b9ca5ea995eca0 (patch)
tree9318b40dd49e5332ae66bf67a22c210017e5fe77 /graphics
parente3357083d75c4a02da936b2fae71d5240c7db4a1 (diff)
downloadscummvm-rg350-c2ddab7dd2f7778bac14be2479b9ca5ea995eca0.tar.gz
scummvm-rg350-c2ddab7dd2f7778bac14be2479b9ca5ea995eca0.tar.bz2
scummvm-rg350-c2ddab7dd2f7778bac14be2479b9ca5ea995eca0.zip
GRAPHICS: Fix braces in two interpolate functions
Diffstat (limited to 'graphics')
-rw-r--r--graphics/scaler/intern.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h
index 72f3232ee2..60f88eb00e 100644
--- a/graphics/scaler/intern.h
+++ b/graphics/scaler/intern.h
@@ -71,8 +71,7 @@ static inline uint32 interpolate32_3_1(uint32 p1, uint32 p2) {
* Interpolate two 32 bit pixels with weights 2 and 1 and 1, i.e., (2*p1+p2)/3.
*/
template<typename ColorMask>
-uint32 interpolate32_2_1(uint32 pixel1, uint32 pixel2)
-{
+uint32 interpolate32_2_1(uint32 pixel1, uint32 pixel2) {
uint32 rsum, gsum, bsum;
rsum = (pixel1 & ColorMask::kRedMask) << 1;
@@ -320,8 +319,7 @@ static inline unsigned interpolate16_3_1(unsigned p1, unsigned p2) {
* Interpolate two 16 bit pixels with weights 2 and 1, i.e., (2*p1+p2)/3.
*/
template<typename ColorMask>
-uint16 interpolate16_2_1(uint16 pixel1, uint16 pixel2)
-{
+uint16 interpolate16_2_1(uint16 pixel1, uint16 pixel2) {
uint32 rsum;
uint16 gsum, bsum;