diff options
| author | Christoph Mallon | 2011-08-07 11:57:40 +0200 |
|---|---|---|
| committer | Christoph Mallon | 2011-08-07 15:19:08 +0200 |
| commit | c21f87836e9f292c8d6589ece03f6ccdc40dafc5 (patch) | |
| tree | 34685c110f22581c9d7f95e960fdcc01f1c0c562 /backends/platform/psp/png_loader.cpp | |
| parent | a5675c3dbe799acf6ced70ba9e83cdd88252bce9 (diff) | |
| download | scummvm-rg350-c21f87836e9f292c8d6589ece03f6ccdc40dafc5.tar.gz scummvm-rg350-c21f87836e9f292c8d6589ece03f6ccdc40dafc5.tar.bz2 scummvm-rg350-c21f87836e9f292c8d6589ece03f6ccdc40dafc5.zip | |
PSP: Pass the stream as reference to PngLoader.
Diffstat (limited to 'backends/platform/psp/png_loader.cpp')
| -rw-r--r-- | backends/platform/psp/png_loader.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/backends/platform/psp/png_loader.cpp b/backends/platform/psp/png_loader.cpp index 16377539c8..4de13d1e73 100644 --- a/backends/platform/psp/png_loader.cpp +++ b/backends/platform/psp/png_loader.cpp @@ -78,7 +78,7 @@ PngLoader::Status PngLoader::allocate() { bool PngLoader::load() { DEBUG_ENTER_FUNC(); // Try to load the image - _file->seek(0); // Go back to start + _file.seek(0); // Go back to start if (!loadImageIntoBuffer()) { PSP_DEBUG_PRINT("failed to load image\n"); @@ -99,11 +99,9 @@ void PngLoader::warningFn(png_structp png_ptr, png_const_charp warning_msg) { // Read function for png library to be able to read from our SeekableReadStream // void PngLoader::libReadFunc(png_structp pngPtr, png_bytep data, png_size_t length) { - Common::SeekableReadStream *file; + Common::SeekableReadStream &file = *(Common::SeekableReadStream *)pngPtr->io_ptr; - file = (Common::SeekableReadStream *)pngPtr->io_ptr; - - file->read(data, length); + file.read(data, length); } bool PngLoader::basicImageLoad() { @@ -120,7 +118,7 @@ bool PngLoader::basicImageLoad() { return false; } // Set the png lib to use our read function - png_set_read_fn(_pngPtr, (void *)_file, libReadFunc); + png_set_read_fn(_pngPtr, &_file, libReadFunc); unsigned int sig_read = 0; |