diff options
| author | Johannes Schickel | 2008-11-03 13:44:59 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-11-03 13:44:59 +0000 |
| commit | 985c02ee7da43fb66b61d6e3c5530e78bd2d8286 (patch) | |
| tree | 44bc31e701a7b020486ab407560d6d9c0e0329b2 /graphics/scaler | |
| parent | d0c9b0cb233a00094f18269d94b7d0fb64433099 (diff) | |
| download | scummvm-rg350-985c02ee7da43fb66b61d6e3c5530e78bd2d8286.tar.gz scummvm-rg350-985c02ee7da43fb66b61d6e3c5530e78bd2d8286.tar.bz2 scummvm-rg350-985c02ee7da43fb66b61d6e3c5530e78bd2d8286.zip | |
Committed my patch #2216641 "GRAPHICS: PixelFormat introduction".
svn-id: r34875
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/intern.h | 12 | ||||
| -rw-r--r-- | graphics/scaler/thumbnail_intern.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h index ff515530dd..6fc0d6919b 100644 --- a/graphics/scaler/intern.h +++ b/graphics/scaler/intern.h @@ -30,12 +30,12 @@ #include "graphics/colormasks.h" -#define highBits ColorMasks<bitFormat>::highBits -#define lowBits ColorMasks<bitFormat>::lowBits -#define qhighBits ColorMasks<bitFormat>::qhighBits -#define qlowBits ColorMasks<bitFormat>::qlowBits -#define redblueMask ColorMasks<bitFormat>::kRedBlueMask -#define greenMask ColorMasks<bitFormat>::kGreenMask +#define highBits Graphics::ColorMasks<bitFormat>::highBits +#define lowBits Graphics::ColorMasks<bitFormat>::lowBits +#define qhighBits Graphics::ColorMasks<bitFormat>::qhighBits +#define qlowBits Graphics::ColorMasks<bitFormat>::qlowBits +#define redblueMask Graphics::ColorMasks<bitFormat>::kRedBlueMask +#define greenMask Graphics::ColorMasks<bitFormat>::kGreenMask /** diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp index bdfa0ff5f6..52547f47f1 100644 --- a/graphics/scaler/thumbnail_intern.cpp +++ b/graphics/scaler/thumbnail_intern.cpp @@ -118,7 +118,7 @@ static bool grabScreen565(Graphics::Surface *surf) { g = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 1]; b = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 2]; - ((uint16*)surf->pixels)[y * surf->w + x] = RGBToColor<ColorMasks<565> >(r, g, b); + ((uint16*)surf->pixels)[y * surf->w + x] = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); } } @@ -209,7 +209,7 @@ bool createThumbnail(Graphics::Surface *surf, const uint8 *pixels, int w, int h, g = palette[pixels[y * w + x] * 3 + 1]; b = palette[pixels[y * w + x] * 3 + 2]; - ((uint16 *)screen.pixels)[y * screen.w + x] = RGBToColor<ColorMasks<565> >(r, g, b); + ((uint16 *)screen.pixels)[y * screen.w + x] = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); } } |