From 05c37b9bb09f7bfa4c2ec8ea6b3fa4a83d0fec20 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 14 Nov 2012 20:04:15 +0000
Subject: Tests pass again.

---
 src/lib/imagemagick_decoder.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/imagemagick_decoder.cc')

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index fd4e5b18d..53e1db879 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -23,8 +23,8 @@
 #include "image.h"
 #include "film.h"
 
-using namespace std;
-using namespace boost;
+using std::cout;
+using boost::shared_ptr;
 
 ImageMagickDecoder::ImageMagickDecoder (
 	boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j)
@@ -50,9 +50,9 @@ ImageMagickDecoder::pass ()
 	}
 
 	Size size = native_size ();
-	CompactImage image (PIX_FMT_RGB24, size);
+	shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
 
-	uint8_t* p = image.data()[0];
+	uint8_t* p = image->data()[0];
 	for (int y = 0; y < size.height; ++y) {
 		for (int x = 0; x < size.width; ++x) {
 			Magick::Color c = _magick_image->pixelColor (x, y);
@@ -63,7 +63,7 @@ ImageMagickDecoder::pass ()
 
 	}
 	
-	process_video ((AVFrame const *) image.picture());
+	emit_video (image);
 
 	_done = true;
 	return false;
-- 
cgit v1.2.3