--- parser3/src/classes/gd/Attic/gif.h	2001/08/28 13:49:19	1.10
+++ parser3/src/classes/gd/Attic/gif.h	2003/04/02 11:35:20	1.23.2.5.2.6
@@ -1,11 +1,8 @@
 /** @file
 	Parser: image manipulations decls.
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: gif.h,v 1.10 2001/08/28 13:49:19 parser Exp $
-
-
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 	based on:
 	gd.h: declarations file for the gifdraw module.
 
@@ -19,19 +16,49 @@
 */
 
 #ifndef GIF_H
-#define GIF_H 1
+#define GIF_H
+
+static const char* IDENT_GIF_H="$Date: 2003/04/02 11:35:20 $";
 
 #include "pa_config_includes.h"
 
-#include "pa_pool.h"
-#include "pa_string.h"
+
+#include "pa_memory.h"
 
 #define gdMaxColors 0x100
 #define HSIZE  5003            /* 80% occupancy */
 
-/* For backwards compatibility only. Use gdImageSetStyle() for MUCH more flexible line drawing. Also see gdImageSetBrush(). */
-#define gdDashSize 4
+struct gdBuf {
+	void *ptr;
+	size_t size;
 
+	gdBuf(void *aptr, size_t asize): ptr(aptr), size(asize) {}
+};
+
+class gdGrowingBuf: PA_Object {
+	unsigned char *fptr;
+	size_t fallocated;
+	size_t fused;
+
+	void expand(size_t delta) {
+		size_t new_allocated=fallocated+delta;
+		fptr=(unsigned char*)realloc(fptr, new_allocated);
+		fallocated=new_allocated;
+	}
+public:
+	operator gdBuf() { return gdBuf(fptr, fused); }
+
+	gdGrowingBuf(): fptr(0), fallocated(0), fused(0) {}
+
+	void append(unsigned char *abuf, size_t asize) {
+		ssize_t delta=asize-(fallocated-fused);
+		if(delta>0)
+			expand(delta+100);
+
+		memcpy(&fptr[fused], abuf, asize);
+		fused+=asize;
+	}
+};
 
 /** Image type. 
 	See functions below; you will not need to change
@@ -39,19 +66,18 @@
 	access sx, sy, the color table, and colorsTotal for 
 	read-only purposes. 
 */
-class gdImage : public Pooled {
+class gdImage: public PA_Object {
 
 public: 
 	
 	//@{
 	/// @name Functions to manipulate images
-	gdImage(Pool& pool) : Pooled(pool) {}
 	void Create(int asx, int asy);
 	bool CreateFromGif(FILE *fd);
 	void SetPixel(int x, int y, int color);
 	int GetPixel(int x, int y);
 	void Line(int x1, int y1, int x2, int y2, int color);
-	void DashedLine(int x1, int y1, int x2, int y2, int color);
+	void StyledLine(int x1, int y1, int x2, int y2, int color, const char* lineStyle);
 	void Rectangle(int x1, int y1, int x2, int y2, int color);
 	void LineReplaceColor(int x1, int y1, int x2, int y2, int a, int b);
 	void FilledRectangle(int x1, int y1, int x2, int y2, int color);
@@ -62,12 +88,12 @@ public:
 		int x, y;
 	};
 	
-	void Polygon(Point *p, int n, int c);
+	void Polygon(Point *p, int n, int c, bool closed=true);
 	void FilledPolygon(Point *p, int n, int c);
 	void FilledPolygonReplaceColor(Point *p, int n, int a, int b);
 
 	int ColorAllocate(int r, int g, int b);
-	int ColorClosest(int r, int g, int b);
+	int ColorClosest(int r, int g, int b, int tolerance=0);
 	int ColorExact(int r, int g, int b);
 	int ColorRGB(int r, int g, int b);
 	int Color(unsigned int rgb);
@@ -77,13 +103,15 @@ public:
 	int BoundsSafe(int x, int y);
 	void DoSetPixel(int x, int y, int color);
 	
-	void Gif(String& out);
+	gdBuf Gif();
 	void Arc(int cx, int cy, int w, int h, int s, int e, int color);
+	void Sector(int cx, int cy, int w, int h, int s, int e, int color);
 	void FillToBorder(int x, int y, int border, int color);
 	void Fill(int x, int y, int color);
 	void Copy(gdImage& dst, int dstX, int dstY, int srcX, int srcY, int w, int h);
-	void CopyResized(gdImage& dst, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH);
-	void SetStyle(int width);
+	void CopyResampled(gdImage& dst, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH, int tolerance);
+	void SetLineWidth(int width);
+	void SetLineStyle(const char* aLineStyle);
 	void SetInterlace(int interlaceArg); /* On or off(1 or 0) */
 	
 public: 
@@ -113,7 +141,7 @@ private:
 	int transparent;
 	int *polyInts;
 	int polyAllocated;
-	int styleWidth;
+	int lineWidth; const char* lineStyle;
 	int interlace;
 
 private: // read gif
@@ -131,12 +159,12 @@ private: // read gif
 };
 
 ///	used by gdImage::Gif to produce buffer with bytes in GIF format
-class gdGifEncoder : public Pooled {
+class gdGifEncoder: public PA_Object {
 public:
 
-	gdGifEncoder(Pool& pool, gdImage& aim, String& afp);
+	gdGifEncoder(gdImage& aim);
 
-	void encode( 
+	gdBuf encode( 
 		int GWidth, int GHeight, 
 		int GInterlace, int Background, 
 		int Transparent, int BitsPerPixel, 
@@ -155,7 +183,7 @@ private:
 
 private:
 
-	void Putbyte(int c);
+	void Putbyte(unsigned char c);
 	void Putword(int w);
 	void Write(void *buf, size_t size);
 
@@ -173,7 +201,7 @@ private:
 private:
 	
 	gdImage& im;
-	String& fp;
+	gdGrowingBuf buf;
 
 	int Width, Height;
 	int curx, cury;