aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/image/renderedimage.cpp
diff options
context:
space:
mode:
authorMax Horn2010-10-24 01:30:53 +0000
committerMax Horn2010-10-24 01:30:53 +0000
commit85e3ddc30987ce0331d68157362322e4a7b00f83 (patch)
treecf7b75f0be7d3cd21d8b3d34465f35c67b50d64e /engines/sword25/gfx/image/renderedimage.cpp
parent2da4469686ed5336174f990605f8626dd4b46f53 (diff)
downloadscummvm-rg350-85e3ddc30987ce0331d68157362322e4a7b00f83.tar.gz
scummvm-rg350-85e3ddc30987ce0331d68157362322e4a7b00f83.tar.bz2
scummvm-rg350-85e3ddc30987ce0331d68157362322e4a7b00f83.zip
SWORD25: Add ImageLoaderManager, get rid of last globally constructed object
This also gets rid of an evil use of atexit. svn-id: r53753
Diffstat (limited to 'engines/sword25/gfx/image/renderedimage.cpp')
-rw-r--r--engines/sword25/gfx/image/renderedimage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp
index 39dec46d25..85c5dfc485 100644
--- a/engines/sword25/gfx/image/renderedimage.cpp
+++ b/engines/sword25/gfx/image/renderedimage.cpp
@@ -72,14 +72,14 @@ RenderedImage::RenderedImage(const Common::String &filename, bool &result) :
// Bildeigenschaften bestimmen
GraphicEngine::COLOR_FORMATS colorFormat;
int pitch;
- if (!ImageLoader::extractImageProperties(pFileData, fileSize, colorFormat, _width, _height)) {
+ if (!ImageMan.extractImageProperties(pFileData, fileSize, colorFormat, _width, _height)) {
BS_LOG_ERRORLN("Could not read image properties.");
delete[] pFileData;
return;
}
// Das Bild dekomprimieren
- if (!ImageLoader::loadImage(pFileData, fileSize, GraphicEngine::CF_ARGB32, _data, _width, _height, pitch)) {
+ if (!ImageMan.loadImage(pFileData, fileSize, GraphicEngine::CF_ARGB32, _data, _width, _height, pitch)) {
BS_LOG_ERRORLN("Could not decode image.");
delete[] pFileData;
return;