aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/image/swimage.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-23 14:49:50 +0000
committerFilippos Karapetis2011-01-23 14:49:50 +0000
commit00a0f8d15df8f241741e4a9a68a71641715ae062 (patch)
treed40be8437f7ca54dab9c77145bf72550bc5a3150 /engines/sword25/gfx/image/swimage.cpp
parent411d41d3d0a3e4d14187d4a980c25c0a2e41ad9c (diff)
downloadscummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.tar.gz
scummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.tar.bz2
scummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.zip
SWORD25: Removed the custom log class and replaced it with warning/error/debugC calls
svn-id: r55462
Diffstat (limited to 'engines/sword25/gfx/image/swimage.cpp')
-rw-r--r--engines/sword25/gfx/image/swimage.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp
index 84aa35b0f4..143754ce58 100644
--- a/engines/sword25/gfx/image/swimage.cpp
+++ b/engines/sword25/gfx/image/swimage.cpp
@@ -38,9 +38,6 @@
namespace Sword25 {
-#define BS_LOG_PREFIX "SWIMAGE"
-
-
SWImage::SWImage(const Common::String &filename, bool &result) :
_imageDataPtr(0),
_width(0),
@@ -55,21 +52,21 @@ SWImage::SWImage(const Common::String &filename, bool &result) :
uint fileSize;
pFileData = pPackage->getFile(filename, &fileSize);
if (!pFileData) {
- BS_LOG_ERRORLN("File \"%s\" could not be loaded.", filename.c_str());
+ error("File \"%s\" could not be loaded.", filename.c_str());
return;
}
// Bildeigenschaften bestimmen
int pitch;
if (!PNGLoader::imageProperties(pFileData, fileSize, _width, _height)) {
- BS_LOG_ERRORLN("Could not read image properties.");
+ error("Could not read image properties.");
return;
}
// Das Bild dekomprimieren
byte *pUncompressedData;
if (!PNGLoader::decodeImage(pFileData, fileSize, pUncompressedData, _width, _height, pitch)) {
- BS_LOG_ERRORLN("Could not decode image.");
+ error("Could not decode image.");
return;
}
@@ -92,17 +89,17 @@ bool SWImage::blit(int posX, int posY,
Common::Rect *pPartRect,
uint color,
int width, int height) {
- BS_LOG_ERRORLN("Blit() is not supported.");
+ error("Blit() is not supported.");
return false;
}
bool SWImage::fill(const Common::Rect *pFillRect, uint color) {
- BS_LOG_ERRORLN("Fill() is not supported.");
+ error("Fill() is not supported.");
return false;
}
bool SWImage::setContent(const byte *pixeldata, uint size, uint offset, uint stride) {
- BS_LOG_ERRORLN("SetContent() is not supported.");
+ error("SetContent() is not supported.");
return false;
}