--- parser3/src/classes/image.C	2001/10/08 15:14:07	1.48
+++ parser3/src/classes/image.C	2002/03/27 15:30:34	1.68
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: image.C,v 1.48 2001/10/08 15:14:07 parser Exp $
+	$Id: image.C,v 1.68 2002/03/27 15:30:34 paf Exp $
 */
 
 /*
@@ -128,13 +128,13 @@ void measure_gif(Pool& pool, const Strin
 	void *buf;
 	const int head_size=sizeof(GIF_Header);
 	if(reader.read(buf, head_size)<head_size)
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not GIF file - too small");
 	GIF_Header *head=(GIF_Header *)buf;
 
 	if(strncmp(head->type, "GIF", 3)!=0)
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not GIF file - wrong signature");	
 
@@ -142,6 +142,7 @@ void measure_gif(Pool& pool, const Strin
 	height=little_endian_to_int(head->height);
 }
 
+/// @test remove ugly mech in reader - 20K limit
 void measure_jpeg(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, int& width, int& height) {
 	// JFIF format markers
@@ -152,13 +153,13 @@ void measure_jpeg(Pool& pool, const Stri
 	void *buf;
 	const size_t prefix_size=2;
 	if(reader.read(buf, prefix_size)<prefix_size)
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not JPEG file - too small");
 	unsigned char *signature=(unsigned char *)buf;
 	
 	if(!(signature[0]==0xFF && signature[1]==0xD8)) 
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not JPEG file - wrong signature");
 
@@ -193,7 +194,7 @@ void measure_jpeg(Pool& pool, const Stri
 	}
 
 	if(!found)
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"broken JPEG file - size frame not found");
 }
@@ -202,18 +203,18 @@ void measure_jpeg(Pool& pool, const Stri
 
 void measure(Pool& pool, const String& file_name, 
 			 Measure_reader& reader, int& width, int& height) {
-	if(const char *cext=strrchr(file_name.cstr(), '.')) {
+	if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) {
 		cext++;
 		if(strcasecmp(cext, "GIF")==0)
 			measure_gif(pool, &file_name, reader, width, height);
 		else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) 
 			measure_jpeg(pool, &file_name, reader, width, height);
 		else
-			PTHROW(0, 0, 
+			throw Exception("image.format", 
 				&file_name, 
 				"unhandled image file name extension '%s'", cext);
 	} else
-		PTHROW(0, 0, 
+		throw Exception("image.format", 
 			&file_name, 
 			"can not determine image type - no file name extension");
 }
@@ -293,7 +294,8 @@ struct Attrib_info {
 static void append_attrib_pair(const Hash::Key& key, Hash::Val *val, void *info) {
 	Attrib_info& ai=*static_cast<Attrib_info *>(info);
 
-	if(ai.skip && ai.skip->get(key))
+	// skip user-specified and internal(starting with "line-") attributes 
+	if(ai.skip && ai.skip->get(key) || key.pos("line-")==0)
 		return;
 
 	Value& value=*static_cast<Value *>(val);
@@ -312,13 +314,15 @@ static void _html(Request& r, const Stri
 	Hash *attribs=0;
 
 	if(params->size()) {
-		Value &vattribs=params->get(0);
+		Value &vattribs=r.process(params->get(0),
+			0/*no name*/,
+			false/*don't intercept string*/);
 		if(vattribs.is_defined()) // allow 'void'
