From 8f3a923686a5a29e8affff2b624deff35938d5dc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:27 +0100
Subject: VIDEO: Make GPL headers consistent in themselves.

---
 video/codecs/cdtoons.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'video/codecs/cdtoons.h')

diff --git a/video/codecs/cdtoons.h b/video/codecs/cdtoons.h
index 74d30ce8ea..9fec370d1c 100644
--- a/video/codecs/cdtoons.h
+++ b/video/codecs/cdtoons.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 b568ac73b9d2e063eb04693e4610a9932035b696 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:23 -0500
Subject: IMAGE: Move video codecs to image/

---
 video/codecs/cdtoons.h | 72 --------------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 video/codecs/cdtoons.h

(limited to 'video/codecs/cdtoons.h')

diff --git a/video/codecs/cdtoons.h b/video/codecs/cdtoons.h
deleted file mode 100644
index 9fec370d1c..0000000000
--- a/video/codecs/cdtoons.h
+++ /dev/null
@@ -1,72 +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.
- *
- */
-
-#ifndef VIDEO_CODECS_CDTOONS_H
-#define VIDEO_CODECS_CDTOONS_H
-
-#include "video/codecs/codec.h"
-
-#include "common/hashmap.h"
-
-namespace Video {
-
-struct CDToonsBlock {
-	uint16 flags;
-	uint32 size;
-	uint16 startFrame;
-	uint16 endFrame;
-	uint16 unknown12;
-	byte *data;
-};
-
-/**
- * Broderbund CDToons decoder.
- *
- * Used in video:
- *  - QuickTimeDecoder
- */
-class CDToonsDecoder : public Codec {
-public:
-	CDToonsDecoder(uint16 width, uint16 height);
-	~CDToonsDecoder();
-
-	Graphics::Surface *decodeImage(Common::SeekableReadStream *stream);
-	Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); }
-	bool containsPalette() const { return true; }
-	const byte *getPalette() { _dirtyPalette = false; return _palette; }
-	bool hasDirtyPalette() const { return _dirtyPalette; }
-
-private:
-	Graphics::Surface *_surface;
-	byte _palette[256 * 3];
-	bool _dirtyPalette;
-	uint16 _currentPaletteId;
-
-	Common::HashMap<uint16, CDToonsBlock> _blocks;
-
-	void renderBlock(byte *data, uint size, int x, int y, uint width, uint height);
-	void setPalette(byte *data);
-};
-
-} // End of namespace Video
-
-#endif
-- 
cgit v1.2.3