diff options
| author | Matthew Hoops | 2014-02-27 21:27:23 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-02-28 00:27:28 -0500 |
| commit | 740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7 (patch) | |
| tree | d1f414522b8effe91dc2e4c75443ca18a30fc0ef /video | |
| parent | cbf085287c74e0994fb18fb0830ccdb340b5b0ac (diff) | |
| download | scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.tar.gz scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.tar.bz2 scummvm-rg350-740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7.zip | |
IMAGE: Move all ImageDecoders to image/
Diffstat (limited to 'video')
| -rw-r--r-- | video/codecs/jpeg.cpp | 4 | ||||
| -rw-r--r-- | video/codecs/mjpeg.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/video/codecs/jpeg.cpp b/video/codecs/jpeg.cpp index a5d29ceead..77917f37a2 100644 --- a/video/codecs/jpeg.cpp +++ b/video/codecs/jpeg.cpp @@ -23,7 +23,7 @@ #include "common/system.h" #include "common/textconsole.h" #include "graphics/surface.h" -#include "graphics/decoders/jpeg.h" +#include "image/jpeg.h" #include "video/codecs/jpeg.h" @@ -46,7 +46,7 @@ JPEGDecoder::~JPEGDecoder() { } const Graphics::Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream *stream) { - Graphics::JPEGDecoder jpeg; + Image::JPEGDecoder jpeg; if (!jpeg.loadStream(*stream)) { warning("Failed to decode JPEG frame"); diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp index 443a06ee5a..16fb4f369e 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/mjpeg.cpp @@ -29,7 +29,7 @@ #include "common/system.h" #include "common/textconsole.h" #include "graphics/surface.h" -#include "graphics/decoders/jpeg.h" +#include "image/jpeg.h" #include "video/codecs/mjpeg.h" @@ -197,7 +197,7 @@ const Graphics::Surface *MJPEGDecoder::decodeImage(Common::SeekableReadStream *s stream->read(data + dataOffset, stream->size() - inputSkip); Common::MemoryReadStream convertedStream(data, outputSize, DisposeAfterUse::YES); - Graphics::JPEGDecoder jpeg; + Image::JPEGDecoder jpeg; if (!jpeg.loadStream(convertedStream)) { warning("Failed to decode MJPEG frame"); |