Fix build using latest ImageMagick.

Bump PKGREVISION.

3 files changed, 50 insertions, 32 deletions

diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 734916ddd7b..0691ce9d361 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:14:56 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/14 12:16:43 markd Exp $
 #
 
 DISTNAME=	pixieplus-0.5.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ \
 		http://www.mosfet.org/pixie/
diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
index 18c2c065080..34e027b7991 100644
--- a/graphics/pixieplus/distinfo
+++ b/graphics/pixieplus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/09/29 12:34:24 markd Exp $
+$NetBSD: distinfo,v 1.5 2004/12/14 12:16:43 markd Exp $
 
 SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5
 Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes
-SHA1 (patch-aa) = 812c78976c17c6dcff63b7e447526a196d1196aa
+SHA1 (patch-aa) = e9383e025b871ce6629f5924eec3f2bf305c0df4
 SHA1 (patch-ab) = 8b8530ad5d0827504947d9c798efda2e11e0f415
 SHA1 (patch-ac) = 38824b02aba0695e025fe3995f31bc376dd44518
 SHA1 (patch-ad) = 7deca58da1d8e181bf62c39f598f696584a1ed26
diff --git a/graphics/pixieplus/patches/patch-aa b/graphics/pixieplus/patches/patch-aa
index ad61dbb94a1..98bfb693c15 100644
--- a/graphics/pixieplus/patches/patch-aa
+++ b/graphics/pixieplus/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
+$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,33 @@
+@@ -9,6 +9,51 @@
  #include <api.h>
  #include <assert.h>
  
-+/* from <magick/blob_private.h> */
++/* from <magick/{blob,exception,image}_private.h> */
 +extern "C" {
 +
 +typedef enum
@@ -30,13 +30,31 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
 +extern MagickExport void
 +  CloseBlob(Image *);
 +
++
++extern MagickExport const char
++  *SaveImageTag,
++  *SaveImagesTag;
++
 +}
-+/* end of defns from <magick/blob_private.h> */
++
++#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 +67,31 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -40,31 +85,31 @@ unsigned int EncodeCompressedGIFImage(co
                                        Image *image,
                                        const unsigned int data_size)
  {
@@ -78,7 +96,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
        } \
      datum>>=8; \
      bits-=8; \
-@@ -79,18 +106,14 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -79,18 +124,14 @@ unsigned int EncodeCompressedGIFImage(co
      } \
  }
  
@@ -103,7 +121,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
      y;
  
    register const PixelPacket
