From 740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Thu, 27 Feb 2014 21:27:23 -0500 Subject: IMAGE: Move all ImageDecoders to image/ --- engines/dreamweb/vgagrafx.cpp | 4 ++-- engines/gob/inter_v7.cpp | 5 +++-- engines/gob/surface.cpp | 5 +++-- engines/groovie/roq.cpp | 12 +++++------- engines/hopkins/graphics.cpp | 4 ++-- engines/hugo/dialogs.cpp | 4 ++-- engines/hugo/file.cpp | 5 +++-- engines/mohawk/bitmap.cpp | 4 ++-- engines/mohawk/myst_graphics.cpp | 5 ++--- engines/parallaction/disk_br.cpp | 10 +++++----- engines/parallaction/disk_ns.cpp | 10 +++++----- engines/pegasus/cursor.cpp | 6 +++--- engines/pegasus/surface.cpp | 4 ++-- engines/queen/display.cpp | 9 +++++---- engines/saga/scene.cpp | 4 ++-- engines/sci/graphics/maciconbar.cpp | 4 ++-- engines/sword25/gfx/image/imgloader.cpp | 4 ++-- engines/tucker/resource.cpp | 5 +++-- engines/wintermute/base/base_persistence_manager.cpp | 4 ++-- engines/wintermute/base/gfx/base_image.cpp | 20 +++++++++----------- engines/wintermute/base/gfx/base_image.h | 7 +++++-- .../base/gfx/osystem/base_surface_osystem.cpp | 4 ---- engines/zvision/graphics/render_manager.cpp | 4 ++-- 23 files changed, 71 insertions(+), 72 deletions(-) (limited to 'engines') diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index e8531343f8..c59d3e3ad5 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -23,7 +23,7 @@ #include "dreamweb/dreamweb.h" #include "engines/util.h" #include "graphics/surface.h" -#include "graphics/decoders/pcx.h" +#include "image/pcx.h" namespace DreamWeb { @@ -161,7 +161,7 @@ void DreamWebEngine::showPCX(const Common::String &suffix) { return; } - Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(pcxFile)) { warning("showpcx: Could not process '%s'", name.c_str()); return; 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()) diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 88f14b859e..4b3fb81828 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -32,7 +32,7 @@ #include "common/textconsole.h" #include "graphics/palette.h" -#include "graphics/decoders/jpeg.h" +#include "image/jpeg.h" #ifdef USE_RGB_COLOR // Required for the YUV to RGB conversion @@ -435,20 +435,18 @@ bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) { warning("Groovie::ROQ: JPEG frame (unfinished)"); - Graphics::JPEGDecoder *jpg = new Graphics::JPEGDecoder(); - jpg->setOutputColorSpace(Graphics::JPEGDecoder::kColorSpaceYUV); + Image::JPEGDecoder jpg; + jpg.setOutputColorSpace(Image::JPEGDecoder::kColorSpaceYUV); uint32 startPos = _file->pos(); Common::SeekableSubReadStream subStream(_file, startPos, startPos + blockHeader.size, DisposeAfterUse::NO); - jpg->loadStream(subStream); + jpg.loadStream(subStream); - const Graphics::Surface *srcSurf = jpg->getSurface(); + const Graphics::Surface *srcSurf = jpg.getSurface(); const byte *src = (const byte *)srcSurf->getPixels(); byte *ptr = (byte *)_currBuf->getPixels(); memcpy(ptr, src, _currBuf->w * _currBuf->h * srcSurf->format.bytesPerPixel); - delete jpg; - _file->seek(startPos + blockHeader.size); return true; } diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index e1f5037895..7227c3e833 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -28,7 +28,7 @@ #include "common/system.h" #include "graphics/palette.h" -#include "graphics/decoders/pcx.h" +#include "image/pcx.h" #include "common/file.h" #include "common/rect.h" #include "engines/util.h" @@ -301,7 +301,7 @@ void GraphicsManager::fillSurface(byte *surface, byte *col, int size) { void GraphicsManager::loadPCX640(byte *surface, const Common::String &file, byte *palette, bool typeFlag) { Common::File f; - Graphics::PCXDecoder pcxDecoder; + Image::PCXDecoder pcxDecoder; // Clear the passed surface memset(surface, 0, SCREEN_WIDTH * 2 * SCREEN_HEIGHT); 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"); 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"); diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index b31418a916..7458065b8c 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -23,7 +23,7 @@ #include "common/config-manager.h" #include "common/fs.h" #include "common/textconsole.h" -#include "graphics/decoders/iff.h" +#include "image/iff.h" #include "parallaction/parallaction.h" #include "parallaction/parser.h" @@ -460,7 +460,7 @@ void AmigaDisk_br::loadBackground(BackgroundInfo& info, const char *filename) { byte r,g,b; const byte *p; Common::SeekableReadStream *stream; - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; uint i; stream = tryOpenFile("backs/" + Common::String(filename), ".ap"); @@ -544,7 +544,7 @@ MaskBuffer *AmigaDisk_br::loadMask(const char *name, uint32 w, uint32 h) { return 0; } - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.setNumRelevantPlanes(2); // use only 2 first bits from each pixels decoder.setPixelPacking(true); // pack 4 2bit pixels into 1 byte decoder.loadStream(*stream); @@ -583,7 +583,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) { Common::String sName = name; Common::SeekableReadStream *stream = openFile("ras/" + sName, ".ras"); - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(*stream); Graphics::Surface *surf = new Graphics::Surface; @@ -720,7 +720,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) { debugC(5, kDebugDisk, "AmigaDisk_br::loadObjects"); Common::SeekableReadStream *stream = openFile(name); - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(*stream); uint16 max = objectsMax[part]; diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index a5fef16e56..28e61b04f9 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -26,7 +26,7 @@ #include "common/memstream.h" #include "common/substream.h" #include "common/textconsole.h" -#include "graphics/decoders/iff.h" +#include "image/iff.h" #include "parallaction/parser.h" #include "parallaction/parallaction.h" @@ -917,7 +917,7 @@ void AmigaDisk_ns::buildMask(byte* buf) { void AmigaDisk_ns::loadBackground(BackgroundInfo& info, const char *name) { Common::SeekableReadStream *s = openFile(name); - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(*s); info.bg.copyFrom(*decoder.getSurface()); @@ -935,7 +935,7 @@ void AmigaDisk_ns::loadBackground(BackgroundInfo& info, const char *name) { info.palette.setEntry(i, r, g, b); } - const Common::Array &paletteRanges = decoder.getPaletteRanges(); + const Common::Array &paletteRanges = decoder.getPaletteRanges(); for (uint j = 0; j < 6 && j < paletteRanges.size(); j++) { PaletteFxRange range; range._timer = paletteRanges[j].timer; @@ -959,7 +959,7 @@ void AmigaDisk_ns::loadMask_internal(BackgroundInfo& info, const char *name) { return; // no errors if missing mask files: not every location has one } - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.setNumRelevantPlanes(2); // use only 2 first bits from each pixel decoder.setPixelPacking(true); // pack 4 2bit pixels into 1 byte decoder.loadStream(*s); @@ -990,7 +990,7 @@ void AmigaDisk_ns::loadPath_internal(BackgroundInfo& info, const char *name) { return; // no errors if missing path files: not every location has one } - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.setNumRelevantPlanes(1); // use only first bit from each pixel decoder.setPixelPacking(true); // pack 8 1bit pixels into 1 byte decoder.loadStream(*s); diff --git a/engines/pegasus/cursor.cpp b/engines/pegasus/cursor.cpp index ad0d2c2d7d..602ae88068 100644 --- a/engines/pegasus/cursor.cpp +++ b/engines/pegasus/cursor.cpp @@ -28,7 +28,7 @@ #include "common/system.h" #include "graphics/cursorman.h" #include "graphics/surface.h" -#include "graphics/decoders/pict.h" +#include "image/pict.h" #include "pegasus/cursor.h" #include "pegasus/graphics.h" @@ -148,7 +148,7 @@ void Cursor::loadCursorImage(CursorInfo &cursorInfo) { Common::SeekableReadStream *pictStream = vm->_resFork->getResource(MKTAG('P', 'I', 'C', 'T'), cursorInfo.tag + 1000); if (pictStream) { - Graphics::PICTDecoder pict; + Image::PICTDecoder pict; if (!pict.loadStream(*pictStream)) error("Failed to decode cursor PICT %d", cursorInfo.tag + 1000); @@ -166,7 +166,7 @@ void Cursor::loadCursorImage(CursorInfo &cursorInfo) { error("Failed to find color icon %d", cursorInfo.tag); // PixMap section - Graphics::PICTDecoder::PixMap pixMap = Graphics::PICTDecoder::readPixMap(*cicnStream); + Image::PICTDecoder::PixMap pixMap = Image::PICTDecoder::readPixMap(*cicnStream); // Mask section cicnStream->readUint32BE(); // mask baseAddr diff --git a/engines/pegasus/surface.cpp b/engines/pegasus/surface.cpp index cdcb3c6e79..cb1e2e7bcc 100644 --- a/engines/pegasus/surface.cpp +++ b/engines/pegasus/surface.cpp @@ -28,7 +28,7 @@ #include "common/stream.h" #include "common/system.h" #include "graphics/surface.h" -#include "graphics/decoders/pict.h" +#include "image/pict.h" #include "video/video_decoder.h" #include "pegasus/pegasus.h" @@ -101,7 +101,7 @@ void Surface::getImageFromPICTResource(Common::MacResManager *resFork, uint16 id } bool Surface::getImageFromPICTStream(Common::SeekableReadStream *stream) { - Graphics::PICTDecoder pict; + Image::PICTDecoder pict; if (!pict.loadStream(*stream)) return false; 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"); diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 5ca2f8d31a..7f77cbab38 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -43,7 +43,7 @@ #include "common/util.h" -#include "graphics/decoders/iff.h" +#include "image/iff.h" namespace Saga { @@ -463,7 +463,7 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy _vm->_interface->setMode(kPanelSceneSubstitute); if (file.open(sceneSubstitutes[i].image)) { - Graphics::IFFDecoder decoder; + Image::IFFDecoder decoder; decoder.loadStream(file); pal = decoder.getPalette(); rect.setWidth(decoder.getSurface()->w); diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp index db9843ffb3..8e2e12b7bd 100644 --- a/engines/sci/graphics/maciconbar.cpp +++ b/engines/sci/graphics/maciconbar.cpp @@ -32,7 +32,7 @@ #include "common/memstream.h" #include "common/system.h" #include "graphics/surface.h" -#include "graphics/decoders/pict.h" +#include "image/pict.h" namespace Sci { @@ -201,12 +201,12 @@ void GfxMacIconBar::setInventoryIcon(int16 icon) { } Graphics::Surface *GfxMacIconBar::loadPict(ResourceId id) { - Graphics::PICTDecoder pictDecoder; Resource *res = g_sci->getResMan()->findResource(id, false); if (!res || res->size == 0) return 0; + Image::PICTDecoder pictDecoder; Common::MemoryReadStream stream(res->data, res->size); if (!pictDecoder.loadStream(stream)) return 0; diff --git a/engines/sword25/gfx/image/imgloader.cpp b/engines/sword25/gfx/image/imgloader.cpp index 3212c8daee..b4b3030de8 100644 --- a/engines/sword25/gfx/image/imgloader.cpp +++ b/engines/sword25/gfx/image/imgloader.cpp @@ -33,14 +33,14 @@ #include "sword25/gfx/image/image.h" #include "sword25/gfx/image/imgloader.h" #include "graphics/pixelformat.h" -#include "graphics/decoders/png.h" +#include "image/png.h" namespace Sword25 { bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&uncompressedDataPtr, int &width, int &height, int &pitch) { Common::MemoryReadStream *fileStr = new Common::MemoryReadStream(fileDataPtr, fileSize, DisposeAfterUse::NO); - Graphics::PNGDecoder png; + ::Image::PNGDecoder png; if (!png.loadStream(*fileStr)) // the fileStr pointer, and thus pFileData will be deleted after this is done error("Error while reading PNG image"); diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index 1c223c67d3..48ddefe455 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -30,7 +30,8 @@ #include "audio/decoders/wave.h" #include "graphics/surface.h" -#include "graphics/decoders/pcx.h" + +#include "image/pcx.h" #include "tucker/tucker.h" #include "tucker/graphics.h" @@ -302,7 +303,7 @@ void TuckerEngine::loadImage(const char *fname, uint8 *dst, int type) { } } - ::Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(f)) error("Error while reading PCX image"); diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index 3b7026cb08..bea55fb857 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -38,8 +38,8 @@ #include "engines/wintermute/base/sound/base_sound.h" #include "engines/wintermute/graphics/transparent_surface.h" #include "engines/wintermute/wintermute.h" -#include "graphics/decoders/bmp.h" #include "graphics/scaler.h" +#include "image/bmp.h" #include "common/memstream.h" #include "common/str.h" #include "common/system.h" @@ -170,7 +170,7 @@ void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &des if (thumbSize > 0) { Common::MemoryReadStream thumbStream(thumbData, thumbSize, DisposeAfterUse::NO); - Graphics::BitmapDecoder bmpDecoder; + Image::BitmapDecoder bmpDecoder; if (bmpDecoder.loadStream(thumbStream)) { const Graphics::Surface *bmpSurface = bmpDecoder.getSurface(); TransparentSurface *scaleableSurface = new TransparentSurface(*bmpSurface, false); diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index e5ec879fee..e676fafdbf 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -29,11 +29,11 @@ #include "engines/wintermute/base/gfx/base_image.h" #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/graphics/transparent_surface.h" -#include "graphics/decoders/png.h" -#include "graphics/decoders/jpeg.h" -#include "graphics/decoders/bmp.h" -#include "graphics/decoders/tga.h" #include "graphics/surface.h" +#include "image/png.h" +#include "image/jpeg.h" +#include "image/bmp.h" +#include "image/tga.h" #include "common/textconsole.h" #include "common/stream.h" #include "common/system.h" @@ -62,16 +62,14 @@ BaseImage::~BaseImage() { bool BaseImage::loadFile(const Common::String &filename) { _filename = filename; _filename.toLowercase(); - if (filename.hasPrefix("savegame:")) { - _decoder = new Graphics::BitmapDecoder(); + if (filename.hasPrefix("savegame:") || _filename.hasSuffix(".bmp")) { + _decoder = new Image::BitmapDecoder(); } else if (_filename.hasSuffix(".png")) { - _decoder = new Graphics::PNGDecoder(); - } else if (_filename.hasSuffix(".bmp")) { - _decoder = new Graphics::BitmapDecoder(); + _decoder = new Image::PNGDecoder(); } else if (_filename.hasSuffix(".tga")) { - _decoder = new Graphics::TGADecoder(); + _decoder = new Image::TGADecoder(); } else if (_filename.hasSuffix(".jpg")) { - _decoder = new Graphics::JPEGDecoder(); + _decoder = new Image::JPEGDecoder(); } else { error("BaseImage::loadFile : Unsupported fileformat %s", filename.c_str()); } diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index a7d6846345..56be9fc453 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -31,11 +31,14 @@ #include "graphics/surface.h" #include "graphics/pixelformat.h" -#include "graphics/decoders/image_decoder.h" #include "common/endian.h" #include "common/str.h" #include "common/stream.h" +namespace Image { +class ImageDecoder; +} + namespace Wintermute { class BaseSurface; class BaseFileManager; @@ -60,7 +63,7 @@ public: void copyFrom(const Graphics::Surface *surface); private: Common::String _filename; - Graphics::ImageDecoder *_decoder; + Image::ImageDecoder *_decoder; const Graphics::Surface *_surface; Graphics::Surface *_deletableSurface; const byte *_palette; diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index bb57d308c0..983f9c1296 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -32,10 +32,6 @@ #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h" #include "engines/wintermute/base/gfx/base_image.h" #include "engines/wintermute/platform_osystem.h" -#include "graphics/decoders/png.h" -#include "graphics/decoders/bmp.h" -#include "graphics/decoders/jpeg.h" -#include "graphics/decoders/tga.h" #include "engines/wintermute/graphics/transparent_surface.h" #include "engines/wintermute/graphics/transform_tools.h" #include "graphics/pixelformat.h" diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index 86e27aa30d..aed30ea12c 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/engines/zvision/graphics/render_manager.cpp @@ -32,7 +32,7 @@ #include "engines/util.h" -#include "graphics/decoders/tga.h" +#include "image/tga.h" namespace ZVision { @@ -238,7 +238,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics: uint32 imageWidth; uint32 imageHeight; - Graphics::TGADecoder tga; + Image::TGADecoder tga; uint16 *buffer; bool isTransposed = _renderTable.getRenderState() == RenderTable::PANORAMA; // All ZVision images are in RGB 555 -- cgit v1.2.3