From 11cbdd03180a655b2b23ee4a13f1a00a1d782b3c Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 18 May 2010 14:17:24 +0000 Subject: Committing the rest of the VideoDecoder Rewrite from patch #2963496. svn-id: r49079 --- engines/mohawk/jpeg.h | 1 + engines/mohawk/video/cinepak.h | 1 + engines/mohawk/video/qtrle.h | 1 + engines/mohawk/video/rpza.h | 1 + engines/mohawk/video/smc.h | 1 + 5 files changed, 5 insertions(+) (limited to 'engines/mohawk') diff --git a/engines/mohawk/jpeg.h b/engines/mohawk/jpeg.h index 086e78332f..ec87b1e7af 100644 --- a/engines/mohawk/jpeg.h +++ b/engines/mohawk/jpeg.h @@ -45,6 +45,7 @@ public: ~JPEGDecoder(); Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } private: Graphics::PixelFormat _pixelFormat; diff --git a/engines/mohawk/video/cinepak.h b/engines/mohawk/video/cinepak.h index 43cc22bfc9..3f4cbba17c 100644 --- a/engines/mohawk/video/cinepak.h +++ b/engines/mohawk/video/cinepak.h @@ -65,6 +65,7 @@ public: ~CinepakDecoder(); Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } private: CinepakFrame _curFrame; diff --git a/engines/mohawk/video/qtrle.h b/engines/mohawk/video/qtrle.h index fdccf626a6..2832bd6b24 100644 --- a/engines/mohawk/video/qtrle.h +++ b/engines/mohawk/video/qtrle.h @@ -37,6 +37,7 @@ public: ~QTRLEDecoder(); Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } private: byte _bitsPerPixel; diff --git a/engines/mohawk/video/rpza.h b/engines/mohawk/video/rpza.h index b9522ec2e3..c6d0ada6f5 100644 --- a/engines/mohawk/video/rpza.h +++ b/engines/mohawk/video/rpza.h @@ -37,6 +37,7 @@ public: ~RPZADecoder() { delete _surface; } Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } private: Graphics::Surface *_surface; diff --git a/engines/mohawk/video/smc.h b/engines/mohawk/video/smc.h index 331fddb9a5..c52226100e 100644 --- a/engines/mohawk/video/smc.h +++ b/engines/mohawk/video/smc.h @@ -43,6 +43,7 @@ public: ~SMCDecoder() { delete _surface; } Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } private: Graphics::Surface *_surface; -- cgit v1.2.3