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/gob | |
| 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/gob')
| -rw-r--r-- | engines/gob/inter_v7.cpp | 5 | ||||
| -rw-r--r-- | engines/gob/surface.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp index 75278d9477..fd9406054c 100644 --- a/engines/gob/inter_v7.cpp +++ b/engines/gob/inter_v7.cpp @@ -27,7 +27,8 @@ #include "graphics/cursorman.h" #include "graphics/wincursor.h" -#include "graphics/decoders/iff.h" + +#include "image/iff.h" #include "gob/gob.h" #include "gob/global.h" @@ -547,7 +548,7 @@ void Inter_v7::o7_loadIFFPalette() { return; } - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(*iffFile); if (!decoder.getPalette() || decoder.getPaletteColorCount() != 256) { warning("o7_loadIFFPalette(): Failed reading palette from IFF \"%s\"", file.c_str()); diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp index 00203ff312..42ac2b0d74 100644 --- a/engines/gob/surface.cpp +++ b/engines/gob/surface.cpp @@ -31,7 +31,8 @@ #include "graphics/primitives.h" #include "graphics/pixelformat.h" #include "graphics/surface.h" -#include "graphics/decoders/iff.h" + +#include "image/iff.h" namespace Gob { @@ -814,7 +815,7 @@ bool Surface::loadTGA(Common::SeekableReadStream &stream) { } bool Surface::loadIFF(Common::SeekableReadStream &stream) { - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(stream); if (!decoder.getSurface()) |