--- parser3/src/classes/image.C	2001/04/28 08:43:47	1.22
+++ parser3/src/classes/image.C	2001/09/01 14:39:25	1.36
@@ -5,7 +5,17 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: image.C,v 1.22 2001/04/28 08:43:47 paf Exp $
+	$Id: image.C,v 1.36 2001/09/01 14:39:25 parser Exp $
+*/
+static const char *RCSId="$Id: image.C,v 1.36 2001/09/01 14:39:25 parser Exp $"; 
+
+/*
+	jpegsize: gets the width and height (in pixels) of a jpeg file
+	Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
+	modified slightly by alex@ed.ac.uk
+	and further still by rjray@uswest.com
+	optimization and general re-write from tmetro@vl.com
+	from perl by paf@design.ru
 */
 
 #include "pa_config_includes.h"
@@ -25,11 +35,12 @@
 
 class MImage : public Methoded {
 public: // VStateless_class
-	
 	Value *create_new_value(Pool& pool) { return new(pool) VImage(pool); }
 
 public:
 	MImage(Pool& pool);
+
+public: // Methoded
 	bool used_directly() { return true; }
 
 };
@@ -39,7 +50,7 @@ public:
 /// simple buffered reader[from memory/file], used in _measure
 class Measure_reader {
 public:
-	enum { READ_CHUNK_SIZE=0x400 };// 1K
+	enum { READ_CHUNK_SIZE=0x400*10 };// 10K
 	typedef size_t(*Func)(void *& buf, size_t limit, void *info);
 
 	Measure_reader(Func afunc, void *ainfo) : 
@@ -47,7 +58,7 @@ public:
 		chunk(0), offset(0), size(0) {
 	}
 
-	size_t read(unsigned char *& buf, size_t limit) {
+	size_t read(void *&buf, size_t limit) {
 		if(offset+limit>size) // nothing left
 			if(offset==0 || limit==1) { // only one-byte continuations allowed
 				size=(*func)(chunk, READ_CHUNK_SIZE, info);
@@ -84,118 +95,108 @@ struct GIF_Header {
 	char       nulls;
 };
 
-/// JPEG file header
-struct JFIF_Header {
-	char length[2];              // length of JFIF segment marker
-	char identifier[5];          // JFIF identifier
-	char version[2];             // version
-	char units;                  // units X of Y pixel density
-	char xdensity[2];            // X pixel density
-	char ydensity[2];            // X pixel density
-	char xthumbnails;            // width of thumbnails
-	char ythumbnails;            // height of thumbnails
-	char reserved;               // reserved
+/// JPEG record head
+struct JPG_Segment_head {
+	unsigned char marker;
+	unsigned char code;
+	unsigned char length[2];
 };
 /// JPEG frame header
-struct JPG_Frame {
-	char length[2];               // length of image marker
-	char data;                    // data precision of bits/sample
-	char height[2];               // image height
-	char width[2];                // image width
-	char numComponents;           // number of color components
+struct JPG_Size_segment_body {
+	char data;                    //< data precision of bits/sample
+	unsigned char height[2];               //< image height
+	unsigned char width[2];                //< image width
+	char numComponents;           //< number of color components
 };
 
 //
 
-inline short bytes_to_int(unsigned char HI, unsigned char LO) {
-	return(short)((HI<<8) + LO);
+inline short x_endian_to_int(unsigned char L, unsigned char H) {
+	return(short)((H<<8) + L);
+}
+
+inline short big_endian_to_int(unsigned char b[2]) {
+	return x_endian_to_int(b[1], b[0]);
+}
+
+inline short little_endian_to_int(unsigned char b[2]) {
+	return x_endian_to_int(b[0], b[1]);
 }
 
 void measure_gif(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, int& width, int& height) {
 
-	unsigned char *buf;
+	void *buf;
 	const int head_size=sizeof(GIF_Header);
 	if(reader.read(buf, head_size)<head_size)
 		PTHROW(0, 0, 
 			origin_string, 
-			"broken GIF header - file size is less then %d bytes", head_size);
+			"not GIF file - too small");
+	GIF_Header *head=(GIF_Header *)buf;
 
-	GIF_Header& screenD=*reinterpret_cast<GIF_Header *>(buf);
-	if(strncmp(screenD.type, "GIF", 3)!=0)
+	if(strncmp(head->type, "GIF", 3)!=0)
 		PTHROW(0, 0, 
 			origin_string, 
-			"bad image file - GIF signature not found");	
+			"not GIF file - signature not found");	
 
-	width=bytes_to_int(screenD.width[1], screenD.width[0]);
-	height=bytes_to_int(screenD.height[1], screenD.height[0]);
+	width=little_endian_to_int(head->width);
+	height=little_endian_to_int(head->height);
 }
 
 void measure_jpeg(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, int& width, int& height) {
 	// JFIF format markers
-	const unsigned char SOI=0xD8;
-	const unsigned char EOI=0xD9;
-	const unsigned char APP0=0xE0;
-	const unsigned char SOF0=0xC0;
-	const unsigned char SOF2=0xC2;
-	const unsigned char COM=0xFE;
+	const unsigned char MARKER=0xFF;
+	const unsigned char CODE_SIZE_FIRST=0xC0;
+	const unsigned char CODE_SIZE_LAST=0xC3;
 
-	unsigned char *screenD_buf;
-	unsigned char *h_buf=0;
-	
-	bool flag=false;
-	
-	unsigned char *prefix;
+	void *buf;
 	const size_t prefix_size=2;
-	if(reader.read(prefix, prefix_size)<prefix_size)
+	if(reader.read(buf, prefix_size)<prefix_size)
 		PTHROW(0, 0, 
 			origin_string, 
-			"broken JPEG file - size is less then %d bytes", prefix_size);
+			"not JPEG file - too small");
+	unsigned char *signature=(unsigned char *)buf;
 	
-	if(((unsigned char *)prefix)[1]!=SOI) 
+	if(!(signature[0]==0xFF && signature[1]==0xD8)) 
 		PTHROW(0, 0, 
 			origin_string, 
-			"broken JPEG file - second byte of header is not 0x%02X", SOI);
-		
-	unsigned char zero=0;
-	unsigned char *marker=&zero;
-
-	do {
-		while((*marker)!=0xFF)
-			if(reader.read(marker, sizeof(char))<=0) break;
-		if(reader.read(marker, sizeof(char))<=0) break;
-		switch(*marker) {
-		case EOI:
-			marker=&zero;
-			break;
-		case APP0:
-			if(!flag) {
-				flag=true;
-				if(reader.read(screenD_buf, sizeof(JFIF_Header)) < sizeof(JFIF_Header))
-					break;
-				JFIF_Header& screenD=*reinterpret_cast<JFIF_Header *>(screenD_buf);
-				if((bytes_to_int(screenD.length[0], screenD.length[1]) < 16) ||
-					strcasecmp(screenD.identifier, "JFIF")) flag=false;
-			}
+			"not JPEG file - signature not found");
+
+	bool found=false;
+	while(true) {
+		void *buf;
+        // Extract the segment header.
+		if(reader.read(buf, sizeof(JPG_Segment_head))<sizeof(JPG_Segment_head))
+			break;		
+		JPG_Segment_head *head=(JPG_Segment_head *)buf;
+
+        // Verify that it's a valid segment.
+		if(head->marker!=MARKER)
 			break;
-		case SOF0:
-		case SOF2:
-			if(reader.read(h_buf, sizeof(JPG_Frame))<sizeof(JPG_Frame))
-				flag=false;
+
+		if(head->code >= CODE_SIZE_FIRST && head->code  <= CODE_SIZE_LAST) {
+            // Segments that contain size info
+			if(reader.read(buf, sizeof(JPG_Size_segment_body))<sizeof(JPG_Size_segment_body))
+				break;
+			JPG_Size_segment_body *body=(JPG_Size_segment_body *)buf;
+			
+			width=big_endian_to_int(body->width);
+			height=big_endian_to_int(body->height);
+			found=true;
 			break;
-		default: break;
-		}
-	} while(*marker!=EOI);
-	
-	if(flag && h_buf) {
-		JPG_Frame& h=*reinterpret_cast<JPG_Frame *>(h_buf);
-		width=bytes_to_int(h.width[0], h.width[1]);
-		height=bytes_to_int(h.height[0], h.height[1]);
-	} else
+		} else {
+            // Dummy read to skip over data
+            size_t limit=big_endian_to_int(head->length) - 2;
+			if(reader.read(buf, limit)<limit)
+				break;
+        }
+	}
+
+	if(!found)
 		PTHROW(0, 0, 
 			origin_string, 
-			"broken JPEG file - APP0 frame not found");			
+			"broken JPEG file - size frame not found");
 }
 
 // measure center
@@ -253,11 +254,10 @@ static size_t read_disk(void*& buf, size
 
 // methods
 
-/// ^image:measure[DATA]
 static void _measure(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& data=params->get_no_junction(0, "data must not be code");
+	Value& data=params->as_no_junction(0, "data must not be code");
 
 	void *info;Measure_reader::Func read_func;
 	Read_mem_info read_mem_info;
@@ -297,12 +297,9 @@ static void append_attrib_pair(const Has
 	Value& value=*static_cast<Value *>(val);
 	// src="a.gif" width=123 ismap[=-1]
 	*ai.tag << " " << key;
-	if(value.is_string() || value.as_double()>=0)
+	if(value.is_string() || value.as_int()>=0)
 		*ai.tag << "=\"" << value.as_string() << "\"";
 }
-/**	^image.html[]
-	^image.html[hash]
-*/
 static void _html(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -334,8 +331,12 @@ static gdImage *load(Request& r, const S
 	const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_NAME);
 	if(FILE *f=fopen(file_name_cstr, "rb")) {
 		gdImage& image=*new(pool) gdImage(pool);
-		image.CreateFromGif(f);
+		bool ok=image.CreateFromGif(f);
 		fclose(f);
+		if(!ok)
+			PTHROW(0, 0, 
+				&file_name,
+				"is not in GIF format");
 		return &image;
 	} else {
 		PTHROW(0, 0, 
@@ -346,11 +347,10 @@ static gdImage *load(Request& r, const S
 }
 
 
-/// ^image.load[background.gif]
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
+	Value& vfile_name=params->as_no_junction(0, "file name must not be code");
 	const String& file_name=vfile_name.as_string();
 
 	gdImage& image=*load(r, method_name, file_name);
@@ -359,24 +359,20 @@ static void _load(Request& r, const Stri
 	static_cast<VImage *>(r.self)->set(&file_name, width, height, &image);
 }
 
-/**	^image.create[width;height] bgcolor=white
-	^image.create[width;height;bgcolor]
-*/
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	int width=(int)r.process(params->get(0)).as_double();
-	int height=(int)r.process(params->get(1)).as_double();
+	int width=params->as_int(0, r);
+	int height=params->as_int(1, r);
 	int bgcolor_value=0xffFFff;
 	if(params->size()>2)
-		bgcolor_value=(int)r.process(params->get(2)).as_double();
+		bgcolor_value=params->as_int(2, r);
 	gdImage& image=*new(pool) gdImage(pool);
 	image.Create(width, height);
 	image.FilledRectangle(0, 0, width-1, height-1, image.Color(bgcolor_value));
 	static_cast<VImage *>(r.self)->set(0, width, height, &image);
 }
 
-/// ^image.gif[]
 static void _gif(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -398,7 +394,6 @@ static void _gif(Request& r, const Strin
 	r.write_no_lang(vfile);
 }
 
-/// ^image.line(x0;y0;x1;y1;color)
 static void _line(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -409,14 +404,13 @@ static void _line(Request& r, const Stri
 			"does not contain an image");
 
 	image->Line(
-		(int)r.process(params->get(0)).as_double(), 
-		(int)r.process(params->get(1)).as_double(), 
-		(int)r.process(params->get(2)).as_double(), 
-		(int)r.process(params->get(3)).as_double(), 
-		image->Color((int)r.process(params->get(4)).as_double()));
+		params->as_int(0, r), 
+		params->as_int(1, r), 
+		params->as_int(2, r), 
+		params->as_int(3, r), 
+		image->Color(params->as_int(4, r)));
 }
 
-/// ^image.fill(x;y;color)
 static void _fill(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -427,12 +421,11 @@ static void _fill(Request& r, const Stri
 			"does not contain an image");
 
 	image->Fill(
-		(int)r.process(params->get(0)).as_double(), 
-		(int)r.process(params->get(1)).as_double(), 
-		image->Color((int)r.process(params->get(2)).as_double()));
+		params->as_int(0, r), 
+		params->as_int(1, r), 
+		image->Color(params->as_int(2, r)));
 }
 
-/// ^image.rectangle(x0;y0;x1;y1;color)
 static void _rectangle(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -443,14 +436,13 @@ static void _rectangle(Request& r, const
 			"does not contain an image");
 
 	image->Rectangle(
-		(int)r.process(params->get(0)).as_double(), 
-		(int)r.process(params->get(1)).as_double(), 
-		(int)r.process(params->get(2)).as_double(), 
-		(int)r.process(params->get(3)).as_double(), 
-		image->Color((int)r.process(params->get(4)).as_double()));
+		params->as_int(0, r), 
+		params->as_int(1, r), 
+		params->as_int(2, r), 
+		params->as_int(3, r), 
+		image->Color(params->as_int(4, r)));
 }
 
-/// ^image.bar(x0;y0;x1;y1;color)
 static void _bar(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -461,14 +453,13 @@ static void _bar(Request& r, const Strin
 			"does not contain an image");
 
 	image->FilledRectangle(
-		(int)r.process(params->get(0)).as_double(), 
-		(int)r.process(params->get(1)).as_double(), 
-		(int)r.process(params->get(2)).as_double(), 
-		(int)r.process(params->get(3)).as_double(), 
-		image->Color((int)r.process(params->get(4)).as_double()));
+		params->as_int(0, r), 
+		params->as_int(1, r), 
+		params->as_int(2, r), 
+		params->as_int(3, r), 
+		image->Color(params->as_int(4, r)));
 }
 
-/// ^image.replace(color-source;color-dest)(x;y)... point coord pairs
 static void _replace(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -487,15 +478,14 @@ static void _replace(Request& r, const S
 	
 	gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n);
 	for(int i=0; i<n; i++) {
-		p[i].x=(int)r.process(params->get(2+i*2+0)).as_double();
-		p[i].y=(int)r.process(params->get(2+i*2+1)).as_double();
+		p[i].x=params->as_int(2+i*2+0, r);
+		p[i].y=params->as_int(2+i*2+1, r);
 	}
 	image->FilledPolygonReplaceColor(p, n, 
-		image->Color((int)r.process(params->get(0)).as_double()), // src color
-		image->Color((int)r.process(params->get(1)).as_double()));// dest color
+		image->Color(params->as_int(0, r)), // src color
+		image->Color(params->as_int(1, r)));// dest color
 }
 
-/// ^image.polygon(color)(x;y)... point coord pairs
 static void _polygon(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -514,14 +504,13 @@ static void _polygon(Request& r, const S
 	
 	gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n);
 	for(int i=0; i<n; i++) {
-		p[i].x=(int)r.process(params->get(1+i*2+0)).as_double();
-		p[i].y=(int)r.process(params->get(1+i*2+1)).as_double();
+		p[i].x=params->as_int(2+i*2+0, r);
+		p[i].y=params->as_int(2+i*2+1, r);
 	}
 	image->Polygon(p, n, 
-		image->Color((int)r.process(params->get(0)).as_double()));
+		image->Color(params->as_int(0, r)));
 }
 
-/// ^image.polybar(color)(x;y)... point coord pairs
 static void _polybar(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -540,11 +529,11 @@ static void _polybar(Request& r, const S
 	
 	gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n);
 	for(int i=0; i<n; i++) {
-		p[i].x=(int)r.process(params->get(1+i*2+0)).as_double();
-		p[i].y=(int)r.process(params->get(1+i*2+1)).as_double();
+		p[i].x=params->as_int(2+i*2+0, r);
+		p[i].y=params->as_int(2+i*2+1, r);
 	}
 	image->FilledPolygon(p, n, 
-		image->Color((int)r.process(params->get(0)).as_double()));
+		image->Color(params->as_int(0, r)));
 }
 
 // font
