From bd453939da140ea994282e1c167ea5f8d02e2d94 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 16:08:29 +0100 Subject: Spacing tweaks; rename ImageMagick -> StillImage. --- src/lib/imagemagick_decoder.cc | 87 ------------------------------------------ 1 file changed, 87 deletions(-) delete mode 100644 src/lib/imagemagick_decoder.cc (limited to 'src/lib/imagemagick_decoder.cc') diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc deleted file mode 100644 index ee50f3fb1..000000000 --- a/src/lib/imagemagick_decoder.cc +++ /dev/null @@ -1,87 +0,0 @@ -/* - Copyright (C) 2012-2013 Carl Hetherington - - 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 -#include -#include -#include "imagemagick_content.h" -#include "imagemagick_decoder.h" -#include "image.h" -#include "film.h" -#include "exceptions.h" - -#include "i18n.h" - -using std::cout; -using boost::shared_ptr; -using libdcp::Size; - -ImageMagickDecoder::ImageMagickDecoder (shared_ptr f, shared_ptr c) - : Decoder (f) - , VideoDecoder (f) - , ImageMagick (c) -{ - -} - -void -ImageMagickDecoder::pass () -{ - if (_video_position >= _imagemagick_content->video_length ()) { - return; - } - - if (_image) { - video (_image, true, _video_position); - return; - } - - Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ()); - _video_size = libdcp::Size (magick_image->columns(), magick_image->rows()); - - _image.reset (new Image (PIX_FMT_RGB24, _video_size.get(), false)); - - using namespace MagickCore; - - uint8_t* p = _image->data()[0]; - for (int y = 0; y < _video_size->height; ++y) { - for (int x = 0; x < _video_size->width; ++x) { - Magick::Color c = magick_image->pixelColor (x, y); - *p++ = c.redQuantum() * 255 / QuantumRange; - *p++ = c.greenQuantum() * 255 / QuantumRange; - *p++ = c.blueQuantum() * 255 / QuantumRange; - } - } - - delete magick_image; - - video (_image, false, _video_position); -} - -void -ImageMagickDecoder::seek (VideoContent::Frame frame, bool) -{ - _video_position = frame; -} - -bool -ImageMagickDecoder::done () const -{ - return _video_position >= _imagemagick_content->video_length (); -} -- cgit v1.2.3