-			if(Hash *attribs=vattribs.get_hash()) {
+			if(attribs=vattribs.get_hash(&method_name)) {
 				Attrib_info attrib_info={&tag, 0};
 				attribs->for_each(append_attrib_pair, &attrib_info);
 			} else
-				PTHROW(0, 0, 
+				throw Exception("parser.runtime", 
 					&method_name, 
 					"attributes must be hash");
 	}
@@ -329,6 +333,7 @@ static void _html(Request& r, const Stri
 	r.write_pass_lang(tag);
 }
 
+/// @test wrap FILE to auto-object
 static gdImage *load(Request& r, const String& method_name, 
 					 const String& file_name){
 	Pool& pool=r.pool();
@@ -339,12 +344,12 @@ static gdImage *load(Request& r, const S
 		bool ok=image.CreateFromGif(f);
 		fclose(f);
 		if(!ok)
-			PTHROW(0, 0, 
+			throw Exception("image.format", 
 				&file_name,
 				"is not in GIF format");
 		return &image;
 	} else {
-		PTHROW(0, 0, 
+		throw Exception("file.missing", 
 			&method_name, 
 			"can not open '%s'", file_name_cstr);
 		return 0;
@@ -366,11 +371,11 @@ static void _load(Request& r, const Stri
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	int width=params->as_int(0, r);
-	int height=params->as_int(1, r);
+	int width=params->as_int(0, "width must be int", r);
+	int height=params->as_int(1, "height must be int", r);
 	int bgcolor_value=0xffFFff;
 	if(params->size()>2)
-		bgcolor_value=params->as_int(2, r);
+		bgcolor_value=params->as_int(2, "color must be int", r);
 	gdImage& image=*new(pool) gdImage(pool);
 	image.Create(width, height);
 	image.FilledRectangle(0, 0, width-1, height-1, image.Color(bgcolor_value));
@@ -382,7 +387,7 @@ static void _gif(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -393,7 +398,7 @@ static void _gif(Request& r, const Strin
 	VFile& vfile=*new(pool) VFile(pool);
 	Value *content_type=new(pool) VString(*new(pool) String(pool, "image/gif"));
 	vfile.set(false/*not tainted*/, 
-		out.cstr(String::UL_AS_IS), out.size(), 0, content_type);
+		out.cstr(), out.size(), 0, content_type);
 
 	r.write_no_lang(vfile);
 }
@@ -403,16 +408,16 @@ static void _line(Request& r, const Stri
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	image->Line(
-		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)));
+		params->as_int(0, "x0 must be int", r), 
+		params->as_int(1, "y0 must be int", r), 
+		params->as_int(2, "x1 must be int", r), 
+		params->as_int(3, "y1 must be int", r), 
+		image->Color(params->as_int(4, "color must be int", r)));
 }
 
 static void _fill(Request& r, const String& method_name, MethodParams *params) {
@@ -420,14 +425,14 @@ static void _fill(Request& r, const Stri
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	image->Fill(
-		params->as_int(0, r), 
-		params->as_int(1, r), 
-		image->Color(params->as_int(2, r)));
+		params->as_int(0, "x must be int", r), 
+		params->as_int(1, "y must be int", r), 
+		image->Color(params->as_int(2, "color must be int", r)));
 }
 
 static void _rectangle(Request& r, const String& method_name, MethodParams *params) {
@@ -435,16 +440,16 @@ static void _rectangle(Request& r, const
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	image->Rectangle(
-		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)));
+		params->as_int(0, "x0 must be int", r), 
+		params->as_int(1, "y0 must be int", r), 
+		params->as_int(2, "x1 must be int", r), 
+		params->as_int(3, "y1 must be int", r), 
+		image->Color(params->as_int(4, "color must be int", r)));
 }
 
 static void _bar(Request& r, const String& method_name, MethodParams *params) {
@@ -452,16 +457,16 @@ static void _bar(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	image->FilledRectangle(
-		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)));
+		params->as_int(0, "x0 must be int", r), 
+		params->as_int(1, "y0 must be int", r), 
+		params->as_int(2, "x1 must be int", r), 
+		params->as_int(3, "y1 must be int", r), 
+		image->Color(params->as_int(4, "color must be int", r)));
 }
 
 #ifndef DOXYGEN