@@ -555,16 +544,18 @@ static void _polybar(Request& r, const S
 class Font : public Pooled {
 public:
 	
-	int height;	    /* Font heigth */
-	int space;	    /* Default char width */
+	const static int kerning;
+	int height;	    ///< Font heigth
+	int monospace;	    ///< Default char width
+	int spacebarspace; ///< spacebar width
 	gdImage& ifont;
 	const String& alphabet;
 	
 	Font(Pool& pool, 
 		const String& aalphabet, 
-		gdImage& aifont, int aheight, int aspace) : Pooled(pool), 
+		gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), 
 		alphabet(aalphabet), 
-		height(aheight), space(aspace), 
+		height(aheight), monospace(amonospace),  spacebarspace(aspacebarspace),
 		ifont(aifont) {
 	}
 	
@@ -577,14 +568,12 @@ public:
 	
 	int index_width(int index) {
 		if(index<0)
-			index=index_of('.');
-		if(index<0) 
-			return 0;
+			return spacebarspace;
 		int tr=ifont.GetTransparent();
-		for(int x=ifont.SX()-1; x>0; x--) {
+		for(int x=ifont.SX()-1; x>=0; x--) {
 			for(int y=0; y<height-1; y++)
 				if(ifont.GetPixel(x, Y(y))!=tr) 
-					return x+2;
+					return x+1;
 		}
 		return 0;
 	}
@@ -609,37 +598,34 @@ public:
 		if(cstr) for(; *cstr; cstr++) {
 			int index=index_of(*cstr);
 			index_display(image, x, y, index);
-			x+=space ? space : index_width(index);
+			x+=kerning + (monospace ? monospace : index_width(index));
 		}
 	}
 	
 };
