--- parser3/src/classes/gd/Attic/gif.h	2001/04/17 19:00:32	1.6
+++ parser3/src/classes/gd/Attic/gif.h	2002/08/01 11:41:13	1.22
@@ -1,11 +1,8 @@
 /** @file
 	Parser: image manipulations decls.
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: gif.h,v 1.6 2001/04/17 19:00:32 paf Exp $
-
-
+	Copyright (c) 2001, 2002 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,7 +16,9 @@
 */
 
 #ifndef GIF_H
-#define GIF_H 1
+#define GIF_H
+
+static const char* IDENT_GIF_H="$Date: 2002/08/01 11:41:13 $";
 
 #include "pa_config_includes.h"
 
@@ -29,10 +28,6 @@
 #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
-
-
 /** Image type. 
 	See functions below; you will not need to change
 	the elements directly. Use the provided macros to
@@ -41,31 +36,33 @@
 */
 class gdImage : public Pooled {
 
-public: /* Functions to manipulate images. */
-
+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);
+	//@}
 
-	/* Point type for use in polygon drawing. */
-	
+	/// Point type for use in polygon drawing.
 	struct Point {
 		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,15 +74,19 @@ public: /* Functions to manipulate image
 	
 	void Gif(String& out);
 	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: /* information about image. READ ONLY */
+public: 
 
+	//@{
+	/// @name information about image. READ ONLY
 	int SX() { return sx; }
 	int SY() { return sy; }
 	int ColorsTotal() { return colorsTotal; }
@@ -94,6 +95,7 @@ public: /* information about image. READ
 	int Blue(int c) { return blue[c]; }
 	int GetTransparent() { return transparent; }
 	int GetInterlaced() { return interlace; }
+	//@}
 
 private:
 
@@ -108,7 +110,7 @@ private:
 	int transparent;
 	int *polyInts;
 	int polyAllocated;
-	int styleWidth;
+	int lineWidth; const char *lineStyle;
 	int interlace;
 
 private: // read gif
@@ -125,6 +127,7 @@ private: // read gif
 	
 };
 
+///	used by gdImage::Gif to produce buffer with bytes in GIF format
 class gdGifEncoder : public Pooled {
 public:
 
@@ -138,16 +141,14 @@ public:
 
 private:
 
-	/*
-	 * a code_int must be able to hold 2**GIFBITS values of type int, and also -1
-	 */
+	/// a code_int must be able to hold 2**GIFBITS values of type int, and also -1
 	typedef int             code_int;
-	#ifdef SIGNED_COMPARE_SLOW
+#ifdef SIGNED_COMPARE_SLOW
 	typedef unsigned long int count_int;
 	typedef unsigned short int count_short;
-	#else /*SIGNED_COMPARE_SLOW*/
+#else
 	typedef long int          count_int;
-	#endif /*SIGNED_COMPARE_SLOW*/
+#endif
 
 private: