diff options
| author | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
| commit | caa6684752a310e916b179125a4125a8b3be36f0 (patch) | |
| tree | dc364d58619b297194bc5d0673b694c34fb51b6c /video/codecs/qtrle.cpp | |
| parent | 3d15871ee2d6a9c0ce4819a6ab5925638bafa8b9 (diff) | |
| download | scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.gz scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.bz2 scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.zip | |
VIDEO: Move video classes to Video:: namespace
svn-id: r55479
Diffstat (limited to 'video/codecs/qtrle.cpp')
| -rw-r--r-- | video/codecs/qtrle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp index 1dcc94e417..26b2f02ce1 100644 --- a/video/codecs/qtrle.cpp +++ b/video/codecs/qtrle.cpp @@ -34,7 +34,7 @@ #include "graphics/colormasks.h" #include "graphics/surface.h" -namespace Graphics { +namespace Video { QTRLEDecoder::QTRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel) : Codec() { _bitsPerPixel = bitsPerPixel; @@ -47,7 +47,7 @@ QTRLEDecoder::QTRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel) : Cod debug(2, "QTRLE corrected width: %d", width); - _surface = new Surface(); + _surface = new Graphics::Surface(); _surface->create(width, height, _bitsPerPixel <= 8 ? 1 : _pixelFormat.bytesPerPixel); } @@ -239,7 +239,7 @@ void QTRLEDecoder::decode16(Common::SeekableReadStream *stream, uint32 rowPtr, u while (rleCode--) { // Convert from RGB555 to the format specified by the Overlay byte r = 0, g = 0, b = 0; - colorToRGB<ColorMasks<555> >(rgb16, r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<555> >(rgb16, r, g, b); rgb[pixelPtr++] = _pixelFormat.RGBToColor(r, g, b); } } else { @@ -252,7 +252,7 @@ void QTRLEDecoder::decode16(Common::SeekableReadStream *stream, uint32 rowPtr, u // Convert from RGB555 to the format specified by the Overlay byte r = 0, g = 0, b = 0; - colorToRGB<ColorMasks<555> >(rgb16, r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<555> >(rgb16, r, g, b); rgb[pixelPtr++] = _pixelFormat.RGBToColor(r, g, b); } } @@ -354,7 +354,7 @@ void QTRLEDecoder::decode32(Common::SeekableReadStream *stream, uint32 rowPtr, u } } -const Surface *QTRLEDecoder::decodeImage(Common::SeekableReadStream *stream) { +const Graphics::Surface *QTRLEDecoder::decodeImage(Common::SeekableReadStream *stream) { uint16 start_line = 0; uint16 height = _surface->h; @@ -418,4 +418,4 @@ QTRLEDecoder::~QTRLEDecoder() { delete _surface; } -} // End of namespace Graphics +} // End of namespace Video |