-/**
-	^image.font[alPHAbet;font-file-name.gif](height)
-	^image.font[alPHAbet;font-file-name.gif](height;width)
-*/
+const int Font::kerning=1;
+
 static void _font(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& valphabet=params->get_no_junction(0, "alphabet must not be code");
-	Value& file_name=params->get_no_junction(1, "file_name must not be code");
-	int height=(int)r.process(params->get(2)).as_double();
-
-	int width=params->size()>3?(int)r.process(params->get(3)).as_double():0;
+	Value& valphabet=params->as_no_junction(0, "alphabet must not be code");
+	Value& file_name=params->as_no_junction(1, "file_name must not be code");
+	int spacebar_width=params->as_int(2, r);
 
+	int monospace_width=params->size()>3?params->as_int(3, r):0;
+	gdImage& image=*load(r, method_name, file_name.as_string());
 	static_cast<VImage *>(r.self)->font=new(pool) Font(pool, 
 		valphabet.as_string(), 
-		*load(r, method_name, file_name.as_string()), 
-		height, width);
+		image, 
+		image.SY(), monospace_width, spacebar_width);
 }
 
-/// ^image.text(x;y)[text]
 static void _text(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	int x=(int)r.process(params->get(0)).as_double();
-	int y=(int)r.process(params->get(1)).as_double();
-	const String& s=r.process(params->get(2)).as_string();
+	int x=params->as_int(0, r);
+	int y=params->as_int(1, r);
+	const String& s=params->as_string(2, "text must not be code");
 
 	VImage& vimage=*static_cast<VImage *>(r.self);
 	if(vimage.image)
@@ -664,46 +650,46 @@ MImage::MImage(Pool& apool) : Methoded(a
 	// ^image:measure[DATA]
 	add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1);
 
-	/// ^image.html[]
-	/// ^image.html[hash]
+	// ^image.html[]
+	// ^image.html[hash]
 	add_native_method("html", Method::CT_DYNAMIC, _html, 0, 1);
 
-	/// ^image.load[background.gif]
+	// ^image.load[background.gif]
 	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);
 
