1 files changed, 21 insertions, 20 deletions

diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index 151390580f..484e49d529 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -28,8 +28,8 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "engines/util.h"
-#include "graphics/jpeg.h"
-#include "graphics/pict.h"
+#include "graphics/decoders/jpeg.h"
+#include "graphics/decoders/pict.h"
 
 namespace Mohawk {
 
@@ -49,14 +49,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 	if (_pixelFormat.bytesPerPixel == 1)
 		error("Myst requires greater than 256 colors to run");
 
-	if (_vm->getFeatures() & GF_ME) {
-		_jpegDecoder = new Graphics::JPEG();
-		_pictDecoder = new Graphics::PictDecoder(_pixelFormat);
-	} else {
-		_jpegDecoder = NULL;
-		_pictDecoder = NULL;
-	}
-
 	_pictureFile.entries = NULL;
 
 	// Initialize our buffer
@@ -69,8 +61,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 
 MystGraphics::~MystGraphics() {
 	delete _bmpDecoder;
-	delete _jpegDecoder;
-	delete _pictDecoder;
 	delete[] _pictureFile.entries;
 
 	_backBuffer->free();
@@ -130,15 +120,21 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 		for (uint32 i = 0; i < _pictureFile.pictureCount; i++)
 			if (_pictureFile.entries[i].id == id) {
 				if (_pictureFile.entries[i].type == 0) {
-					Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
+					Graphics::JPEGDecoder jpeg;
+					Common::SeekableSubReadStream subStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
 
-					if (!_jpegDecoder->read(stream))
+					if (!jpeg.loadStream(subStream))
 						error("Could not decode Myst ME Mac JPEG");
 
-					mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat));
-					delete stream;
+					mhkSurface = new MohawkSurface(jpeg.getSurface()->convertTo(_pixelFormat));
 				} else if (_pictureFile.entries[i].type == 1) {
-					mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size)));
+					Graphics::PICTDecoder pict;
+					Common::SeekableSubReadStream subStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
+
+					if (!pict.loadStream(subStream))
+						error("Could not decode Myst ME Mac PICT");
+
+					mhkSurface = new MohawkSurface(pict.getSurface()->convertTo(_pixelFormat));
 				} else
 					error ("Unknown Picture File type %d", _pictureFile.entries[i].type);
 				break;
@@ -170,9 +166,14 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 			dataStream->seek(0);
 		}
 
-		if (isPict)
-			mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream));
-		else {
+		if (isPict) {
+			Graphics::PICTDecoder pict;
+
+			if (!pict.loadStream(*dataStream))
+				error("Could not decode Myst ME PICT");
+
+			mhkSurface = new MohawkSurface(pict.getSurface()->convertTo(_pixelFormat));
+		} else {
 			mhkSurface = _bmpDecoder->decodeImage(dataStream);
 			mhkSurface->convertToTrueColor();
 		}