diff options
| author | Eugene Sandulenko | 2010-08-13 15:24:23 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:39:23 +0000 |
| commit | fd40021a722956a3c37119c72b1350acb313574e (patch) | |
| tree | b61dd65523d8a26a3b39cfa7fa44c36fc81982f8 /engines/sword25/gfx/image/pngloader.cpp | |
| parent | d50dcb80ad44465745a38ea42bd87db9480db949 (diff) | |
| download | scummvm-rg350-fd40021a722956a3c37119c72b1350acb313574e.tar.gz scummvm-rg350-fd40021a722956a3c37119c72b1350acb313574e.tar.bz2 scummvm-rg350-fd40021a722956a3c37119c72b1350acb313574e.zip | |
SWORD25: Started rewriting gfx subsystem
svn-id: r53227
Diffstat (limited to 'engines/sword25/gfx/image/pngloader.cpp')
| -rw-r--r-- | engines/sword25/gfx/image/pngloader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp index 3f892c7af1..605dca8635 100644 --- a/engines/sword25/gfx/image/pngloader.cpp +++ b/engines/sword25/gfx/image/pngloader.cpp @@ -62,7 +62,7 @@ static void png_user_read_data(png_structp png_ptr, png_bytep data, png_size_t l // ----------------------------------------------------------------------------- -bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr, +bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr, int &Width, int &Height, int &Pitch) { png_structp png_ptr = NULL; png_infop info_ptr = NULL; @@ -115,7 +115,7 @@ bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize, // Speicher für die endgültigen Bilddaten reservieren // Dieses geschieht vor dem reservieren von Speicher für temporäre Bilddaten um die Fragmentierung des Speichers gering zu halten - UncompressedDataPtr = new char[Pitch * Height]; + UncompressedDataPtr = new byte[Pitch * Height]; if (!UncompressedDataPtr) { error("Could not allocate memory for output image."); } @@ -256,7 +256,7 @@ bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize, // ----------------------------------------------------------------------------- -bool BS_PNGLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr, +bool BS_PNGLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr, int &Width, int &Height, int &Pitch) { return DoDecodeImage(FileDataPtr, FileSize, ColorFormat, UncompressedDataPtr, Width, Height, Pitch); } |