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/mohawk | |
| 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/mohawk')
| -rw-r--r-- | engines/mohawk/bitmap.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/myst_graphics.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index fe2a308170..6435daf46f 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -29,7 +29,7 @@ #include "common/substream.h" #include "common/system.h" #include "common/textconsole.h" -#include "graphics/decoders/bmp.h" +#include "image/bmp.h" namespace Mohawk { @@ -635,7 +635,7 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream *stream) { Common::SeekableReadStream *bmpStream = decompressLZ(stream, uncompressedSize); delete stream; - Graphics::BitmapDecoder bitmapDecoder; + Image::BitmapDecoder bitmapDecoder; if (!bitmapDecoder.loadStream(*bmpStream)) error("Could not decode Myst bitmap"); diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp index 6f7e8a8e84..9ea9f15444 100644 --- a/engines/mohawk/myst_graphics.cpp +++ b/engines/mohawk/myst_graphics.cpp @@ -28,8 +28,7 @@ #include "common/system.h" #include "common/textconsole.h" #include "engines/util.h" -#include "graphics/decoders/jpeg.h" -#include "graphics/decoders/pict.h" +#include "image/pict.h" namespace Mohawk { @@ -94,7 +93,7 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) { MohawkSurface *mhkSurface = 0; if (isPict) { - Graphics::PICTDecoder pict; + Image::PICTDecoder pict; if (!pict.loadStream(*dataStream)) error("Could not decode Myst ME PICT"); |