aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/image/swimage.cpp
diff options
context:
space:
mode:
authormd52011-05-05 22:12:38 +0300
committermd52011-05-05 22:12:38 +0300
commitf20c8b963a8fae6895067bc0c9dcb02cd1135fd3 (patch)
tree3091f9096f8dfb0b5b516497f5d47861484a3da8 /engines/sword25/gfx/image/swimage.cpp
parentd7334628bd59a8d4019be788d1a42b9171beae3b (diff)
downloadscummvm-rg350-f20c8b963a8fae6895067bc0c9dcb02cd1135fd3.tar.gz
scummvm-rg350-f20c8b963a8fae6895067bc0c9dcb02cd1135fd3.tar.bz2
scummvm-rg350-f20c8b963a8fae6895067bc0c9dcb02cd1135fd3.zip
SWORD25: Disabled code which isn't necessary with our PNG decoder
Diffstat (limited to 'engines/sword25/gfx/image/swimage.cpp')
-rw-r--r--engines/sword25/gfx/image/swimage.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp
index 3b9b939eb3..0f3814eb54 100644
--- a/engines/sword25/gfx/image/swimage.cpp
+++ b/engines/sword25/gfx/image/swimage.cpp
@@ -56,14 +56,16 @@ SWImage::SWImage(const Common::String &filename, bool &result) :
return;
}
+#ifndef USE_INTERNAL_PNG_DECODER
// Determine image properties
- int pitch;
if (!PNGLoader::imageProperties(pFileData, fileSize, _width, _height)) {
error("Could not read image properties.");
return;
}
+#endif
// Uncompress the image
+ int pitch;
byte *pUncompressedData;
if (!PNGLoader::decodeImage(pFileData, fileSize, pUncompressedData, _width, _height, pitch)) {
error("Could not decode image.");