rpms/autotrace/devel autotrace-0.31.1-GetOnePixel.patch, NONE, 1.1 autotrace.spec, 1.21, 1.22

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/autotrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28085

Modified Files:
	autotrace.spec 
Added Files:
	autotrace-0.31.1-GetOnePixel.patch 
Log Message:
Modify GetOnePixel usage to build against current ImageMagick api

autotrace-0.31.1-GetOnePixel.patch:

--- NEW FILE autotrace-0.31.1-GetOnePixel.patch ---
diff -ru autotrace-0.31.1.orig/input-magick.c autotrace-0.31.1/input-magick.c
--- autotrace-0.31.1.orig/input-magick.c	2009-03-02 12:08:45.000000000 +0000
+++ autotrace-0.31.1/input-magick.c	2009-03-02 12:12:21.000000000 +0000
@@ -83,7 +83,11 @@
 
   for(j=0,runcount=0,point=0;j<image->rows;j++)
     for(i=0;i<image->columns;i++) {
+#if (MagickLibVersion < 0x0645)
       p=GetOnePixel(image,i,j);
+#else
+      GetOnePixel(image,i,j,pixel);
+#endif
       AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */
       if(np==3) {
         AT_BITMAP_BITS(bitmap)[point++]=pixel->green;


Index: autotrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- autotrace.spec	24 Feb 2009 03:33:00 -0000	1.21
+++ autotrace.spec	2 Mar 2009 12:21:34 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        19%{?dist}
+Release:        20%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -20,6 +20,8 @@
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
+Patch0:         autotrace-0.31.1-GetOnePixel.patch
+
 %description
 AutoTrace is a program similar to CorelTrace or Adobe Streamline for
 converting bitmaps to vector graphics.
@@ -43,7 +45,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .GetOnePixel
 
 %build
 %configure
@@ -86,6 +88,9 @@
 
 
 %changelog
+* Mon Mar 02 2009 Caolán McNamara <caolanm at redhat.com> - 0.31.1-20
+- Modify GetOnePixel usage to build against current ImageMagick api
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31.1-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild