diff options
| author | Jordi Vilalta Prat | 2009-07-03 23:02:37 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2009-07-03 23:02:37 +0000 |
| commit | d42f054f0b9c20764ac7eed31cd1ad11e69dc426 (patch) | |
| tree | 66ee808f3403a8b5e50b892a60491f6798e21475 /engines | |
| parent | 255e51906298e8d06939cd1aa888e233b0eefa2a (diff) | |
| download | scummvm-rg350-d42f054f0b9c20764ac7eed31cd1ad11e69dc426.tar.gz scummvm-rg350-d42f054f0b9c20764ac7eed31cd1ad11e69dc426.tar.bz2 scummvm-rg350-d42f054f0b9c20764ac7eed31cd1ad11e69dc426.zip | |
Moved the YUV<->RGB routines to graphics/conversion.h
svn-id: r42080
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/video_v6.cpp | 5 | ||||
| -rw-r--r-- | engines/groovie/roq.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/gob/video_v6.cpp b/engines/gob/video_v6.cpp index c4efadde90..f0d554bd01 100644 --- a/engines/gob/video_v6.cpp +++ b/engines/gob/video_v6.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/savefile.h" +#include "graphics/conversion.h" #include "graphics/dither.h" #include "gob/gob.h" @@ -45,8 +46,8 @@ void Video_v6::setPrePalette() { for (int i = 0; i < 256; i++) { byte r, g, b; - Graphics::PaletteLUT::YUV2RGB(fpal[i * 3 + 0], fpal[i * 3 + 1], fpal[i * 3 + 2], - r, g, b); + Graphics::YUV2RGB(fpal[i * 3 + 0], fpal[i * 3 + 1], fpal[i * 3 + 2], + r, g, b); tpal[i * 3 + 0] = r >> 2; tpal[i * 3 + 1] = g >> 2; diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 3868443e96..4c8bbe55ac 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -33,7 +33,7 @@ #ifdef ENABLE_RGB_COLOR // Required for the YUV to RGB conversion -#include "graphics/dither.h" +#include "graphics/conversion.h" #endif #include "sound/mixer.h" @@ -173,7 +173,7 @@ void ROQPlayer::buildShowBuf() { } else { // Do the format conversion (YUV -> RGB -> Screen format) byte r, g, b; - Graphics::PaletteLUT::YUV2RGB(*in, *(in + 1), *(in + 2), r, g, b); + Graphics::YUV2RGB(*in, *(in + 1), *(in + 2), r, g, b); // FIXME: this is fixed to 16bit *(uint16 *)out = (uint16)_vm->_pixelFormat.RGBToColor(r, g, b); #endif // ENABLE_RGB_COLOR |