Merge still/moving image classes.

1 files changed, 0 insertions, 89 deletions

diff --git a/src/lib/still_image_decoder.cc b/src/lib/still_image_decoder.cc
deleted file mode 100644
index 6e82f9a55..000000000
--- a/src/lib/still_image_decoder.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
-#include "still_image_content.h"
-#include "still_image_decoder.h"
-#include "image.h"
-#include "film.h"
-#include "exceptions.h"
-
-#include "i18n.h"
-
-using std::cout;
-using boost::shared_ptr;
-using libdcp::Size;
-
-StillImageDecoder::StillImageDecoder (shared_ptr<const Film> f, shared_ptr<const StillImageContent> c)
-	: Decoder (f)
-	, VideoDecoder (f, c)
-	, StillImage (c)
-{
-
-}
-
-void
-StillImageDecoder::pass ()
-{
-	if (_video_position >= _still_image_content->video_length ()) {
-		return;
-	}
-
-	if (_image) {
-		video (_image, true, _video_position);
-		return;
-	}
-
-	Magick::Image* magick_image = new Magick::Image (_still_image_content->path().string ());
-	_video_size = libdcp::Size (magick_image->columns(), magick_image->rows());
-	
-	_image.reset (new Image (PIX_FMT_RGB24, _video_size.get(), true));
-
-	using namespace MagickCore;
-	
-	uint8_t* p = _image->data()[0];
-	for (int y = 0; y < _video_size->height; ++y) {
-		uint8_t* q = p;
-		for (int x = 0; x < _video_size->width; ++x) {
-			Magick::Color c = magick_image->pixelColor (x, y);
-			*q++ = c.redQuantum() * 255 / QuantumRange;
-			*q++ = c.greenQuantum() * 255 / QuantumRange;
-			*q++ = c.blueQuantum() * 255 / QuantumRange;
-		}
-		p += _image->stride()[0];
-	}
-
-	delete magick_image;
-
-	video (_image, false, _video_position);
-}
-
-void
-StillImageDecoder::seek (VideoContent::Frame frame, bool)
-{
-	_video_position = frame;
-}
-
-bool
-StillImageDecoder::done () const
-{
-	return _video_position >= _still_image_content->video_length ();
-}