--- parser3/src/classes/image.C	2001/09/17 16:14:04	1.40.4.2
+++ parser3/src/classes/image.C	2001/10/08 15:14:07	1.48
@@ -2,12 +2,10 @@
 	Parser: @b image parser class.
 
 	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: image.C,v 1.40.4.2 2001/09/17 16:14:04 parser Exp $
+	$Id: image.C,v 1.48 2001/10/08 15:14:07 parser Exp $
 */
-static const char *RCSId="$Id: image.C,v 1.40.4.2 2001/09/17 16:14:04 parser Exp $"; 
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -47,10 +45,10 @@ public: // Methoded
 
 // helpers
 
-/// simple buffered reader[from memory/file], used in _measure
+#ifndef DOXYGEN
 class Measure_reader {
 public:
-	enum { READ_CHUNK_SIZE=0x400*10 };// 10K
+	enum { READ_CHUNK_SIZE=0x400*20 };// 20K
 	typedef size_t(*Func)(void *& buf, size_t limit, void *info);
 
 	Measure_reader(Func afunc, void *ainfo) : 
@@ -83,6 +81,7 @@ private:
 	size_t offset;
 	size_t size;
 };
+#endif
 
 /// GIF file header
 struct GIF_Header {
@@ -334,7 +333,7 @@ static gdImage *load(Request& r, const S
 					 const String& file_name){
 	Pool& pool=r.pool();
 
-	const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_NAME);
+	const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_SPEC);
 	if(FILE *f=fopen(file_name_cstr, "rb")) {
 		gdImage& image=*new(pool) gdImage(pool);
 		bool ok=image.CreateFromGif(f);
@@ -392,9 +391,9 @@ static void _gif(Request& r, const Strin
 	String out(pool); image->Gif(out);
 	
 	VFile& vfile=*new(pool) VFile(pool);
-	String& image_gif=*new(pool) String(pool, "image/gif");
+	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, &image_gif);
+		out.cstr(String::UL_AS_IS), out.size(), 0, content_type);
 
 	r.write_no_lang(vfile);
 }
@@ -472,7 +471,7 @@ static void add_point(Array::Item *value
 	
 	(**p).x=row.get_string(0)->as_int();
 	(**p).y=row.get_string(1)->as_int();
-	*p++;
+	(*p)++;
 }
 #endif
 static void _replace(Request& r, const String& method_name, MethodParams *params) {
@@ -613,14 +612,14 @@ public:
 	}
 	
 	/* ******************************** string ********************************** */
-	/*
-	int string_width(const char *cstr){
+	
+	int string_width(const String& s){
+		const char *cstr=s.cstr(String::UL_AS_IS);
 		int result=0;
 		for(; *cstr; cstr++)
 			result+=index_width(index_of(*cstr));
 		return result;
 	}
-	*/
 	
 	void string_display(gdImage& image, int x, int y, const String& s){
 		const char *cstr=s.cstr(String::UL_AS_IS);
@@ -680,6 +679,66 @@ static void _text(Request& r, const Stri
 			"does not contain an image");
 }
 
+static void _length(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	const String& s=params->as_string(0, "text must not be code");
+
+	VImage& vimage=*static_cast<VImage *>(r.self);
+	if(vimage.image)
+		if(vimage.font) {
+			VInt& result=*new(pool) VInt(pool, vimage.font->string_width(s));
+			result.set_name(method_name);
+			r.write_assign_lang(result);
+		} else
+			PTHROW(0, 0,
+				&method_name,
+				"set the font first");
+	else
+		PTHROW(0, 0, 
+			&method_name, 
+			"does not contain an image");
+}
+
+static void _arc(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	gdImage *image=static_cast<VImage *>(r.self)->image;
+	if(!image)
+		PTHROW(0, 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)));
+}
+
+static void _circle(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	gdImage *image=static_cast<VImage *>(r.self)->image;
+	if(!image)
+		PTHROW(0, 0, 
+			&method_name, 
+			"does not contain an image");
+
+	int radius=params->as_int(2, r);
+	image->Arc(
+		params->as_int(0, r), //cx
+		params->as_int(1, r), //cy
+		radius, //w
+		radius, //h
+		0, //s
+		360, //e
+		image->Color(params->as_int(3, r)));
+}
+
 // constructor
 
 MImage::MImage(Pool& apool) : Methoded(apool) {
@@ -734,6 +793,15 @@ MImage::MImage(Pool& apool) : Methoded(a
     // ^image.text(x;y)[text]
 	add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3);
 	
+    // ^image.ngth[text]
+	add_native_method("length", Method::CT_DYNAMIC, _length, 1, 1);
+	
+	// ^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.circle(center x;center y;r;color)
+	add_native_method("circle", Method::CT_DYNAMIC, _circle, 4, 4);
+
 }
 
 // global variable