diff options
author | Max Horn | 2010-10-24 01:32:15 +0000 |
---|---|---|
committer | Max Horn | 2010-10-24 01:32:15 +0000 |
commit | 7cc8811a5c9b63703c2131841745cd5b7e5f009a (patch) | |
tree | 16a320c51b97695e70d4abf2a0b4886d0dee35e6 /engines/sword25/gfx/image/swimage.cpp | |
parent | 1e16d576ca4798bd1fac640330c5e2faf176658a (diff) | |
download | scummvm-rg350-7cc8811a5c9b63703c2131841745cd5b7e5f009a.tar.gz scummvm-rg350-7cc8811a5c9b63703c2131841745cd5b7e5f009a.tar.bz2 scummvm-rg350-7cc8811a5c9b63703c2131841745cd5b7e5f009a.zip |
SWORD25: Merge classes PNGLoader, ImageLoader and ImageLoaderManager
This looses some flexibility when it comes to supporting other image
formats. But since the game does not use other image formats, this seems
rather irrelevant, compared to how much simpler the code now is.
svn-id: r53755
Diffstat (limited to 'engines/sword25/gfx/image/swimage.cpp')
-rw-r--r-- | engines/sword25/gfx/image/swimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp index c546081cdf..2ea077f93e 100644 --- a/engines/sword25/gfx/image/swimage.cpp +++ b/engines/sword25/gfx/image/swimage.cpp @@ -33,7 +33,7 @@ */ #include "sword25/package/packagemanager.h" -#include "sword25/gfx/image/imageloader.h" +#include "sword25/gfx/image/pngloader.h" #include "sword25/gfx/image/swimage.h" namespace Sword25 { @@ -61,14 +61,14 @@ SWImage::SWImage(const Common::String &filename, bool &result) : // Bildeigenschaften bestimmen GraphicEngine::COLOR_FORMATS colorFormat; int pitch; - if (!ImageMan.extractImageProperties(pFileData, fileSize, colorFormat, _width, _height)) { + if (!PNGLoader::imageProperties(pFileData, fileSize, colorFormat, _width, _height)) { BS_LOG_ERRORLN("Could not read image properties."); return; } // Das Bild dekomprimieren byte *pUncompressedData; - if (!ImageMan.loadImage(pFileData, fileSize, GraphicEngine::CF_ARGB32, pUncompressedData, _width, _height, pitch)) { + if (!PNGLoader::decodeImage(pFileData, fileSize, GraphicEngine::CF_ARGB32, pUncompressedData, _width, _height, pitch)) { BS_LOG_ERRORLN("Could not decode image."); return; } |