[Scummvm-git-logs] scummvm master -> 21979d741b5e72730d34151e3372353d08a5b942
dreammaster
dreammaster at scummvm.org
Sun Sep 11 21:25:31 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
21979d741b IMAGE: Try and work around N64 compilation error
Commit: 21979d741b5e72730d34151e3372353d08a5b942
https://github.com/scummvm/scummvm/commit/21979d741b5e72730d34151e3372353d08a5b942
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-11T15:25:24-04:00
Commit Message:
IMAGE: Try and work around N64 compilation error
Changed paths:
image/codecs/indeo/indeo.cpp
image/codecs/indeo/indeo.h
image/codecs/indeo4.cpp
image/codecs/indeo5.cpp
diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp
index 44cfdf9..7d8a3ce 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 b4584a3..696b7d0 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 3e4c37b..feee811 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 d5ce571..522722f 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() {
More information about the Scummvm-git-logs
mailing list