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 /common/system.cpp | |
| 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 'common/system.cpp')
| -rw-r--r-- | common/system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/system.cpp b/common/system.cpp index a07ffba6d6..dc692b2e9e 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -62,11 +62,11 @@ bool OSystem::setGraphicsMode(const char *name) { } OverlayColor OSystem::RGBToColor(uint8 r, uint8 g, uint8 b) { - return ::RGBToColor<ColorMasks<565> >(r, g, b); + return Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); } void OSystem::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) { - ::colorToRGB<ColorMasks<565> >(color, r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<565> >(color, r, g, b); } OverlayColor OSystem::ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b) { |