diff options
author | Matthew Hoops | 2012-05-25 00:21:51 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-05-25 00:35:38 -0400 |
commit | f1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch) | |
tree | 06a04072df44bd5f337ff79b43684d8109a72f59 /graphics/decoders/png.cpp | |
parent | b2506abccf6aa64da31b497b45fe0e1949530053 (diff) | |
parent | beef27fc10bb714fe37f2ee0c35cd143dc706829 (diff) | |
download | scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2 scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'graphics/decoders/png.cpp')
-rw-r--r-- | graphics/decoders/png.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/graphics/decoders/png.cpp b/graphics/decoders/png.cpp index b87b6fdc7a..492c69779f 100644 --- a/graphics/decoders/png.cpp +++ b/graphics/decoders/png.cpp @@ -99,7 +99,7 @@ enum PNGFilters { }; PNGDecoder::PNGDecoder() : _compressedBuffer(0), _compressedBufferSize(0), - _transparentColorSpecified(false), _outputSurface(0) { + _transparentColorSpecified(false), _outputSurface(0), _paletteEntries(0) { } PNGDecoder::~PNGDecoder() { @@ -112,6 +112,8 @@ void PNGDecoder::destroy() { delete _outputSurface; _outputSurface = 0; } + + _paletteEntries = 0; } bool PNGDecoder::loadStream(Common::SeekableReadStream &stream) { |