libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IMAGE: Try and work around N64 compilation error

Browse Source
This commit is contained in:
Paul Gilbert 2016-09-11 15:25:24 -04:00
parent dd1a2b65e9
commit 21979d741b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image/codecs/indeo/indeo.cpp
View File

@ -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)

4
image/codecs/indeo/indeo.h
View File

@ -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

2
image/codecs/indeo4.cpp
View File

@ -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() {

2
image/codecs/indeo5.cpp
View File

@ -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() {