diff options
| author | Matthew Hoops | 2011-07-02 22:05:45 -0400 |
|---|---|---|
| committer | Johannes Schickel | 2012-03-20 01:06:48 +0100 |
| commit | 765a8704454d705acc9ce5aa7a90c1c3079fb989 (patch) | |
| tree | ffb665cb56dc0b28b208ef13f5e0e75ed477fa7e /graphics/decoders/pict.cpp | |
| parent | 4516b5ea24e6c0056984a65fe4fff33553931487 (diff) | |
| download | scummvm-rg350-765a8704454d705acc9ce5aa7a90c1c3079fb989.tar.gz scummvm-rg350-765a8704454d705acc9ce5aa7a90c1c3079fb989.tar.bz2 scummvm-rg350-765a8704454d705acc9ce5aa7a90c1c3079fb989.zip | |
GRAPHICS: Convert JPEG to the ImageDecoder API
Diffstat (limited to 'graphics/decoders/pict.cpp')
| -rw-r--r-- | graphics/decoders/pict.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/decoders/pict.cpp b/graphics/decoders/pict.cpp index 9b28f4352e..f8b2553ea0 100644 --- a/graphics/decoders/pict.cpp +++ b/graphics/decoders/pict.cpp @@ -27,7 +27,7 @@ #include "common/textconsole.h" #include "graphics/surface.h" -#include "graphics/jpeg.h" +#include "graphics/decoders/jpeg.h" #include "graphics/decoders/pict.h" namespace Graphics { @@ -512,20 +512,20 @@ void PICTDecoder::skipBitsRect(Common::SeekableReadStream &stream, bool hasPalet // http://developer.apple.com/legacy/mac/library/#documentation/QuickTime/Rm/CompressDecompress/ImageComprMgr/B-Chapter/2TheImageCompression.html // http://developer.apple.com/legacy/mac/library/#documentation/QuickTime/Rm/CompressDecompress/ImageComprMgr/F-Chapter/6WorkingwiththeImage.html void PICTDecoder::decodeCompressedQuickTime(Common::SeekableReadStream &stream) { - JPEG jpeg; + JPEGDecoder jpeg; uint32 dataSize = stream.readUint32BE(); uint32 startPos = stream.pos(); - Common::SeekableReadStream *jpegStream = new Common::SeekableSubReadStream(&stream, stream.pos() + 156, stream.pos() + dataSize); + Common::SeekableSubReadStream jpegStream(&stream, stream.pos() + 156, stream.pos() + dataSize); - if (!jpeg.read(jpegStream)) + if (!jpeg.loadStream(jpegStream)) error("PICTDecoder::decodeCompressedQuickTime(): Could not decode JPEG data"); - _outputSurface = jpeg.getSurface(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); + _outputSurface = new Graphics::Surface(); + _outputSurface->copyFrom(*jpeg.getSurface()); stream.seek(startPos + dataSize); - delete jpegStream; } } // End of namespace Graphics |