Peter Lemenkov 962f81
From 296538ef2754df0c6e704ac172854816d4ff5cd2 Mon Sep 17 00:00:00 2001
Peter Lemenkov 962f81
From: Caolan McNamara <caolanm@fedoraproject.org>
Peter Lemenkov 962f81
Date: Mon, 2 Mar 2009 12:21:34 +0000
Peter Lemenkov 962f81
Subject: [PATCH 1/3] Modify GetOnePixel usage to build against current
Peter Lemenkov 962f81
 ImageMagick api
Peter Lemenkov 962f81
Peter Lemenkov 962f81
---
Peter Lemenkov 962f81
 input-magick.c | 4 ++++
Peter Lemenkov 962f81
 1 file changed, 4 insertions(+)
Peter Lemenkov 962f81
Peter Lemenkov 962f81
diff --git a/input-magick.c b/input-magick.c
Peter Lemenkov 962f81
index 51c6409..bc36b8f 100644
Peter Lemenkov 962f81
--- a/input-magick.c
Peter Lemenkov 962f81
+++ b/input-magick.c
Peter Lemenkov 962f81
@@ -83,7 +83,11 @@ at_bitmap_type input_magick_reader(at_string filename,
Caolan McNamara b58ddf
 
Caolan McNamara b58ddf
   for(j=0,runcount=0,point=0;j<image->rows;j++)
Caolan McNamara b58ddf
     for(i=0;i<image->columns;i++) {
Hans de Goede a280fc
+#if (MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649)
Caolan McNamara b58ddf
       p=GetOnePixel(image,i,j);
Caolan McNamara b58ddf
+#else
Caolan McNamara b58ddf
+      GetOnePixel(image,i,j,pixel);
Caolan McNamara b58ddf
+#endif
Caolan McNamara b58ddf
       AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */
Caolan McNamara b58ddf
       if(np==3) {
Caolan McNamara b58ddf
         AT_BITMAP_BITS(bitmap)[point++]=pixel->green;
Peter Lemenkov 962f81
-- 
Peter Lemenkov 962f81
1.7.11.2
Peter Lemenkov 962f81