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/hugo | |
| 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/hugo')
| -rw-r--r-- | engines/hugo/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/hugo/file.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/hugo/dialogs.cpp b/engines/hugo/dialogs.cpp index 6894030b2b..8b145b78d8 100644 --- a/engines/hugo/dialogs.cpp +++ b/engines/hugo/dialogs.cpp @@ -21,9 +21,9 @@ */ #include "common/substream.h" -#include "graphics/decoders/bmp.h" #include "gui/gui-manager.h" #include "gui/ThemeEval.h" +#include "image/bmp.h" #include "hugo/hugo.h" #include "hugo/display.h" @@ -130,7 +130,7 @@ void TopMenu::loadBmpArr(Common::SeekableReadStream &in) { uint32 filPos = in.pos(); Common::SeekableSubReadStream stream(&in, filPos, filPos + bmpSize); - Graphics::BitmapDecoder bitmapDecoder; + Image::BitmapDecoder bitmapDecoder; if (!bitmapDecoder.loadStream(stream)) error("TopMenu::loadBmpArr(): Could not load bitmap"); diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index 359d4a3e6a..e2633977a8 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -34,11 +34,12 @@ #include "common/config-manager.h" #include "graphics/surface.h" -#include "graphics/decoders/pcx.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" +#include "image/pcx.h" + #include "hugo/hugo.h" #include "hugo/file.h" #include "hugo/schedule.h" @@ -110,7 +111,7 @@ Seq *FileManager::readPCX(Common::SeekableReadStream &f, Seq *seqPtr, byte *imag error("Insufficient memory to run game."); } - Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(f)) error("Error while reading PCX image"); |