-@@ -103,28 +126,40 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -103,28 +144,40 @@ unsigned int EncodeCompressedGIFImage(co
      i,
      x;
  
@@ -153,7 +171,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
    if ((packet == (unsigned char *) NULL) || (hash_code == (short *) NULL) ||
        (hash_prefix == (short *) NULL) ||
        (hash_suffix == (unsigned char *) NULL))
-@@ -137,7 +172,7 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -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;
@@ -162,7 +180,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
    datum=0;
    bits=0;
    for (i=0; i < MaxHashTable; i++)
-@@ -156,7 +191,7 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -156,7 +209,7 @@ unsigned int EncodeCompressedGIFImage(co
        break;
      indexes=GetIndexes(image);
      if (y == 0)
@@ -171,7 +189,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
      for (x=(y == 0) ? 1 : 0; x < (long) image->columns; x++)
      {
        /*
-@@ -164,14 +199,15 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -164,14 +217,15 @@ unsigned int EncodeCompressedGIFImage(co
        */
        index=indexes[x] & 0xff;
        p++;
@@ -189,7 +207,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
              {
                waiting_code=hash_code[k];
                continue;
-@@ -185,7 +221,8 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -185,7 +239,8 @@ unsigned int EncodeCompressedGIFImage(co
                k+=MaxHashTable;
              if (hash_code[k] == 0)
                break;
@@ -199,7 +217,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
                {
                  waiting_code=hash_code[k];
                  next_pixel=true;
-@@ -195,10 +232,10 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -195,10 +250,10 @@ unsigned int EncodeCompressedGIFImage(co
            if (next_pixel == true)
              continue;
          }
@@ -212,7 +230,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
            hash_prefix[k]=waiting_code;
            hash_suffix[k]=(unsigned char) index;
          }
-@@ -217,7 +254,7 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -217,7 +272,7 @@ unsigned int EncodeCompressedGIFImage(co
            number_bits=data_size;
            max_code=MaxCode(number_bits);
          }
@@ -221,7 +239,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
      }
      if (image_info->interlace == NoInterlace)
        offset++;
-@@ -263,42 +300,45 @@ unsigned int EncodeCompressedGIFImage(co
+@@ -263,42 +318,45 @@ unsigned int EncodeCompressedGIFImage(co
        }
      if (image->previous == (Image *) NULL)
        if (QuantumTick(y,image->rows))
@@ -282,7 +300,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
    return(true);
  }
  
-@@ -308,10 +348,15 @@ unsigned int WriteCompressedGIFImage(con
+@@ -308,10 +366,15 @@ unsigned int WriteCompressedGIFImage(con
      *next_image;
  
    int
@@ -300,7 +318,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
  
    QuantizeInfo
      quantize_info;
-@@ -335,11 +380,9 @@ unsigned int WriteCompressedGIFImage(con
+@@ -335,11 +398,9 @@ unsigned int WriteCompressedGIFImage(con
      *q;
  
    size_t
@@ -313,7 +331,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
      *colormap,
      *global_colormap;
  
-@@ -348,7 +391,7 @@ unsigned int WriteCompressedGIFImage(con
+@@ -348,7 +409,7 @@ unsigned int WriteCompressedGIFImage(con
      status;
  
    unsigned long
@@ -322,7 +340,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
  
    /*
      Open output image file.
-@@ -357,9 +400,11 @@ unsigned int WriteCompressedGIFImage(con
+@@ -357,9 +418,11 @@ unsigned int WriteCompressedGIFImage(con
    assert(image_info->signature == MagickSignature);
    assert(image != (Image *) NULL);
    assert(image->signature == MagickSignature);
@@ -335,7 +353,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
    /*
      Determine image bounding box.
    */
-@@ -380,37 +425,36 @@ unsigned int WriteCompressedGIFImage(con
+@@ -380,37 +443,36 @@ unsigned int WriteCompressedGIFImage(con
    /*
      Allocate colormap.
    */
@@ -384,7 +402,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
    scene=0;
    do
    {
-@@ -422,22 +466,24 @@ unsigned int WriteCompressedGIFImage(con
+@@ -422,22 +484,24 @@ unsigned int WriteCompressedGIFImage(con
          */
          GetQuantizeInfo(&quantize_info);
          quantize_info.dither=image_info->dither;
@@ -416,7 +434,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
                }
              image->colormap[opacity]=image->background_color;
              for (y=0; y < (long) image->rows; y++)
-@@ -449,17 +495,17 @@ unsigned int WriteCompressedGIFImage(con
+@@ -449,17 +513,17 @@ unsigned int WriteCompressedGIFImage(con
                indexes=GetIndexes(image);
                for (x=0; x < (long) image->columns; x++)
                {
@@ -437,7 +455,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
          {
            /*
              Identify transparent pixel index.
-@@ -472,7 +518,7 @@ unsigned int WriteCompressedGIFImage(con
+@@ -472,7 +536,7 @@ unsigned int WriteCompressedGIFImage(con
              indexes=GetIndexes(image);
              for (x=0; x < (long) image->columns; x++)
              {
@@ -446,7 +464,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
                  {
                    opacity=(long) indexes[x];
                    break;
-@@ -495,13 +541,13 @@ unsigned int WriteCompressedGIFImage(con
+@@ -495,13 +559,13 @@ unsigned int WriteCompressedGIFImage(con
        *q++=ScaleQuantumToChar(image->colormap[i].green);
        *q++=ScaleQuantumToChar(image->colormap[i].blue);
      }
@@ -465,7 +483,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
        {
          /*
            Write global colormap.
-@@ -509,13 +555,14 @@ unsigned int WriteCompressedGIFImage(con
+@@ -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 */
@@ -485,7 +503,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
          for (j=0; j < 768; j++)
            global_colormap[j]=colormap[j];
        }
-@@ -524,16 +571,17 @@ unsigned int WriteCompressedGIFImage(con
+@@ -524,16 +589,17 @@ unsigned int WriteCompressedGIFImage(con
          /*
            Write Graphics Control extension.
          */
@@ -511,7 +529,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
          if (GetImageAttribute(image,"comment") != (ImageAttribute *) NULL)
            {
              const ImageAttribute
-@@ -548,18 +596,18 @@ unsigned int WriteCompressedGIFImage(con
+@@ -548,18 +614,18 @@ unsigned int WriteCompressedGIFImage(con
              /*
                Write Comment extension.
              */
@@ -535,7 +553,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
            }
          if ((image->previous == (Image *) NULL) &&
              (image->next != (Image *) NULL) && (image->iterations != 1))
-@@ -567,14 +615,14 @@ unsigned int WriteCompressedGIFImage(con
+@@ -567,14 +633,14 @@ unsigned int WriteCompressedGIFImage(con
              /*
                Write Netscape Loop extension.
              */
@@ -558,7 +576,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $
            }
        }
      (void) WriteBlobByte(image,',');  /* image separator */
-@@ -585,51 +633,50 @@ unsigned int WriteCompressedGIFImage(con
+@@ -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;