@@ -479,13 +484,13 @@ static void _replace(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(2, "coordinates must not be code").get_table();
 	if(!table) 
-		PTHROW(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -493,8 +498,8 @@ static void _replace(Request& r, const S
 	gdImage::Point *add_p=all_p;	
 	table->for_each(add_point, &add_p);
 	image->FilledPolygonReplaceColor(all_p, table->size(), 
-		image->Color(params->as_int(0, r)), // src color
-		image->Color(params->as_int(1, r)));// dest color
+		image->Color(params->as_int(0, "src color must be int", r)),
+		image->Color(params->as_int(1, "dest color must be int", r)));
 }
 
 static void _polyline(Request& r, const String& method_name, MethodParams *params) {
@@ -502,13 +507,13 @@ static void _polyline(Request& r, const
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		PTHROW(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -516,7 +521,7 @@ static void _polyline(Request& r, const
 	gdImage::Point *add_p=all_p;	
 	table->for_each(add_point, &add_p);
 	image->Polygon(all_p, table->size(), 
-		image->Color(params->as_int(0, r)),
+		image->Color(params->as_int(0, "color must be int", r)),
 		false/*not closed*/);
 }
 
@@ -525,13 +530,13 @@ static void _polygon(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		PTHROW(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -539,7 +544,7 @@ static void _polygon(Request& r, const S
 	gdImage::Point *add_p=all_p;	
 	table->for_each(add_point, &add_p);
 	image->Polygon(all_p, table->size(), 
-		image->Color(params->as_int(0, r)));
+		image->Color(params->as_int(0, "color must be int", r)));
 }
 
 static void _polybar(Request& r, const String& method_name, MethodParams *params) {
@@ -547,13 +552,13 @@ static void _polybar(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		PTHROW(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"coordinates must be table");
 
@@ -561,7 +566,7 @@ static void _polybar(Request& r, const S
 	gdImage::Point *add_p=all_p;	
 	table->for_each(add_point, &add_p);
 	image->FilledPolygon(all_p, table->size(), 
-		image->Color(params->as_int(0, r)));
+		image->Color(params->as_int(0, "color must be int", r)));
 }
 
 // font
@@ -614,7 +619,7 @@ public:
 	/* ******************************** string ********************************** */
 	
 	int string_width(const String& s){
-		const char *cstr=s.cstr(String::UL_AS_IS);
+		const char *cstr=s.cstr();
 		int result=0;
 		for(; *cstr; cstr++)
 			result+=index_width(index_of(*cstr));
@@ -622,7 +627,7 @@ public:
 	}
 	
 	void string_display(gdImage& image, int x, int y, const String& s){
-		const char *cstr=s.cstr(String::UL_AS_IS);
+		const char *cstr=s.cstr();
 		if(cstr) for(; *cstr; cstr++) {
 			int index=index_of(*cstr);
 			index_display(image, x, y, index);
@@ -638,17 +643,17 @@ static void _font(Request& r, const Stri
 
 	const String& alphabet=params->as_string(0, "alphabet must not be code");
 	gdImage& image=*load(r, method_name, params->as_string(1, "file_name must not be code"));
-	int spacebar_width=params->as_int(2, r);
+	int spacebar_width=params->as_int(2, "spacebar_width must be int", r);
 	int monospace_width;
 	if(params->size()>3) {
-		monospace_width=params->as_int(3, r);
+		monospace_width=params->as_int(3, "monospace_width must be int", r);
 		if(!monospace_width)
 			monospace_width=image.SX();
 	} else
 		monospace_width=0;
 
 	if(!alphabet.size())
-		PTHROW(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"alphabet must not be empty");
 	
@@ -661,8 +666,8 @@ static void _font(Request& r, const Stri
 static void _text(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	int x=params->as_int(0, r);
-	int y=params->as_int(1, r);
+	int x=params->as_int(0, "x must be int", r);
+	int y=params->as_int(1, "y must be int", r);
 	const String& s=params->as_string(2, "text must not be code");
 
 	VImage& vimage=*static_cast<VImage *>(r.self);
@@ -670,11 +675,11 @@ static void _text(Request& r, const Stri
 		if(vimage.font)
 			vimage.font->string_display(*vimage.image, x, y, s);
 		else
-			PTHROW(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"set the font first");
 	else
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 }
@@ -691,11 +696,11 @@ static void _length(Request& r, const St
 			result.set_name(method_name);
 			r.write_assign_lang(result);
 		} else
-			PTHROW(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"set the font first");
 	else
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 }
@@ -705,18 +710,37 @@ static void _arc(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	image->Arc(
-		params->as_int(0, r), //cx
-		params->as_int(1, r), //cy
-		params->as_int(2, r), //w
-		params->as_int(3, r), //h
-		params->as_int(4, r), //s
-		params->as_int(5, r), //e
-		image->Color(params->as_int(6, r)));
+		params->as_int(0, "center_x must be int", r), 
+		params->as_int(1, "center_y must be int", r), 
+		params->as_int(2, "width must be int", r), 
+		params->as_int(3, "height must be int", r), 
+		params->as_int(4, "start degrees must be int", r), 
+		params->as_int(5, "end degrees must be int", r), 
+		image->Color(params->as_int(6, "cx must be int", r)));
+}
+
+static void _sector(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	gdImage *image=static_cast<VImage *>(r.self)->image;
+	if(!image)
+		throw Exception(0, 
+			&method_name, 
+			"does not contain an image");
+
+	image->Sector(
+		params->as_int(0, "center_x must be int", r), 
+		params->as_int(1, "center_y must be int", r), 
+		params->as_int(2, "width must be int", r), 
+		params->as_int(3, "height must be int", r), 
+		params->as_int(4, "start degrees must be int", r), 
+		params->as_int(5, "end degrees must be int", r), 
+		image->Color(params->as_int(6, "color must be int", r)));
 }
 
 static void _circle(Request& r, const String& method_name, MethodParams *params) {
@@ -724,21 +748,69 @@ static void _circle(Request& r, const St
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		PTHROW(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
-	int radius=params->as_int(2, r);
+	int size=params->as_int(2, "radius must be int", r)*2;
 	image->Arc(
-		params->as_int(0, r), //cx
-		params->as_int(1, r), //cy
-		radius, //w
-		radius, //h
+		params->as_int(0, "center_x must be int", r), 
+		params->as_int(1, "center_y must be int", r), 
+		size, //w
+		size, //h
 		0, //s
 		360, //e
-		image->Color(params->as_int(3, r)));
+		image->Color(params->as_int(3, "color must be int", r)));
 }
 
+gdImage& as_image(Pool& pool, const String& method_name, MethodParams *params, 
+						int index, const char *msg) {
+	Value& value=params->as_no_junction(index, msg);
+
+	if(strcmp(value.type(), VIMAGE_TYPE)!=0)
+		throw Exception("parser.runtime", 
+			&method_name, 
+			msg);
+
+	gdImage *src=static_cast<VImage *>(&value)->image;
+	if(!src)
+		throw Exception("parser.runtime", 
+			&method_name, 
+			msg);
+
+	return *src;
+}
+
+static void _copy(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	gdImage *dest=static_cast<VImage *>(r.self)->image;
+	if(!dest)
+		throw Exception(0, 
+			&method_name, 
+			"self does not contain an image");
+
+	gdImage& src=as_image(pool, method_name, params, 0, "src must be image");
+
+	int sx=params->as_int(1, "src_x must be int", r);
+	int sy=params->as_int(2, "src_y must be int", r);
+	int sw=params->as_int(3, "src_w must be int", r);
+	int sh=params->as_int(4, "src_h must be int", r);
+	int dx=params->as_int(5, "dest_x must be int", r);
+	int dy=params->as_int(6, "dest_y must be int", r);
+	if(params->size()>1+2+2+2) {
+		int dw=params->as_int(1+2+2+2, "dest_w must be int", r);
+		int dh=(int)(params->size()>1+2+2+2+1?
+			params->as_int(1+2+2+2+1, "dest_h must be int", r):sh*(((double)dw)/((double)sw)));
+		int tolerance=params->size()>1+2+2+2+2?
+			params->as_int(1+2+2+2+2, "tolerance must be int", r):150;
+
+		src.CopyResampled(*dest, dx, dy, sx, sy, dw, dh, sw, sh, tolerance);
+	} else
+		src.Copy(*dest, dx, dy, sx, sy, sw, sh);
+}
+
+
 // constructor
 
 MImage::MImage(Pool& apool) : Methoded(apool) {
@@ -799,9 +871,14 @@ MImage::MImage(Pool& apool) : Methoded(a
 	// ^image.arc(center x;center y;width;height;start in degrees;end in degrees;color)
 	add_native_method("arc", Method::CT_DYNAMIC, _arc, 7, 7);
 
+	// ^image.sector(center x;center y;width;height;start in degrees;end in degrees;color)
+	add_native_method("sector", Method::CT_DYNAMIC, _sector, 7, 7);
+
 	// ^image.circle(center x;center y;r;color)
 	add_native_method("circle", Method::CT_DYNAMIC, _circle, 4, 4);
 
+	// ^image.copy[source](src x;src y;src w;src h;dst x;dst y[;dest w[;dest h[;tolerance]]])
+	add_native_method("copy", Method::CT_DYNAMIC, _copy, 1+2+2+2, (1+2+2+2)+2+1);
 }
 
 // global variable