diff options
| author | Johannes Schickel | 2013-08-11 23:36:57 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-09-16 15:55:36 +0200 |
| commit | ac66cc921904387518f2e0b2a14670e9598defe4 (patch) | |
| tree | f539abdbbbc443f711e7dbf164fc6f72ee6e6747 /engines | |
| parent | 9d9833537f98a24b9be37e426917856bb1193be1 (diff) | |
| download | scummvm-rg350-ac66cc921904387518f2e0b2a14670e9598defe4.tar.gz scummvm-rg350-ac66cc921904387518f2e0b2a14670e9598defe4.tar.bz2 scummvm-rg350-ac66cc921904387518f2e0b2a14670e9598defe4.zip | |
GRAPHICS: Implement JPEGDecoder based on libjpeg.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/configure.engines | 4 | ||||
| -rw-r--r-- | engines/groovie/roq.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/configure.engines b/engines/configure.engines index 963b9f774f..8111cd0fb4 100644 --- a/engines/configure.engines +++ b/engines/configure.engines @@ -15,7 +15,7 @@ add_engine drascula "Drascula: The Vampire Strikes Back" yes add_engine dreamweb "Dreamweb" yes add_engine gob "Gobli*ns" yes add_engine groovie "Groovie" yes "groovie2" "7th Guest" -add_engine groovie2 "Groovie 2 games" no +add_engine groovie2 "Groovie 2 games" no "" "" "jpeg" add_engine hopkins "Hopkins FBI" yes "" "" "16bit" add_engine hugo "Hugo Trilogy" yes add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" @@ -51,4 +51,4 @@ add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes add_engine tony "Tony Tough and the Night of Roasted Moths" yes "" "" "16bit" add_engine tsage "TsAGE" yes add_engine tucker "Bud Tucker in Double Trouble" yes -add_engine wintermute "Wintermute" no "" "" "png zlib vorbis 16bit" +add_engine wintermute "Wintermute" no "" "" "jpeg png zlib vorbis 16bit" diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index f9a938bfd4..d9c682b98a 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -436,9 +436,9 @@ bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) { Graphics::JPEGDecoder *jpg = new Graphics::JPEGDecoder(); jpg->loadStream(*_file); - const byte *y = (const byte *)jpg->getComponent(1)->getPixels(); - const byte *u = (const byte *)jpg->getComponent(2)->getPixels(); - const byte *v = (const byte *)jpg->getComponent(3)->getPixels(); + const byte *y = (const byte *)jpg->getYComponent().getPixels(); + const byte *u = (const byte *)jpg->getUComponent().getPixels(); + const byte *v = (const byte *)jpg->getVComponent().getPixels(); byte *ptr = (byte *)_currBuf->getPixels(); for (int i = 0; i < _currBuf->w * _currBuf->h; i++) { |