diff options
author | Johannes Schickel | 2013-08-03 02:42:32 +0200 |
---|---|---|
committer | Johannes Schickel | 2013-08-03 04:02:52 +0200 |
commit | 1550e9804b883afd4eb32eaea77cd81cbef75953 (patch) | |
tree | 977ecf0f8e3d925e81374d8bfc42356e060bc89b /engines/sword25/gfx/image | |
parent | 5f8bce839f1a463f0de0ba5e116d93d802fb8ad0 (diff) | |
download | scummvm-rg350-1550e9804b883afd4eb32eaea77cd81cbef75953.tar.gz scummvm-rg350-1550e9804b883afd4eb32eaea77cd81cbef75953.tar.bz2 scummvm-rg350-1550e9804b883afd4eb32eaea77cd81cbef75953.zip |
SWORD25: Take advantage of Surface::getPixels.
Diffstat (limited to 'engines/sword25/gfx/image')
-rw-r--r-- | engines/sword25/gfx/image/imgloader.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/gfx/image/renderedimage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/gfx/image/imgloader.cpp b/engines/sword25/gfx/image/imgloader.cpp index 6a458a0ae1..9006a596b4 100644 --- a/engines/sword25/gfx/image/imgloader.cpp +++ b/engines/sword25/gfx/image/imgloader.cpp @@ -50,7 +50,7 @@ bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&un width = pngSurface->w; height = pngSurface->h; uncompressedDataPtr = new byte[pngSurface->pitch * pngSurface->h]; - memcpy(uncompressedDataPtr, (byte *)pngSurface->getBasePtr(0, 0), pngSurface->pitch * pngSurface->h); + memcpy(uncompressedDataPtr, (byte *)pngSurface->getPixels(), pngSurface->pitch * pngSurface->h); pngSurface->free(); delete pngSurface; diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp index f8ed7a00b2..c0138c8fd3 100644 --- a/engines/sword25/gfx/image/renderedimage.cpp +++ b/engines/sword25/gfx/image/renderedimage.cpp @@ -287,7 +287,7 @@ bool RenderedImage::blit(int posX, int posY, int flipping, Common::Rect *pPartRe if ((width != srcImage.w) || (height != srcImage.h)) { // Scale the image img = imgScaled = scale(srcImage, width, height); - savedPixels = (byte *)img->getBasePtr(0, 0); + savedPixels = (byte *)img->getPixels(); } else { img = &srcImage; } |