From f016c3d73ce48e3f84a98a2fab6b82e47dee4042 Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 29 Sep 2004 12:34:24 +0000 Subject: Fix build with latest ImageMagick by adding declarations for functions used that are now "private". --- graphics/pixieplus/distinfo | 4 +- graphics/pixieplus/patches/patch-aa | 95 +++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 33 deletions(-) diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo index 2929b15df00..18c2c065080 100644 --- a/graphics/pixieplus/distinfo +++ b/graphics/pixieplus/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2004/09/11 12:11:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2004/09/29 12:34:24 markd Exp $ SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5 Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes -SHA1 (patch-aa) = 613c2087201458c43ab8f49ce53537fdb58195a3 +SHA1 (patch-aa) = 812c78976c17c6dcff63b7e447526a196d1196aa 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 d1afac51e9b..ad61dbb94a1 100644 --- a/graphics/pixieplus/patches/patch-aa +++ b/graphics/pixieplus/patches/patch-aa @@ -1,8 +1,42 @@ -$NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ +$NetBSD: patch-aa,v 1.2 2004/09/29 12:34:24 markd Exp $ --- app/compressedgif.cpp.orig 2003-02-09 17:56:50.000000000 +1300 +++ app/compressedgif.cpp -@@ -40,31 +40,31 @@ unsigned int EncodeCompressedGIFImage(co +@@ -9,6 +9,33 @@ + #include + #include + ++/* from */ ++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 *); ++ ++} ++/* end of defns from */ ++ + #ifndef False + #define False 0 + #endif +@@ -40,31 +67,31 @@ unsigned int EncodeCompressedGIFImage(co Image *image, const unsigned int data_size) { @@ -44,7 +78,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ } \ datum>>=8; \ bits-=8; \ -@@ -79,18 +79,14 @@ unsigned int EncodeCompressedGIFImage(co +@@ -79,18 +106,14 @@ unsigned int EncodeCompressedGIFImage(co } \ } @@ -69,7 +103,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ y; register const PixelPacket -@@ -103,28 +99,40 @@ unsigned int EncodeCompressedGIFImage(co +@@ -103,28 +126,40 @@ unsigned int EncodeCompressedGIFImage(co i, x; @@ -119,7 +153,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ if ((packet == (unsigned char *) NULL) || (hash_code == (short *) NULL) || (hash_prefix == (short *) NULL) || (hash_suffix == (unsigned char *) NULL)) -@@ -137,7 +145,7 @@ unsigned int EncodeCompressedGIFImage(co +@@ -137,7 +172,7 @@ unsigned int EncodeCompressedGIFImage(co clear_code=((short) 1 << (data_size-1)); end_of_information_code=clear_code+1; free_code=clear_code+2; @@ -128,7 +162,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ datum=0; bits=0; for (i=0; i < MaxHashTable; i++) -@@ -156,7 +164,7 @@ unsigned int EncodeCompressedGIFImage(co +@@ -156,7 +191,7 @@ unsigned int EncodeCompressedGIFImage(co break; indexes=GetIndexes(image); if (y == 0) @@ -137,7 +171,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ for (x=(y == 0) ? 1 : 0; x < (long) image->columns; x++) { /* -@@ -164,14 +172,15 @@ unsigned int EncodeCompressedGIFImage(co +@@ -164,14 +199,15 @@ unsigned int EncodeCompressedGIFImage(co */ index=indexes[x] & 0xff; p++; @@ -155,7 +189,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ { waiting_code=hash_code[k]; continue; -@@ -185,7 +194,8 @@ unsigned int EncodeCompressedGIFImage(co +@@ -185,7 +221,8 @@ unsigned int EncodeCompressedGIFImage(co k+=MaxHashTable; if (hash_code[k] == 0) break; @@ -165,7 +199,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ { waiting_code=hash_code[k]; next_pixel=true; -@@ -195,10 +205,10 @@ unsigned int EncodeCompressedGIFImage(co +@@ -195,10 +232,10 @@ unsigned int EncodeCompressedGIFImage(co if (next_pixel == true) continue; } @@ -178,7 +212,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ hash_prefix[k]=waiting_code; hash_suffix[k]=(unsigned char) index; } -@@ -217,7 +227,7 @@ unsigned int EncodeCompressedGIFImage(co +@@ -217,7 +254,7 @@ unsigned int EncodeCompressedGIFImage(co number_bits=data_size; max_code=MaxCode(number_bits); } @@ -187,7 +221,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ } if (image_info->interlace == NoInterlace) offset++; -@@ -263,42 +273,45 @@ unsigned int EncodeCompressedGIFImage(co +@@ -263,42 +300,45 @@ unsigned int EncodeCompressedGIFImage(co } if (image->previous == (Image *) NULL) if (QuantumTick(y,image->rows)) @@ -248,26 +282,25 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ return(true); } -@@ -308,10 +321,15 @@ unsigned int WriteCompressedGIFImage(con +@@ -308,10 +348,15 @@ unsigned int WriteCompressedGIFImage(con *next_image; int -- y; -- + c; + - long -- opacity; ++ long + j, + opacity, -+ y; -+ + y; + +- long +- opacity; + MagickOffsetType + scene; QuantizeInfo quantize_info; -@@ -335,11 +353,9 @@ unsigned int WriteCompressedGIFImage(con +@@ -335,11 +380,9 @@ unsigned int WriteCompressedGIFImage(con *q; size_t @@ -280,7 +313,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ *colormap, *global_colormap; -@@ -348,7 +364,7 @@ unsigned int WriteCompressedGIFImage(con +@@ -348,7 +391,7 @@ unsigned int WriteCompressedGIFImage(con status; unsigned long @@ -289,7 +322,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ /* Open output image file. -@@ -357,9 +373,11 @@ unsigned int WriteCompressedGIFImage(con +@@ -357,9 +400,11 @@ unsigned int WriteCompressedGIFImage(con assert(image_info->signature == MagickSignature); assert(image != (Image *) NULL); assert(image->signature == MagickSignature); @@ -302,7 +335,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ /* Determine image bounding box. */ -@@ -380,37 +398,36 @@ unsigned int WriteCompressedGIFImage(con +@@ -380,37 +425,36 @@ unsigned int WriteCompressedGIFImage(con /* Allocate colormap. */ @@ -351,7 +384,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ scene=0; do { -@@ -422,22 +439,24 @@ unsigned int WriteCompressedGIFImage(con +@@ -422,22 +466,24 @@ unsigned int WriteCompressedGIFImage(con */ GetQuantizeInfo(&quantize_info); quantize_info.dither=image_info->dither; @@ -383,7 +416,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ } image->colormap[opacity]=image->background_color; for (y=0; y < (long) image->rows; y++) -@@ -449,17 +468,17 @@ unsigned int WriteCompressedGIFImage(con +@@ -449,17 +495,17 @@ unsigned int WriteCompressedGIFImage(con indexes=GetIndexes(image); for (x=0; x < (long) image->columns; x++) { @@ -404,7 +437,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ { /* Identify transparent pixel index. -@@ -472,7 +491,7 @@ unsigned int WriteCompressedGIFImage(con +@@ -472,7 +518,7 @@ unsigned int WriteCompressedGIFImage(con indexes=GetIndexes(image); for (x=0; x < (long) image->columns; x++) { @@ -413,7 +446,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ { opacity=(long) indexes[x]; break; -@@ -495,13 +514,13 @@ unsigned int WriteCompressedGIFImage(con +@@ -495,13 +541,13 @@ unsigned int WriteCompressedGIFImage(con *q++=ScaleQuantumToChar(image->colormap[i].green); *q++=ScaleQuantumToChar(image->colormap[i].blue); } @@ -432,7 +465,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ { /* Write global colormap. -@@ -509,13 +528,14 @@ unsigned int WriteCompressedGIFImage(con +@@ -509,13 +555,14 @@ unsigned int WriteCompressedGIFImage(con c=0x80; c|=(8-1) << 4; /* color resolution */ c|=(bits_per_pixel-1); /* size of global colormap */ @@ -452,7 +485,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ for (j=0; j < 768; j++) global_colormap[j]=colormap[j]; } -@@ -524,16 +544,17 @@ unsigned int WriteCompressedGIFImage(con +@@ -524,16 +571,17 @@ unsigned int WriteCompressedGIFImage(con /* Write Graphics Control extension. */ @@ -478,7 +511,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ if (GetImageAttribute(image,"comment") != (ImageAttribute *) NULL) { const ImageAttribute -@@ -548,18 +569,18 @@ unsigned int WriteCompressedGIFImage(con +@@ -548,18 +596,18 @@ unsigned int WriteCompressedGIFImage(con /* Write Comment extension. */ @@ -502,7 +535,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ } if ((image->previous == (Image *) NULL) && (image->next != (Image *) NULL) && (image->iterations != 1)) -@@ -567,14 +588,14 @@ unsigned int WriteCompressedGIFImage(con +@@ -567,14 +615,14 @@ unsigned int WriteCompressedGIFImage(con /* Write Netscape Loop extension. */ @@ -525,7 +558,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/15 13:24:44 markd Exp $ } } (void) WriteBlobByte(image,','); /* image separator */ -@@ -585,51 +606,50 @@ unsigned int WriteCompressedGIFImage(con +@@ -585,51 +633,50 @@ unsigned int WriteCompressedGIFImage(con page.y=image->page.y; if ((image->page.width != 0) && (image->page.height != 0)) page=image->page; -- cgit v1.2.3