From dae5d5f2e9fd5c3f02f5df1eb70f7e60b221ab24 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 29 Oct 2012 13:08:51 +0000
Subject: Compile fix for ubuntu 12.10.

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

(limited to 'src/lib')

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 185fccd82..76d89b7d8 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -18,7 +18,7 @@
 */
 
 #include <iostream>
-#include <Magick++/Image.h>
+#include <Magick++.h>
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
@@ -43,6 +43,8 @@ ImageMagickDecoder::native_size () const
 bool
 ImageMagickDecoder::do_pass ()
 {
+	using namespace MagickCore;
+	
 	if (_done) {
 		return true;
 	}
@@ -54,9 +56,9 @@ ImageMagickDecoder::do_pass ()
 	for (int y = 0; y < size.height; ++y) {
 		for (int x = 0; x < size.width; ++x) {
 			Magick::Color c = _magick_image->pixelColor (x, y);
-			*p++ = c.redQuantum() * 255 / MaxRGB;
-			*p++ = c.greenQuantum() * 255 / MaxRGB;
-			*p++ = c.blueQuantum() * 255 / MaxRGB;
+			*p++ = c.redQuantum() * 255 / QuantumRange;
+			*p++ = c.greenQuantum() * 255 / QuantumRange;
+			*p++ = c.blueQuantum() * 255 / QuantumRange;
 		}
 
 	}
-- 
cgit v1.2.3