diff options
| author | Eric Culp | 2012-06-27 16:10:42 -0400 |
|---|---|---|
| committer | Filippos Karapetis | 2019-04-01 00:29:23 +0300 |
| commit | e3357083d75c4a02da936b2fae71d5240c7db4a1 (patch) | |
| tree | 10797383580b4157d979c8bc309853bf750b912f /graphics/scaler | |
| parent | 0246ca8da096bac291612d636985878985e350b7 (diff) | |
| download | scummvm-rg350-e3357083d75c4a02da936b2fae71d5240c7db4a1.tar.gz scummvm-rg350-e3357083d75c4a02da936b2fae71d5240c7db4a1.tar.bz2 scummvm-rg350-e3357083d75c4a02da936b2fae71d5240c7db4a1.zip | |
GRAPHICS: Change another interpolation function in Edge filter.
A 2 to 1 interpolation was causing errors. It is fixed, renamed, and
moved to the common interpolation file.
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/intern.h | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h index b1219fb909..72f3232ee2 100644 --- a/graphics/scaler/intern.h +++ b/graphics/scaler/intern.h @@ -68,6 +68,29 @@ 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 rsum, gsum, bsum; + + rsum = (pixel1 & ColorMask::kRedMask) << 1; + rsum += (pixel2 & ColorMask::kRedMask); + rsum /= 3; + + gsum = (pixel1 & ColorMask::kGreenMask) << 1; + gsum += (pixel2 & ColorMask::kGreenMask); + gsum /= 3; + + bsum = (pixel1 & ColorMask::kBlueMask) << 1; + bsum += (pixel2 & ColorMask::kBlueMask); + bsum /= 3; + + return (rsum & ColorMask::kRedMask) | (gsum & ColorMask::kGreenMask) | (bsum & ColorMask::kBlueMask); +} + +/** * Interpolate two 32 bit pixels with weights 5 and 3 and 1, i.e., (5*p1+3*p2)/8. * @see interpolate_32_3_1 for similar method */ @@ -294,6 +317,30 @@ 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) +{ + uint32 rsum; + uint16 gsum, bsum; + + rsum = (pixel1 & ColorMask::kRedMask) << 1; + rsum += (pixel2 & ColorMask::kRedMask); + rsum /= 3; + + gsum = (pixel1 & ColorMask::kGreenMask) << 1; + gsum += (pixel2 & ColorMask::kGreenMask); + gsum /= 3; + + bsum = (pixel1 & ColorMask::kBlueMask) << 1; + bsum += (pixel2 & ColorMask::kBlueMask); + bsum /= 3; + + return (rsum & ColorMask::kRedMask) | (gsum & ColorMask::kGreenMask) | (bsum & ColorMask::kBlueMask); +} + +/** * Interpolate two 16 bit pixels with weights 5 and 3 and 1, i.e., (5*p1+3*p2)/8. */ template<typename ColorMask> |