-	/// ^image.create[width;height] bgcolor=white
-	/// ^image.create[width;height;bgcolor]
+	// ^image.create[width;height] bgcolor=white
+	// ^image.create[width;height;bgcolor]
 	add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3);
 
-	/// ^image.gif[]
+	// ^image.gif[]
 	add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0);
 
-	/// ^image.line(x0;y0;x1;y1;color)
+	// ^image.line(x0;y0;x1;y1;color)
 	add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5);
 
-	/// ^image.fill(x;y;color)
+	// ^image.fill(x;y;color)
 	add_native_method("fill", Method::CT_DYNAMIC, _fill, 3, 3);
 
-	/// ^image.rectangle(x0;y0;x1;y1;color)
+	// ^image.rectangle(x0;y0;x1;y1;color)
 	add_native_method("rectangle", Method::CT_DYNAMIC, _rectangle, 5, 5);
 
-	/// ^image.bar(x0;y0;x1;y1;color)
+	// ^image.bar(x0;y0;x1;y1;color)
 	add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5);
 
-	/// ^image.replace(color-source;color-dest)(x;y)... point coord pairs
+	// ^image.replace(color-source;color-dest)(x;y)... point coord pairs
 	add_native_method("replace", Method::CT_DYNAMIC, _replace, 2+3*2, 2+100*2);
 
-	/// ^image.polygon(color)(x;y)... point coord pairs
+	// ^image.polygon(color)(x;y)... point coord pairs
 	add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 1+3*2, 1+100*2);
 
-	/// ^image.polybar(color)(x;y)... point coord pairs
+	// ^image.polybar(color)(x;y)... point coord pairs
 	add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*2);
 
-    /// ^image.font[alPHAbet;font-file-name.gif](height)
-    /// ^image.font[alPHAbet;font-file-name.gif](height;width)
+    // ^image.font[alPHAbet;font-file-name.gif](spacebar_width)
+    // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;width)
 	add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4);
 
-    /// ^image.text(x;y)[text]
+    // ^image.text(x;y)[text]
 	add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3);
 	
 }