rpms/q/devel q-7.11-AcquireOnePixel.patch, NONE, 1.1 q.spec, 1.15, 1.16

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	q.spec 
Added Files:
	q-7.11-AcquireOnePixel.patch 
Log Message:
adapt AcquireOnePixel usage for current ImageMagick api

q-7.11-AcquireOnePixel.patch:

--- NEW FILE q-7.11-AcquireOnePixel.patch ---
diff -ru q-7.11.orig/modules/magick/magick.c q-7.11/modules/magick/magick.c
--- q-7.11.orig/modules/magick/magick.c	2009-03-05 16:21:46.000000000 +0000
+++ q-7.11/modules/magick/magick.c	2009-03-05 16:24:48.000000000 +0000
@@ -2861,7 +2861,7 @@
     if (m2)
       set_pixels(&target, m2->v, 1, 1);
     else {
-      target = AcquireOnePixel(img, x, y, &exception);
+      AcquireOnePixel(img, x, y, &target, &exception);
       if (check_exception(&exception)) {
 	DestroyDrawInfo(draw_info);
 	return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg)));
@@ -2898,7 +2898,7 @@
     if (m2)
       set_pixels(&target, m2->v, 1, 1);
     else {
-      target = AcquireOnePixel(img, x, y, &exception);
+      AcquireOnePixel(img, x, y, &target, &exception);
       if (check_exception(&exception))
 	return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg)));
     }


Index: q.spec
===================================================================
RCS file: /cvs/pkgs/rpms/q/devel/q.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- q.spec	25 Feb 2009 17:10:51 -0000	1.15
+++ q.spec	5 Mar 2009 16:41:40 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		q
 Version: 	7.11
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
@@ -28,6 +28,8 @@
 Requires(post): /sbin/ldconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig /sbin/install-info
 
+Patch0: q-7.11-AcquireOnePixel.patch
+
 
 %description
 Q is a powerful and extensible functional programming language based
@@ -89,6 +91,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .AcquireOnePixel
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
 %define _use_internal_dependency_generator 0
@@ -192,6 +195,9 @@
 
 
 %changelog
+* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 7.11-4
+- adapt AcquireOnePixel usage for current ImageMagick api
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild