summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakamoto <sakamoto@pkgsrc.org>2000-08-30 16:13:12 +0000
committersakamoto <sakamoto@pkgsrc.org>2000-08-30 16:13:12 +0000
commit1b5c36b2fc29315a2a25469b40721f071ed1089a (patch)
tree26c5eb20c6034f295529771d9df3279cd8af4a1c
parent293d05e6f82a916e45a239aa13af24c6a5babc2f (diff)
downloadpkgsrc-1b5c36b2fc29315a2a25469b40721f071ed1089a.tar.gz
API of ImageMagick changed(s/CreateImage/ConstituteImage/).
-rw-r--r--converters/psiconv/Makefile4
-rw-r--r--converters/psiconv/files/patch-sum4
-rw-r--r--converters/psiconv/patches/patch-ad7
3 files changed, 8 insertions, 7 deletions
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index b73e3be40cd..b357d390ff9 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/08 15:21:05 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/30 16:13:12 sakamoto Exp $
#
DISTNAME= psiconv-0.6.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://huizen.dds.nl/~frodol/psiconv/
DEPENDS+= libgetopt-[0-9]*:../../devel/libgetopt
LIBS= -lgetopt
.endif
-DEPENDS+= ImageMagick-*:../../graphics/ImageMagick
+DEPENDS+= ImageMagick>=5.2.2:../../graphics/ImageMagick
MAGICK_CONFIG= ${LOCALBASE}/bin/Magick-config
diff --git a/converters/psiconv/files/patch-sum b/converters/psiconv/files/patch-sum
index 330d0865b40..701ea07cde3 100644
--- a/converters/psiconv/files/patch-sum
+++ b/converters/psiconv/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/07/08 15:22:31 sakamoto Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/30 16:13:12 sakamoto Exp $
MD5 (patch-aa) = 23f3cbab1ce7b131bec872f5ae5240f4
MD5 (patch-ab) = 5372b58da6a1ff32909e989e8f83f19b
MD5 (patch-ac) = 33e9d2066f929bde5e18efef161ae40a
-MD5 (patch-ad) = bc5ab4cbd3332c332a4bd96100f21d39
+MD5 (patch-ad) = f43b4734e235e89b3b85509311fb4ff9
diff --git a/converters/psiconv/patches/patch-ad b/converters/psiconv/patches/patch-ad
index 213368f0278..f459eab0be1 100644
--- a/converters/psiconv/patches/patch-ad
+++ b/converters/psiconv/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/07/08 15:22:32 sakamoto Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/30 16:13:13 sakamoto Exp $
--- psiconv/gen_image.c.orig Sat Dec 4 09:46:15 1999
+++ psiconv/gen_image.c Sat Jul 8 18:49:11 2000
-@@ -33,8 +33,23 @@
+@@ -33,8 +33,24 @@
static Image *get_paint_data_section(psiconv_paint_data_section sec)
{
Image *image;
@@ -10,6 +10,7 @@ $NetBSD: patch-ad,v 1.1 2000/07/08 15:22:32 sakamoto Exp $
- sec->blue,NULL);
+ float *pixel, *p, *red, *green, *blue;
+ int x,y;
++ ExceptionInfo exception;
+
+ red = sec->red;
+ green = sec->green;
@@ -22,7 +23,7 @@ $NetBSD: patch-ad,v 1.1 2000/07/08 15:22:32 sakamoto Exp $
+ *p++ = *blue++;
+ }
+ }
-+ image = CreateImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel);
++ image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exception);
+ free(pixel);
+
return image;