diff options
| author | Matthew Hoops | 2014-02-27 21:27:23 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-02-28 00:27:28 -0500 |
| commit | 740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7 (patch) | |
| tree | d1f414522b8effe91dc2e4c75443ca18a30fc0ef /engines/queen/display.cpp | |
| parent | cbf085287c74e0994fb18fb0830ccdb340b5b0ac (diff) | |
| download | scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.tar.gz scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.tar.bz2 scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.zip | |
IMAGE: Move all ImageDecoders to image/
Diffstat (limited to 'engines/queen/display.cpp')
| -rw-r--r-- | engines/queen/display.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 85cc7cadaa..b2213f7fee 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -29,8 +29,9 @@ #include "graphics/cursorman.h" #include "graphics/palette.h" #include "graphics/surface.h" -#include "graphics/decoders/iff.h" -#include "graphics/decoders/pcx.h" + +#include "image/iff.h" +#include "image/pcx.h" #include "queen/display.h" #include "queen/input.h" @@ -813,7 +814,7 @@ void Display::fill(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, uint16 w, void Display::decodePCX(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd) { Common::MemoryReadStream str(src, srcSize); - ::Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(str)) error("Error while reading PCX image"); @@ -832,7 +833,7 @@ void Display::decodePCX(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dst void Display::decodeIFF(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd, uint8 colorBase) { Common::MemoryReadStream str(src, srcSize); - ::Graphics::IFFDecoder iff; + Image::IFFDecoder iff; if (!iff.loadStream(str)) error("Error while reading IFF image"); |