From 53332e806670cdff27dc0d2faa85cad066a5cdc9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:20 +0100
Subject: GRAPHICS: Make GPL headers consistent in themselves.

---
 graphics/decoders/jpeg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'graphics/decoders/jpeg.h')

diff --git a/graphics/decoders/jpeg.h b/graphics/decoders/jpeg.h
index 8460bc2698..8fd03ca86b 100644
--- a/graphics/decoders/jpeg.h
+++ b/graphics/decoders/jpeg.h
@@ -8,12 +8,12 @@
  * 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.
-- 
cgit v1.2.3


From 740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:23 -0500
Subject: IMAGE: Move all ImageDecoders to image/

---
 graphics/decoders/jpeg.h | 95 ------------------------------------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 graphics/decoders/jpeg.h

(limited to 'graphics/decoders/jpeg.h')

diff --git a/graphics/decoders/jpeg.h b/graphics/decoders/jpeg.h
deleted file mode 100644
index 8fd03ca86b..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
-- 
cgit v1.2.3