summaryrefslogtreecommitdiff
path: root/graphics/pixieplus
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/pixieplus')
-rw-r--r--graphics/pixieplus/DESCR13
-rw-r--r--graphics/pixieplus/Makefile32
-rw-r--r--graphics/pixieplus/PLIST235
-rw-r--r--graphics/pixieplus/distinfo19
-rw-r--r--graphics/pixieplus/patches/patch-aa652
-rw-r--r--graphics/pixieplus/patches/patch-ab56
-rw-r--r--graphics/pixieplus/patches/patch-ac27
-rw-r--r--graphics/pixieplus/patches/patch-ad43
-rw-r--r--graphics/pixieplus/patches/patch-ae13
-rw-r--r--graphics/pixieplus/patches/patch-af13
-rw-r--r--graphics/pixieplus/patches/patch-ag17
-rw-r--r--graphics/pixieplus/patches/patch-ah13
-rw-r--r--graphics/pixieplus/patches/patch-ai13
-rw-r--r--graphics/pixieplus/patches/patch-aj13
-rw-r--r--graphics/pixieplus/patches/patch-ak16
-rw-r--r--graphics/pixieplus/patches/patch-al13
-rw-r--r--graphics/pixieplus/patches/patch-am13
-rw-r--r--graphics/pixieplus/patches/patch-an14
18 files changed, 0 insertions, 1215 deletions
diff --git a/graphics/pixieplus/DESCR b/graphics/pixieplus/DESCR
deleted file mode 100644
index dd3cba4ed9c..00000000000
--- a/graphics/pixieplus/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-PixiePlus is a free, fast, and feature packed image browser, viewer, and
-image/photo editor for Unix/X11 systems that run KDE.
-
-Features:
-- Fast, flexible thumbnail preview generation
-- Embedded JPEG and TIFF thumbnail support
-- Lossless JPEG transformations
-- Supports many image formats
-- Highly configurable HTML export
-- Batch conversion and effects
-- Animated slideshows
-- Similiar image finding
-- File management optimized for images
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
deleted file mode 100644
index 9e1a9216bfc..00000000000
--- a/graphics/pixieplus/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2011/01/13 13:38:14 wiz Exp $
-#
-
-DISTNAME= pixieplus-0.5.4
-PKGREVISION= 28
-CATEGORIES= graphics
-MASTER_SITES= http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mosfet.org/pixie/
-COMMENT= Free, fast, and feature packed image browser for KDE
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.ImageMagick}/include/ImageMagick
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/kdegraphics3/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pixieplus/PLIST b/graphics/pixieplus/PLIST
deleted file mode 100644
index 4fa91943f88..00000000000
--- a/graphics/pixieplus/PLIST
+++ /dev/null
@@ -1,235 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:59:24 joerg Exp $
-bin/pixie
-lib/libpixie_misc.la
-lib/pixie.la
-share/icons/hicolor/16x16/actions/backimage.png
-share/icons/hicolor/16x16/actions/brightness.png
-share/icons/hicolor/16x16/actions/catagory.png
-share/icons/hicolor/16x16/actions/contrast+.png
-share/icons/hicolor/16x16/actions/contrast-.png
-share/icons/hicolor/16x16/actions/dim.png
-share/icons/hicolor/16x16/actions/forwardimage.png
-share/icons/hicolor/16x16/actions/hotlistadd.png
-share/icons/hicolor/16x16/actions/hotlistdel.png
-share/icons/hicolor/16x16/actions/nextfilelist.png
-share/icons/hicolor/16x16/actions/prevfilelist.png
-share/icons/hicolor/16x16/actions/thumb.png
-share/icons/hicolor/16x16/apps/pixie.png
-share/icons/hicolor/22x22/actions/catagory.png
-share/icons/hicolor/22x22/actions/thumb.png
-share/icons/hicolor/32x32/actions/catagory.png
-share/icons/hicolor/32x32/actions/thumb.png
-share/icons/hicolor/32x32/actions/window_new.png
-share/icons/hicolor/32x32/apps/pixie.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/locolor/16x16/actions/hotlistadd.png
-share/icons/locolor/16x16/actions/hotlistdel.png
-share/icons/locolor/16x16/actions/thumb.png
-share/icons/locolor/16x16/apps/ray.png
-share/icons/locolor/16x16/apps/run.png
-share/icons/locolor/22x22/actions/thumb.png
-share/icons/locolor/32x32/actions/thumb.png
-share/kde/applnk/Graphics/pixie-mini.desktop
-share/kde/applnk/Graphics/pixie.desktop
-share/kde/apps/konqueror/servicemenus/konqPixie.desktop
-share/kde/apps/pixie/doc/en/addtext.jpg
-share/kde/apps/pixie/doc/en/back.png
-share/kde/apps/pixie/doc/en/basic/basic.html
-share/kde/apps/pixie/doc/en/basic/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_back.png
-share/kde/apps/pixie/doc/en/basic/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_forward.png
-share/kde/apps/pixie/doc/en/basic/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_gohome.png
-share/kde/apps/pixie/doc/en/basic/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/basic/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_stop.png
-share/kde/apps/pixie/doc/en/basic/thb_thumb.png
-share/kde/apps/pixie/doc/en/basic/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_up.png
-share/kde/apps/pixie/doc/en/batch.html
-share/kde/apps/pixie/doc/en/borders.jpg
-share/kde/apps/pixie/doc/en/browser.jpg
-share/kde/apps/pixie/doc/en/catagoryadd.jpg
-share/kde/apps/pixie/doc/en/catagoryselect.jpg
-share/kde/apps/pixie/doc/en/categories.html
-share/kde/apps/pixie/doc/en/comparison.html
-share/kde/apps/pixie/doc/en/comparison.jpg
-share/kde/apps/pixie/doc/en/contents.html
-share/kde/apps/pixie/doc/en/convert.html
-share/kde/apps/pixie/doc/en/embedthumbnail.jpg
-share/kde/apps/pixie/doc/en/filelist.html
-share/kde/apps/pixie/doc/en/filelist.jpg
-share/kde/apps/pixie/doc/en/format.jpg
-share/kde/apps/pixie/doc/en/forward.png
-share/kde/apps/pixie/doc/en/framed/framed.html
-share/kde/apps/pixie/doc/en/framed/framed2.html
-share/kde/apps/pixie/doc/en/framed/framed3.html
-share/kde/apps/pixie/doc/en/framed/framed4.html
-share/kde/apps/pixie/doc/en/framed/framed5.html
-share/kde/apps/pixie/doc/en/framed/framed6.html
-share/kde/apps/pixie/doc/en/framed/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_back.png
-share/kde/apps/pixie/doc/en/framed/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_forward.png
-share/kde/apps/pixie/doc/en/framed/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_gohome.png
-share/kde/apps/pixie/doc/en/framed/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/framed/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_stop.png
-share/kde/apps/pixie/doc/en/framed/thb_thumb.png
-share/kde/apps/pixie/doc/en/framed/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_up.png
-share/kde/apps/pixie/doc/en/fullscreentb.jpg
-share/kde/apps/pixie/doc/en/galleryexample.html
-share/kde/apps/pixie/doc/en/gohome.png
-share/kde/apps/pixie/doc/en/grayscalepreview.jpg
-share/kde/apps/pixie/doc/en/hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/hotlist.html
-share/kde/apps/pixie/doc/en/hotlist.jpg
-share/kde/apps/pixie/doc/en/html1.jpg
-share/kde/apps/pixie/doc/en/html2.jpg
-share/kde/apps/pixie/doc/en/html3.jpg
-share/kde/apps/pixie/doc/en/html4.jpg
-share/kde/apps/pixie/doc/en/html5.jpg
-share/kde/apps/pixie/doc/en/html6.jpg
-share/kde/apps/pixie/doc/en/html7.jpg
-share/kde/apps/pixie/doc/en/html8.jpg
-share/kde/apps/pixie/doc/en/htmlexport.html
-share/kde/apps/pixie/doc/en/htmllogo.jpg
-share/kde/apps/pixie/doc/en/index.html
-share/kde/apps/pixie/doc/en/layout.html
-share/kde/apps/pixie/doc/en/layout2.jpg
-share/kde/apps/pixie/doc/en/liquid/liquid.html
-share/kde/apps/pixie/doc/en/liquid/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_back.png
-share/kde/apps/pixie/doc/en/liquid/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_forward.png
-share/kde/apps/pixie/doc/en/liquid/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_gohome.png
-share/kde/apps/pixie/doc/en/liquid/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/liquid/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_stop.png
-share/kde/apps/pixie/doc/en/liquid/thb_thumb.png
-share/kde/apps/pixie/doc/en/liquid/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_up.png
-share/kde/apps/pixie/doc/en/list/list.html
-share/kde/apps/pixie/doc/en/list/list2.html
-share/kde/apps/pixie/doc/en/list/list3.html
-share/kde/apps/pixie/doc/en/lowquality.jpg
-share/kde/apps/pixie/doc/en/navigate.html
-share/kde/apps/pixie/doc/en/noembedthumbnail.jpg
-share/kde/apps/pixie/doc/en/nothumb.jpg
-share/kde/apps/pixie/doc/en/pixielogo.jpg
-share/kde/apps/pixie/doc/en/previewoptions.html
-share/kde/apps/pixie/doc/en/rightclick.html
-share/kde/apps/pixie/doc/en/roundcorner/roundcorner.html
-share/kde/apps/pixie/doc/en/roundcorner/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_back.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_forward.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_gohome.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_stop.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_thumb.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_up.png
-share/kde/apps/pixie/doc/en/scale.jpg
-share/kde/apps/pixie/doc/en/screenshot.html
-share/kde/apps/pixie/doc/en/screenshot.jpg
-share/kde/apps/pixie/doc/en/similarprogress.jpg
-share/kde/apps/pixie/doc/en/slideshow.html
-share/kde/apps/pixie/doc/en/slideshow.jpg
-share/kde/apps/pixie/doc/en/stop.png
-share/kde/apps/pixie/doc/en/thumb.png
-share/kde/apps/pixie/doc/en/thumbnailed.jpg
-share/kde/apps/pixie/doc/en/tooltip.jpg
-share/kde/apps/pixie/doc/en/up.png
-share/kde/apps/pixie/doc/en/viewingimages.html
-share/kde/apps/pixie/doc/en/viewingthumbnails.html
-share/kde/apps/pixie/pixielogo.jpg
-share/kde/apps/pixie/toolbar/kwin.png
-share/kde/apps/pixie/toolbar/mini-ray.png
-share/kde/apps/pixie/toolbar/mini-run.png
-share/kde/mimelnk/image/x-miff.desktop
-share/kde/mimelnk/image/x-pict.desktop
-share/kde/mimelnk/image/x-tga.desktop
-share/kde/mimelnk/image/x-xwd.desktop
diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
deleted file mode 100644
index c8f41313cef..00000000000
--- a/graphics/pixieplus/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/06/21 21:00:49 joerg Exp $
-
-SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5
-RMD160 (pixieplus-0.5.4.tar.gz) = 73c164e8bd66f045c09b9396e2ce777d6daca363
-Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes
-SHA1 (patch-aa) = e9383e025b871ce6629f5924eec3f2bf305c0df4
-SHA1 (patch-ab) = 8b8530ad5d0827504947d9c798efda2e11e0f415
-SHA1 (patch-ac) = 38824b02aba0695e025fe3995f31bc376dd44518
-SHA1 (patch-ad) = fea08f39973b532be38b758ce697ac139c708bd3
-SHA1 (patch-ae) = e9d4ca1bede5f07d79d2d6a5bc5b2d97f298a93f
-SHA1 (patch-af) = 42b4d4dfef5c286ae703ed6b4ce7813865142bf1
-SHA1 (patch-ag) = d3ab5cf53d4ad22b08e14dc4d0e763d1ea962159
-SHA1 (patch-ah) = a06fe1e575892283441c8399b95c5d8b314d3af7
-SHA1 (patch-ai) = 143a146e0e8544f9fa95c7a2d7ebdc08ee1855ab
-SHA1 (patch-aj) = 84d0813e3d1a90aad583efa5f018a2fccf6a2f10
-SHA1 (patch-ak) = d1f5dd591396c6cdcc1a54297875424fb9883995
-SHA1 (patch-al) = f0239380ce03e3d9d83b6905e8bebfbfbded9849
-SHA1 (patch-am) = 0333d1c6d7476c5da6fb30c2aee957427f3973e4
-SHA1 (patch-an) = 0d0f560fe4c23857f3c816324b52f7ed8e882527
diff --git a/graphics/pixieplus/patches/patch-aa b/graphics/pixieplus/patches/patch-aa
deleted file mode 100644
index 98bfb693c15..00000000000
--- a/graphics/pixieplus/patches/patch-aa
+++ /dev/null
@@ -1,652 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/12/14 12:16:43 markd Exp $
-
---- app/compressedgif.cpp.orig 2003-02-09 17:56:50.000000000 +1300
-+++ app/compressedgif.cpp
-@@ -9,6 +9,51 @@
- #include <api.h>
- #include <assert.h>
-
-+/* from <magick/{blob,exception,image}_private.h> */
-+extern "C" {
-+
-+typedef enum
-+{
-+ UndefinedBlobMode,
-+ ReadBlobMode,
-+ ReadBinaryBlobMode,
-+ WriteBlobMode,
-+ WriteBinaryBlobMode,
-+ IOBinaryBlobMode
-+} BlobMode;
-+
-+extern MagickExport MagickBooleanType
-+ OpenBlob(const ImageInfo *,Image *,const BlobMode,ExceptionInfo *);
-+
-+extern MagickExport ssize_t
-+ WriteBlob(Image *,const size_t,const unsigned char *),
-+ WriteBlobByte(Image *,const unsigned char),
-+ WriteBlobLSBShort(Image *,const unsigned short);
-+
-+extern MagickExport void
-+ CloseBlob(Image *);
-+
-+
-+extern MagickExport const char
-+ *SaveImageTag,
-+ *SaveImagesTag;
-+
-+}
-+
-+#define ThrowWriterException(severity,tag) \
-+{ \
-+ assert(image != (Image *) NULL); \
-+ (void) ThrowMagickException(&image->exception,GetMagickModule(),severity, \
-+ tag,image->filename); \
-+ if (image_info->adjoin != MagickFalse) \
-+ while (image->previous != (Image *) NULL) \
-+ image=image->previous; \
-+ CloseBlob(image); \
-+ return(MagickFalse); \
-+}
-+
-+/* end of defns from <magick/{blob,exception,image}_private.h> */
-+
- #ifndef False
- #define False 0
- #endif
-@@ -40,31 +85,31 @@ unsigned int EncodeCompressedGIFImage(co
- Image *image,
- const unsigned int data_size)
- {
--#define MaxCode(number_bits) ((1 << (number_bits))-1)
-+#define MaxCode(number_bits) ((1UL << (number_bits))-1)
- #define MaxHashTable 5003
--#define MaxGIFBits 12
--#define MaxGIFTable (1 << MaxGIFBits)
-+#define MaxGIFBits 12UL
-+#define MaxGIFTable (1UL << MaxGIFBits)
- #define GIFOutputCode(code) \
- { \
- /* \
- Emit a code. \
- */ \
- if (bits > 0) \
-- datum|=((long) code << bits); \
-+ datum|=(code) << bits; \
- else \
-- datum=(long) code; \
-+ datum=code; \
- bits+=number_bits; \
- while (bits >= 8) \
- { \
- /* \
- Add a character to current packet. \
- */ \
-- packet[byte_count++]=(unsigned char) (datum & 0xff); \
-- if (byte_count >= 254) \
-+ packet[length++]=(unsigned char) (datum & 0xff); \
-+ if (length >= 254) \
- { \
-- (void) WriteBlobByte(image,byte_count); \
-- (void) WriteBlob(image,byte_count,(char *) packet); \
-- byte_count=0; \
-+ (void) WriteBlobByte(image,(unsigned char) length); \
-+ (void) WriteBlob(image,length,packet); \
-+ length=0; \
- } \
- datum>>=8; \
- bits-=8; \
-@@ -79,18 +124,14 @@ unsigned int EncodeCompressedGIFImage(co
- } \
- }
-
-- int
-- displacement,
-- next_pixel,
-- bits,
-- byte_count,
-- k,
-- number_bits,
-- offset,
-- pass;
-+
-+ IndexPacket
-+ index;
-
- long
-- datum,
-+ displacement,
-+ offset,
-+ k,
- y;
-
- register const PixelPacket
-@@ -103,28 +144,40 @@ unsigned int EncodeCompressedGIFImage(co
- i,
- x;
-
-+ size_t
-+ length;
-+
- short
-- clear_code,
-- end_of_information_code,
-- free_code,
- *hash_code,
- *hash_prefix,
-- index,
-- max_code,
- waiting_code;
-
- unsigned char
- *packet,
- *hash_suffix;
-
-+ unsigned int
-+ status;
-+
-+ unsigned long
-+ bits,
-+ clear_code,
-+ datum,
-+ end_of_information_code,
-+ free_code,
-+ max_code,
-+ next_pixel,
-+ number_bits,
-+ pass;
-+
- /*
- Allocate encoder tables.
- */
- assert(image != (Image *) NULL);
-- packet=(unsigned char *) AcquireMemory(256);
-- hash_code=(short *) AcquireMemory(MaxHashTable*sizeof(short));
-- hash_prefix=(short *) AcquireMemory(MaxHashTable*sizeof(short));
-- hash_suffix=(unsigned char *) AcquireMemory(MaxHashTable);
-+ packet=(unsigned char *) AcquireMagickMemory(256);
-+ hash_code=(short *) AcquireMagickMemory(MaxHashTable*sizeof(short));
-+ hash_prefix=(short *) AcquireMagickMemory(MaxHashTable*sizeof(short));
-+ hash_suffix=(unsigned char *) AcquireMagickMemory(MaxHashTable);
- if ((packet == (unsigned char *) NULL) || (hash_code == (short *) NULL) ||
- (hash_prefix == (short *) NULL) ||
- (hash_suffix == (unsigned char *) NULL))
-@@ -137,7 +190,7 @@ unsigned int EncodeCompressedGIFImage(co
- clear_code=((short) 1 << (data_size-1));
- end_of_information_code=clear_code+1;
- free_code=clear_code+2;
-- byte_count=0;
-+ length=0;
- datum=0;
- bits=0;
- for (i=0; i < MaxHashTable; i++)
-@@ -156,7 +209,7 @@ unsigned int EncodeCompressedGIFImage(co
- break;
- indexes=GetIndexes(image);
- if (y == 0)
-- waiting_code=(*indexes);
-+ waiting_code=(short) (*indexes);
- for (x=(y == 0) ? 1 : 0; x < (long) image->columns; x++)
- {
- /*
-@@ -164,14 +217,15 @@ unsigned int EncodeCompressedGIFImage(co
- */
- index=indexes[x] & 0xff;
- p++;
-- k=(int) ((int) index << (MaxGIFBits-8))+waiting_code;
-+ k=(int) (index << (MaxGIFBits-8))+waiting_code;
- if (k >= MaxHashTable)
- k-=MaxHashTable;
- next_pixel=false;
- displacement=1;
- if ((image_info->compression != NoCompression) && (hash_code[k] > 0))
- {
-- if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
-+ if ((hash_prefix[k] == waiting_code) &&
-+ (hash_suffix[k] == (unsigned char) index))
- {
- waiting_code=hash_code[k];
- continue;
-@@ -185,7 +239,8 @@ unsigned int EncodeCompressedGIFImage(co
- k+=MaxHashTable;
- if (hash_code[k] == 0)
- break;
-- if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
-+ if ((hash_prefix[k] == waiting_code) &&
-+ (hash_suffix[k] == (unsigned char) index))
- {
- waiting_code=hash_code[k];
- next_pixel=true;
-@@ -195,10 +250,10 @@ unsigned int EncodeCompressedGIFImage(co
- if (next_pixel == true)
- continue;
- }
-- GIFOutputCode(waiting_code);
-+ GIFOutputCode((unsigned long) waiting_code);
- if (free_code < MaxGIFTable)
- {
-- hash_code[k]=free_code++;
-+ hash_code[k]=(short) free_code++;
- hash_prefix[k]=waiting_code;
- hash_suffix[k]=(unsigned char) index;
- }
-@@ -217,7 +272,7 @@ unsigned int EncodeCompressedGIFImage(co
- number_bits=data_size;
- max_code=MaxCode(number_bits);
- }
-- waiting_code=index;
-+ waiting_code=(short) index;
- }
- if (image_info->interlace == NoInterlace)
- offset++;
-@@ -263,42 +318,45 @@ unsigned int EncodeCompressedGIFImage(co
- }
- if (image->previous == (Image *) NULL)
- if (QuantumTick(y,image->rows))
-- if (!MagickMonitor(SaveImageTag,y,image->rows,&image->exception))
-- break;
-+ {
-+ status=MagickMonitor(SaveImageTag,y,image->rows,&image->exception);
-+ if (status == false)
-+ break;
-+ }
- }
- /*
- Flush out the buffered code.
- */
-- GIFOutputCode(waiting_code);
-+ GIFOutputCode((unsigned long) waiting_code);
- GIFOutputCode(end_of_information_code);
- if (bits > 0)
- {
- /*
- Add a character to current packet.
- */
-- packet[byte_count++]=(unsigned char) (datum & 0xff);
-- if (byte_count >= 254)
-+ packet[length++]=(unsigned char) (datum & 0xff);
-+ if (length >= 254)
- {
-- (void) WriteBlobByte(image,byte_count);
-- (void) WriteBlob(image,byte_count,(char *) packet);
-- byte_count=0;
-+ (void) WriteBlobByte(image,(unsigned char) length);
-+ (void) WriteBlob(image,length,packet);
-+ length=0;
- }
- }
- /*
- Flush accumulated data.
- */
-- if (byte_count > 0)
-+ if (length > 0)
- {
-- (void) WriteBlobByte(image,byte_count);
-- (void) WriteBlob(image,byte_count,(char *) packet);
-+ (void) WriteBlobByte(image,(unsigned char) length);
-+ (void) WriteBlob(image,length,packet);
- }
- /*
- Free encoder memory.
- */
-- LiberateMemory((void **) &hash_suffix);
-- LiberateMemory((void **) &hash_prefix);
-- LiberateMemory((void **) &hash_code);
-- LiberateMemory((void **) &packet);
-+ hash_suffix=(unsigned char *) RelinquishMagickMemory(hash_suffix);
-+ hash_prefix=(short *) RelinquishMagickMemory(hash_prefix);
-+ hash_code=(short *) RelinquishMagickMemory(hash_code);
-+ packet=(unsigned char *) RelinquishMagickMemory(packet);
- return(true);
- }
-
-@@ -308,10 +366,15 @@ unsigned int WriteCompressedGIFImage(con
- *next_image;
-
- int
-+ c;
-+
-+ long
-+ j,
-+ opacity,
- y;
-
-- long
-- opacity;
-+ MagickOffsetType
-+ scene;
-
- QuantizeInfo
- quantize_info;
-@@ -335,11 +398,9 @@ unsigned int WriteCompressedGIFImage(con
- *q;
-
- size_t
-- j;
-+ length;
-
- unsigned char
-- bits_per_pixel,
-- c,
- *colormap,
- *global_colormap;
-
-@@ -348,7 +409,7 @@ unsigned int WriteCompressedGIFImage(con
- status;
-
- unsigned long
-- scene;
-+ bits_per_pixel;
-
- /*
- Open output image file.
-@@ -357,9 +418,11 @@ unsigned int WriteCompressedGIFImage(con
- assert(image_info->signature == MagickSignature);
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
-+ if (image->debug != false)
-+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename);
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
- if (status == false)
-- ThrowWriterException(FileOpenError,"Unable to open file",image);
-+ return(status);
- /*
- Determine image bounding box.
- */
-@@ -380,37 +443,36 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Allocate colormap.
- */
-- global_colormap=(unsigned char *) AcquireMemory(768);
-- colormap=(unsigned char *) AcquireMemory(768);
-+ global_colormap=(unsigned char *) AcquireMagickMemory(768);
-+ colormap=(unsigned char *) AcquireMagickMemory(768);
- if ((global_colormap == (unsigned char *) NULL) ||
- (colormap == (unsigned char *) NULL))
-- ThrowWriterException(ResourceLimitError,"Memory allocation failed",image);
-+ ThrowWriterException(ResourceLimitError,"Memory allocation failed");
- for (i=0; i < 768; i++)
-- colormap[i]=0;
-+ colormap[i]=(unsigned char) 0;
- /*
- Write GIF header.
- */
- if ((GetImageAttribute(image,"comment") == (ImageAttribute *) NULL) &&
-- !image_info->adjoin && !image->matte)
-- (void) WriteBlob(image,6,"GIF87a");
-+ (image_info->adjoin == false) && (image->matte == false))
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF87a");
- else
- if (LocaleCompare(image_info->magick,"GIF87") == 0)
-- (void) WriteBlob(image,6,"GIF87a");
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF87a");
- else
-- (void) WriteBlob(image,6,"GIF89a");
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF89a");
- page.x=image->page.x;
- page.y=image->page.y;
- if ((image->page.width != 0) && (image->page.height != 0))
- page=image->page;
-- (void) WriteBlobLSBShort(image,page.width);
-- (void) WriteBlobLSBShort(image,page.height);
-+ (void) WriteBlobLSBShort(image,(unsigned short) page.width);
-+ (void) WriteBlobLSBShort(image,(unsigned short) page.height);
- /*
- Write images to file.
- */
- interlace=image_info->interlace;
-- if (image_info->adjoin && (image->next != (Image *) NULL))
-+ if ((image_info->adjoin != false) && (image->next != (Image *) NULL))
- interlace=NoInterlace;
-- opacity=(-1);
- scene=0;
- do
- {
-@@ -422,22 +484,24 @@ unsigned int WriteCompressedGIFImage(con
- */
- GetQuantizeInfo(&quantize_info);
- quantize_info.dither=image_info->dither;
-- quantize_info.number_colors=image->matte ? 255 : 256;
-+ quantize_info.number_colors=(unsigned long)
-+ (image->matte != false ? 255 : 256);
- (void) QuantizeImage(&quantize_info,image);
-- if (image->matte)
-+ if (image->matte != false)
- {
- /*
- Set transparent pixel.
- */
- opacity=(long) image->colors++;
-- ReacquireMemory((void **) &image->colormap,
-- image->colors*sizeof(PixelPacket));
-+ image->colormap=(PixelPacket *) ResizeMagickMemory(image->colormap,
-+ (size_t) image->colors*sizeof(PixelPacket));
- if (image->colormap == (PixelPacket *) NULL)
- {
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-+ global_colormap=(unsigned char *)
-+ RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
- ThrowWriterException(ResourceLimitError,
-- "Memory allocation failed",image)
-+ "Memory allocation failed")
- }
- image->colormap[opacity]=image->background_color;
- for (y=0; y < (long) image->rows; y++)
-@@ -449,17 +513,17 @@ unsigned int WriteCompressedGIFImage(con
- indexes=GetIndexes(image);
- for (x=0; x < (long) image->columns; x++)
- {
-- if (p->opacity == TransparentOpacity)
-+ if ((double) p->opacity > image->fuzz)
- indexes[x]=(IndexPacket) opacity;
- p++;
- }
-- if (!SyncImagePixels(image))
-+ if (SyncImagePixels(image) == false)
- break;
- }
- }
- }
- else
-- if (image->matte)
-+ if (image->matte != false)
- {
- /*
- Identify transparent pixel index.
-@@ -472,7 +536,7 @@ unsigned int WriteCompressedGIFImage(con
- indexes=GetIndexes(image);
- for (x=0; x < (long) image->columns; x++)
- {
-- if (p->opacity == TransparentOpacity)
-+ if ((double) p->opacity > image->fuzz)
- {
- opacity=(long) indexes[x];
- break;
-@@ -495,13 +559,13 @@ unsigned int WriteCompressedGIFImage(con
- *q++=ScaleQuantumToChar(image->colormap[i].green);
- *q++=ScaleQuantumToChar(image->colormap[i].blue);
- }
-- for ( ; i < (1L << bits_per_pixel); i++)
-+ for ( ; i < (long) (1UL << bits_per_pixel); i++)
- {
-- *q++=(Quantum) 0x0;
-- *q++=(Quantum) 0x0;
-- *q++=(Quantum) 0x0;
-+ *q++=(unsigned char) 0x0;
-+ *q++=(unsigned char) 0x0;
-+ *q++=(unsigned char) 0x0;
- }
-- if ((image->previous == (Image *) NULL) || !image_info->adjoin)
-+ if ((image->previous == (Image *) NULL) || (image_info->adjoin == false))
- {
- /*
- Write global colormap.
-@@ -509,13 +573,14 @@ unsigned int WriteCompressedGIFImage(con
- c=0x80;
- c|=(8-1) << 4; /* color resolution */
- c|=(bits_per_pixel-1); /* size of global colormap */
-- (void) WriteBlobByte(image,c);
-- for (j=0; j < Max(image->colors-1,1); j++)
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ for (j=0; j < (long) Max(image->colors-1,1); j++)
- if (FuzzyColorMatch(&image->background_color,image->colormap+j,0))
- break;
-- (void) WriteBlobByte(image,(long) j); /* background color */
-- (void) WriteBlobByte(image,0x0); /* reserved */
-- (void) WriteBlob(image,3*(1 << bits_per_pixel),(char *) colormap);
-+ (void) WriteBlobByte(image,(unsigned char) j); /* background color */
-+ (void) WriteBlobByte(image,(unsigned char) 0x0); /* reserved */
-+ length=(size_t) (3*(1 << bits_per_pixel));
-+ (void) WriteBlob(image,length,colormap);
- for (j=0; j < 768; j++)
- global_colormap[j]=colormap[j];
- }
-@@ -524,16 +589,17 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Graphics Control extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xf9);
-- (void) WriteBlobByte(image,0x04);
-- c=(unsigned char) ((int) image->dispose << 2);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xf9);
-+ (void) WriteBlobByte(image,(unsigned char) 0x04);
-+ c=((image->dispose) << 2);
- if (opacity >= 0)
- c|=0x01;
-- (void) WriteBlobByte(image,c);
-- (void) WriteBlobLSBShort(image,image->delay);
-- (void) WriteBlobByte(image,opacity >= 0 ? opacity : 0);
-- (void) WriteBlobByte(image,0x00);
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->delay);
-+ (void) WriteBlobByte(image,(unsigned char)
-+ (opacity >= 0 ? opacity : 0));
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- if (GetImageAttribute(image,"comment") != (ImageAttribute *) NULL)
- {
- const ImageAttribute
-@@ -548,18 +614,18 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Comment extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xfe);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xfe);
- attribute=GetImageAttribute(image,"comment");
- p=attribute->value;
- while (strlen(p) != 0)
- {
- count=Min(strlen(p),255);
-- (void) WriteBlobByte(image,(long) count);
-+ (void) WriteBlobByte(image,(unsigned char) count);
- for (i=0; i < (long) count; i++)
-- (void) WriteBlobByte(image,*p++);
-+ (void) WriteBlobByte(image,(unsigned char) *p++);
- }
-- (void) WriteBlobByte(image,0x0);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- }
- if ((image->previous == (Image *) NULL) &&
- (image->next != (Image *) NULL) && (image->iterations != 1))
-@@ -567,14 +633,14 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Netscape Loop extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xff);
-- (void) WriteBlobByte(image,0x0b);
-- (void) WriteBlob(image,11,"NETSCAPE2.0");
-- (void) WriteBlobByte(image,0x03);
-- (void) WriteBlobByte(image,0x01);
-- (void) WriteBlobLSBShort(image,image->iterations);
-- (void) WriteBlobByte(image,0x00);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xff);
-+ (void) WriteBlobByte(image,(unsigned char) 0x0b);
-+ (void) WriteBlob(image,11,(unsigned char *) "NETSCAPE2.0");
-+ (void) WriteBlobByte(image,(unsigned char) 0x03);
-+ (void) WriteBlobByte(image,(unsigned char) 0x01);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->iterations);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- }
- }
- (void) WriteBlobByte(image,','); /* image separator */
-@@ -585,51 +651,50 @@ unsigned int WriteCompressedGIFImage(con
- page.y=image->page.y;
- if ((image->page.width != 0) && (image->page.height != 0))
- page=image->page;
-- (void) WriteBlobLSBShort(image,page.x);
-- (void) WriteBlobLSBShort(image,page.y);
-- (void) WriteBlobLSBShort(image,image->columns);
-- (void) WriteBlobLSBShort(image,image->rows);
-+ (void) WriteBlobLSBShort(image,(unsigned short) (page.x < 0 ? 0 : page.x));
-+ (void) WriteBlobLSBShort(image,(unsigned short) (page.y < 0 ? 0 : page.y));
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->columns);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->rows);
- c=0x00;
- if (interlace != NoInterlace)
- c|=0x40; /* pixel data is interlaced */
-- for (j=0; j < (3*image->colors); j++)
-+ for (j=0; j < (long) (3*image->colors); j++)
- if (colormap[j] != global_colormap[j])
- break;
-- if (j == (3*image->colors))
-- (void) WriteBlobByte(image,c);
-+ if (j == (long) (3*image->colors))
-+ (void) WriteBlobByte(image,(unsigned char) c);
- else
- {
- c|=0x80;
- c|=(bits_per_pixel-1); /* size of local colormap */
-- (void) WriteBlobByte(image,c);
-- (void) WriteBlob(image,3*(1 << bits_per_pixel),(char *) colormap);
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ length=(size_t) (3*(1UL << bits_per_pixel));
-+ (void) WriteBlob(image,length,colormap);
- }
- /*
- Write the image data.
- */
-- c=Max(bits_per_pixel,2);
-- (void) WriteBlobByte(image,c);
-+ c=(int) Max(bits_per_pixel,2);
-+ (void) WriteBlobByte(image,(unsigned char) c);
- status=EncodeCompressedGIFImage(image_info,image,Max(bits_per_pixel,2)+1);
- if (status == false)
- {
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-- ThrowWriterException(ResourceLimitError,"Memory allocation failed",
-- image)
-+ global_colormap=(unsigned char *)
-+ RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
-+ ThrowWriterException(ResourceLimitError,"Memory allocation failed");
- }
-- (void) WriteBlobByte(image,0x0);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- if (image->next == (Image *) NULL)
- break;
- image=GetNextImage(image);
-- if (!MagickMonitor(SaveImagesTag,scene++,GetImageListSize(image),&image->exception))
-+ status=MagickMonitor(SaveImagesTag,scene++,GetImageListSize(image),&image->exception);
-+ if (status == false)
- break;
-- } while (image_info->adjoin);
-+ } while (image_info->adjoin != false);
- (void) WriteBlobByte(image,';'); /* terminator */
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-- if (image_info->adjoin)
-- while (image->previous != (Image *) NULL)
-- image=image->previous;
-+ global_colormap=(unsigned char *) RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
- CloseBlob(image);
- return(true);
- }
diff --git a/graphics/pixieplus/patches/patch-ab b/graphics/pixieplus/patches/patch-ab
deleted file mode 100644
index 685e3aeaeeb..00000000000
--- a/graphics/pixieplus/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/06/15 13:24:44 markd Exp $
-
---- configure.orig 2004-06-16 00:41:14.000000000 +1200
-+++ configure
-@@ -21614,51 +21614,6 @@ echo "$as_me: error: Cannot find ImageMa
- { (exit 1); exit 1; }; }
- fi
-
--echo "$as_me:21617: checking for magick/resource.h" >&5
--echo $ECHO_N "checking for magick/resource.h... $ECHO_C" >&6
--if test "${ac_cv_header_magick_resource_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--#line 21623 "configure"
--#include "confdefs.h"
--#include <magick/resource.h>
--_ACEOF
--if { (eval echo "$as_me:21627: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- egrep -v '^ *\+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:21633: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_cv_header_magick_resource_h=yes
--else
-- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_header_magick_resource_h=no
--fi
--rm -f conftest.err conftest.$ac_ext
--fi
--echo "$as_me:21652: result: $ac_cv_header_magick_resource_h" >&5
--echo "${ECHO_T}$ac_cv_header_magick_resource_h" >&6
--if test $ac_cv_header_magick_resource_h = yes; then
-- :
--else
-- { { echo "$as_me:21657: error: Old ImageMagick headers found. You must have ImageMagick 5.5.0 or above. Read INSTALL.README!" >&5
--echo "$as_me: error: Old ImageMagick headers found. You must have ImageMagick 5.5.0 or above. Read INSTALL.README!" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
- MAGICKPREFIX=`Magick-config --prefix`
- echo ImageMagick prefix $MAGICKPREFIX
-
diff --git a/graphics/pixieplus/patches/patch-ac b/graphics/pixieplus/patches/patch-ac
deleted file mode 100644
index f5b76665b86..00000000000
--- a/graphics/pixieplus/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/09/11 12:11:53 markd Exp $
-
---- app/ifapp.cpp.orig 2003-02-09 17:56:50.000000000 +1300
-+++ app/ifapp.cpp
-@@ -33,18 +33,18 @@ int xioErrorHandler(Display *dpy);
-
- // ImageMagick message and progress stubs
- extern "C"{
-- unsigned int magickMonitor(const char *msg, const off_t value,
-- const size_t span, ExceptionInfo *)
-+ MagickBooleanType magickMonitor(const char *msg, const off_t value,
-+ const MagickSizeType span, ExceptionInfo *)
- {
- if(!appPtr)
-- return(true);
-+ return(MagickTrue);
- int val = (int)((((float)value)/((float)span))*100.0);
- if(appPtr->magickMessageProgress())
- appPtr->magickMessageProgress()->setValue(val);
- if(appPtr->magickMessageLabel())
- appPtr->magickMessageLabel()->setText(msg);
- appPtr->processEvents();
-- return(true);
-+ return(MagickTrue);
- }
-
- void magickWarning(const ExceptionType /*warning*/, const char *reason,
diff --git a/graphics/pixieplus/patches/patch-ad b/graphics/pixieplus/patches/patch-ad
deleted file mode 100644
index 3111b57f39e..00000000000
--- a/graphics/pixieplus/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/06/21 21:00:49 joerg Exp $
-
---- app/batch.cpp.orig 2003-02-09 04:56:49.000000000 +0000
-+++ app/batch.cpp
-@@ -196,7 +196,7 @@ frequency of the sine wave."), this);
- connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
- SLOT(reject()));
- layout->addWidget(bbox);
--};
-+}
-
- KIFShadeDialog::KIFShadeDialog(QWidget *parent, const char *name)
- : QDialog(parent, name, true)
-@@ -228,7 +228,7 @@ KIFShadeDialog::KIFShadeDialog(QWidget *
- connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
- SLOT(reject()));
- layout->addWidget(bbox);
--};
-+}
-
- KIFTextDialog::KIFTextDialog(QWidget *parent, const char *name)
- : QDialog(parent, name, true)
-@@ -618,9 +618,9 @@ bool BatchEffect::applyMagickEffect(cons
- else if(type == Equalize)
- EqualizeImage(img);
- else if(type == IncContrast)
-- ContrastImage(img, true);
-+ ContrastImage(img, MagickTrue);
- else if(type == DecContrast)
-- ContrastImage(img, false);
-+ ContrastImage(img, MagickFalse);
- else if(type == Solarize)
- SolarizeImage(img, weight);
- else if(type == Threshold)
-@@ -752,7 +752,7 @@ bool BatchEffect::applyMagickEffect(cons
- save = false;
- }
- else if(type == Shade){
-- Image *tmp = ShadeImage(img, useColor, a, e, &exception);
-+ Image *tmp = ShadeImage(img, useColor ? MagickTrue : MagickFalse, a, e, &exception);
- if(tmp){
- if(img->next)
- DestroyImageList(img);
diff --git a/graphics/pixieplus/patches/patch-ae b/graphics/pixieplus/patches/patch-ae
deleted file mode 100644
index e1aa9eccb05..00000000000
--- a/graphics/pixieplus/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/09/11 12:11:53 markd Exp $
-
---- mimetypes/Makefile.in.orig 2004-09-11 23:49:52.000000000 +1200
-+++ mimetypes/Makefile.in
-@@ -240,7 +240,7 @@ x_libraries = @x_libraries@
-
- datadir = $(kde_mimedir)/image
-
--data_DATA = x-pcx.desktop x-xwd.desktop x-miff.desktop x-tga.desktop \
-+data_DATA = x-xwd.desktop x-miff.desktop x-tga.desktop \
- x-pict.desktop
-
-
diff --git a/graphics/pixieplus/patches/patch-af b/graphics/pixieplus/patches/patch-af
deleted file mode 100644
index acd0089ec7d..00000000000
--- a/graphics/pixieplus/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/11/14 08:42:44 markd Exp $
-
---- app/imageheaders.cpp.orig 2005-11-14 20:44:06.000000000 +1300
-+++ app/imageheaders.cpp
-@@ -90,7 +90,7 @@ bool checkTIFFThumbnail(const char *file
- if(TIFFSetDirectory(t, thumbDir)){
- TIFFGetField(t, TIFFTAG_IMAGELENGTH, &height);
- img.create(minWidth, height, 32);
-- if(!TIFFReadRGBAImage(t, minWidth, height, (unsigned long*)
-+ if(!TIFFReadRGBAImage(t, minWidth, height, (uint32*)
- img.bits(), 0))
- img.reset();
- else{
diff --git a/graphics/pixieplus/patches/patch-ag b/graphics/pixieplus/patches/patch-ag
deleted file mode 100644
index d9feae4b53c..00000000000
--- a/graphics/pixieplus/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- misc/qxcfi.cpp.orig 2006-06-21 19:17:12.000000000 +0000
-+++ misc/qxcfi.cpp
-@@ -1342,7 +1342,11 @@ void XCFImageFormat::assignMaskBytes ( L
- bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
- QByteArray& bytes )
- {
-- xcf_io >> (Q_UINT32)type;
-+ {
-+ Q_UINT32 type_tmp = type;
-+ xcf_io >> type_tmp;
-+ type = (PropType)type_tmp;
-+ }
-
- if ( xcf_io.device()->status() != IO_Ok ) {
- qDebug( "XCF: read failure on property type" );
diff --git a/graphics/pixieplus/patches/patch-ah b/graphics/pixieplus/patches/patch-ah
deleted file mode 100644
index 7f68e41ce61..00000000000
--- a/graphics/pixieplus/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/batch.h.orig 2006-06-21 19:24:54.000000000 +0000
-+++ app/batch.h
-@@ -17,7 +17,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- class KProgress;
- class QLabel;
diff --git a/graphics/pixieplus/patches/patch-ai b/graphics/pixieplus/patches/patch-ai
deleted file mode 100644
index 70e3c349137..00000000000
--- a/graphics/pixieplus/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/ifapp.h.orig 2006-06-21 19:25:21.000000000 +0000
-+++ app/ifapp.h
-@@ -14,7 +14,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- class KIFFileList;
- class KIFImage;
diff --git a/graphics/pixieplus/patches/patch-aj b/graphics/pixieplus/patches/patch-aj
deleted file mode 100644
index 93ad8b8cc43..00000000000
--- a/graphics/pixieplus/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/screengrab.cpp.orig 2006-06-21 19:34:54.000000000 +0000
-+++ app/screengrab.cpp
-@@ -125,7 +125,7 @@ with your mouse."), this);
- while(inLoop)
- kapp->processEvents();
- delete this;
--};
-+}
-
- void KIFScreenGrab::slotCheckIfDelay()
- {
diff --git a/graphics/pixieplus/patches/patch-ak b/graphics/pixieplus/patches/patch-ak
deleted file mode 100644
index 239e7596eb7..00000000000
--- a/graphics/pixieplus/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/rightclick.cpp.orig 2006-06-21 19:41:04.000000000 +0000
-+++ app/rightclick.cpp
-@@ -220,9 +220,9 @@ void EditMenu::aboutToShowSlot()
- idx = -1;
- }
- if(idx != -1){
-- QStringList itemList(view->itemCatagories(&itemList[idx]));
-+ QStringList itemList2(view->itemCatagories(&itemList[idx]));
- for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
-- if(itemList.findIndex((*it)) == -1)
-+ if(itemList2.findIndex((*it)) == -1)
- addMnu->insertItem((*it), i);
- else
- delMnu->insertItem((*it), i+1000);
diff --git a/graphics/pixieplus/patches/patch-al b/graphics/pixieplus/patches/patch-al
deleted file mode 100644
index 05431e92742..00000000000
--- a/graphics/pixieplus/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/imageutils.cpp.orig 2006-06-21 19:49:46.000000000 +0000
-+++ app/imageutils.cpp
-@@ -23,7 +23,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- // in compressedgif.cpp
- unsigned int WriteCompressedGIFImage(const ImageInfo *image_info,
diff --git a/graphics/pixieplus/patches/patch-am b/graphics/pixieplus/patches/patch-am
deleted file mode 100644
index 728d59e7a52..00000000000
--- a/graphics/pixieplus/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/main.cpp.orig 2006-06-21 19:57:51.000000000 +0000
-+++ app/main.cpp
-@@ -21,7 +21,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
-
- /* Signal handlers. We install them for pretty much everything that can
diff --git a/graphics/pixieplus/patches/patch-an b/graphics/pixieplus/patches/patch-an
deleted file mode 100644
index 8666aa57e20..00000000000
--- a/graphics/pixieplus/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/browser.cpp.orig 2006-06-21 20:23:16.000000000 +0000
-+++ app/browser.cpp
-@@ -36,7 +36,9 @@
-
- #include <unistd.h>
- #include <sys/types.h>
-+extern "C" {
- #include <fnmatch.h>
-+}
- #include <fcntl.h>
- #include <unistd.h>
- #include <math.h>