adapt AcquireOnePixel usage for current ImageMagick api

This commit is contained in:
Caolan McNamara 2009-03-05 16:41:40 +00:00
parent c0584c7bf3
commit 44d718a879
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,21 @@
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)));
}

8
q.spec
View File

@ -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 @@ BuildRequires: zlib-devel
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 @@ Requires: libtool
%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 @@ fi
%changelog
* Thu Mar 05 2009 Caolán McNamara <caolanm@redhat.com> - 7.11-4
- adapt AcquireOnePixel usage for current ImageMagick api
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild