Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 0 insertions, 95 deletions

diff --git a/graphics/decoders/jpeg.h b/graphics/decoders/jpeg.h
deleted file mode 100644
index 8460bc2698..0000000000
--- a/graphics/decoders/jpeg.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/**
- * @file
- * Image decoder used in engines:
- *  - groovie
- *  - mohawk
- *  - wintermute
- */
-
-#ifndef GRAPHICS_JPEG_H
-#define GRAPHICS_JPEG_H
-
-#include "graphics/surface.h"
-#include "graphics/decoders/image_decoder.h"
-
-namespace Common {
-class SeekableReadStream;
-}
-
-namespace Graphics {
-
-class JPEGDecoder : public ImageDecoder {
-public:
-	JPEGDecoder();
-	~JPEGDecoder();
-
-	// ImageDecoder API
-	virtual void destroy();
-	virtual bool loadStream(Common::SeekableReadStream &str);
-	virtual const Surface *getSurface() const;
-
-	// Special API for JPEG
-	enum ColorSpace {
-		/**
-		 * Output 32bit RGBA data.
-		 *
-		 * This is the default output.
-		 */
-		kColorSpaceRGBA,
-
-		/**
-		 * Output (interleaved) YUV data.
-		 *
-		 * Be aware that some images cannot be output in YUV mode.
-		 * These are (non-standard) JPEG images which are in RGB colorspace.
-		 *
-		 * The resulting Surface will have a PixelFormat with 3 bytes per
-		 * pixel and the remaining entries are completely zeroed. This works
-		 * around the fact that PixelFormat can only describe RGB formats.
-		 *
-		 * You should only use this when you are really aware of what you are
-		 * doing!
-		 */
-		kColorSpaceYUV
-	};
-
-	/**
-	 * Request the output color space. This can be used to obtain raw YUV
-	 * data from the JPEG file. But this might not work for all files!
-	 *
-	 * The decoder itself defaults to RGBA.
-	 *
-	 * @param outSpace The color space to output.
-	 */
-	void setOutputColorSpace(ColorSpace outSpace) { _colorSpace = outSpace; }
-
-private:
-	Graphics::Surface _surface;
-	ColorSpace _colorSpace;
-};
-
-} // End of Graphics namespace
-
-#endif // GRAPHICS_JPEG_H