diff options
| author | D G Turner | 2012-04-07 02:56:39 +0100 |
|---|---|---|
| committer | D G Turner | 2012-04-08 03:29:45 +0100 |
| commit | 95d7c012d6635ac8124d74aeacfb6d52fc2d7ea0 (patch) | |
| tree | 10514d52d2584801df6df146d633a7aa00e93775 /video/codecs/svq1.h | |
| parent | c917db0754f5d459b18c663bb826457147889bfa (diff) | |
| download | scummvm-rg350-95d7c012d6635ac8124d74aeacfb6d52fc2d7ea0.tar.gz scummvm-rg350-95d7c012d6635ac8124d74aeacfb6d52fc2d7ea0.tar.bz2 scummvm-rg350-95d7c012d6635ac8124d74aeacfb6d52fc2d7ea0.zip | |
VIDEO: Minor updates to SVQ1 decoder, mainly return flags to bool.
Since the returned int values from the decoding functions are just
0 for good or -1 for error, have changed these into an errorFlag
bool. This improves readability and cleans up some of the error
checking code. In addition, have fixed some oversights in formatting
spacing for readability.
Diffstat (limited to 'video/codecs/svq1.h')
| -rw-r--r-- | video/codecs/svq1.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/codecs/svq1.h b/video/codecs/svq1.h index 8442f07e4e..2c35f6cb46 100644 --- a/video/codecs/svq1.h +++ b/video/codecs/svq1.h @@ -55,15 +55,15 @@ private: Common::Huffman *_interMean; Common::Huffman *_motionComponent; - int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch); - int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch); - int svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv); + bool svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch); + bool svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch); + bool svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv); void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y); - int svq1MotionInterBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + bool svq1MotionInterBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, Common::Point *motion, int x, int y); - int svq1MotionInter4vBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + bool svq1MotionInter4vBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, Common::Point *motion, int x, int y); - int svq1DecodeDeltaBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + bool svq1DecodeDeltaBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, Common::Point *motion, int x, int y); }; |