diff options
| author | Paul Gilbert | 2016-09-11 15:25:24 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-11 15:25:24 -0400 |
| commit | 21979d741b5e72730d34151e3372353d08a5b942 (patch) | |
| tree | ae78bd21aec361f4127845c0aba3eadf33a635ad /image | |
| parent | dd1a2b65e9a79b4d643c5b8fe3a8a35dd03c80c0 (diff) | |
| download | scummvm-rg350-21979d741b5e72730d34151e3372353d08a5b942.tar.gz scummvm-rg350-21979d741b5e72730d34151e3372353d08a5b942.tar.bz2 scummvm-rg350-21979d741b5e72730d34151e3372353d08a5b942.zip | |
IMAGE: Try and work around N64 compilation error
Diffstat (limited to 'image')
| -rw-r--r-- | image/codecs/indeo/indeo.cpp | 4 | ||||
| -rw-r--r-- | image/codecs/indeo/indeo.h | 4 | ||||
| -rw-r--r-- | image/codecs/indeo4.cpp | 2 | ||||
| -rw-r--r-- | image/codecs/indeo5.cpp | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp index 44cfdf90ef..7d8a3ce114 100644 --- a/image/codecs/indeo/indeo.cpp +++ b/image/codecs/indeo/indeo.cpp @@ -35,6 +35,7 @@ #include "graphics/yuv_to_rgb.h" #include "common/system.h" #include "common/algorithm.h" +#include "common/rect.h" #include "common/textconsole.h" #include "common/util.h" @@ -468,13 +469,14 @@ IVI45DecContext::IVI45DecContext() : _gb(nullptr), _frameNum(0), _frameType(0), IndeoDecoderBase::IndeoDecoderBase(uint16 width, uint16 height) : Codec() { _pixelFormat = g_system->getScreenFormat(); assert(_pixelFormat.bytesPerPixel > 1); - _surface = new Graphics::ManagedSurface(); + _surface = new Graphics::Surface(); _surface->create(width, height, _pixelFormat); _surface->fillRect(Common::Rect(0, 0, width, height), 0); _ctx._bRefBuf = 3; // buffer 2 is used for scalability mode } IndeoDecoderBase::~IndeoDecoderBase() { + _surface->free(); delete _surface; IVIPlaneDesc::freeBuffers(_ctx._planes); if (_ctx._mbVlc._custTab._table) diff --git a/image/codecs/indeo/indeo.h b/image/codecs/indeo/indeo.h index b4584a36ff..696b7d0260 100644 --- a/image/codecs/indeo/indeo.h +++ b/image/codecs/indeo/indeo.h @@ -21,7 +21,7 @@ */ #include "common/scummsys.h" -#include "graphics/managed_surface.h" +#include "graphics/surface.h" #include "image/codecs/codec.h" /* Common structures, macros, and base class shared by both Indeo4 and @@ -518,7 +518,7 @@ private: protected: IVI45DecContext _ctx; Graphics::PixelFormat _pixelFormat; - Graphics::ManagedSurface *_surface; + Graphics::Surface *_surface; /** * Scan patterns shared between indeo4 and indeo5 diff --git a/image/codecs/indeo4.cpp b/image/codecs/indeo4.cpp index 3e4c37bbab..feee811cf0 100644 --- a/image/codecs/indeo4.cpp +++ b/image/codecs/indeo4.cpp @@ -85,7 +85,7 @@ const Graphics::Surface *Indeo4Decoder::decodeFrame(Common::SeekableReadStream & _ctx._frameData = nullptr; _ctx._frameSize = 0; - return (err < 0) ? nullptr : &_surface->rawSurface(); + return (err < 0) ? nullptr : _surface; } int Indeo4Decoder::decodePictureHeader() { diff --git a/image/codecs/indeo5.cpp b/image/codecs/indeo5.cpp index d5ce571bea..522722f73a 100644 --- a/image/codecs/indeo5.cpp +++ b/image/codecs/indeo5.cpp @@ -96,7 +96,7 @@ const Graphics::Surface *Indeo5Decoder::decodeFrame(Common::SeekableReadStream & _ctx._frameData = nullptr; _ctx._frameSize = 0; - return (err < 0) ? nullptr : &_surface->rawSurface(); + return (err < 0) ? nullptr : _surface; } int Indeo5Decoder::decodePictureHeader() { |