--- parser3/src/classes/image.C	2001/04/27 16:48:20	1.21.2.2
+++ parser3/src/classes/image.C	2001/05/04 10:42:36	1.24
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: image.C,v 1.21.2.2 2001/04/27 16:48:20 paf Exp $
+	$Id: image.C,v 1.24 2001/05/04 10:42:36 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -24,9 +24,15 @@
 // class
 
 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; }
+
 };
 
 // helpers
@@ -248,7 +254,6 @@ 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();
 
@@ -295,9 +300,6 @@ static void append_attrib_pair(const Has
 	if(value.is_string() || value.as_double()>=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();
 
@@ -329,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, 
@@ -341,7 +347,6 @@ 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();
 
@@ -354,9 +359,6 @@ 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();
 
@@ -371,7 +373,6 @@ static void _create(Request& r, const St
 	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();
 
@@ -393,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();
 
@@ -411,7 +411,6 @@ static void _line(Request& r, const Stri
 		image->Color((int)r.process(params->get(4)).as_double()));
 }
 
-/// ^image.fill(x;y;color)
 static void _fill(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -427,7 +426,6 @@ static void _fill(Request& r, const Stri
 		image->Color((int)r.process(params->get(2)).as_double()));
 }
 
-/// ^image.rectangle(x0;y0;x1;y1;color)
 static void _rectangle(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -445,7 +443,6 @@ static void _rectangle(Request& r, const
 		image->Color((int)r.process(params->get(4)).as_double()));
 }
 
-/// ^image.bar(x0;y0;x1;y1;color)
 static void _bar(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -463,7 +460,6 @@ static void _bar(Request& r, const Strin
 		image->Color((int)r.process(params->get(4)).as_double()));
 }
 
-/// ^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();
 
@@ -490,7 +486,6 @@ static void _replace(Request& r, const S
 		image->Color((int)r.process(params->get(1)).as_double()));// 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();
 
@@ -516,7 +511,6 @@ static void _polygon(Request& r, const S
 		image->Color((int)r.process(params->get(0)).as_double()));
 }
 
-/// ^image.polybar(color)(x;y)... point coord pairs
 static void _polybar(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -609,10 +603,6 @@ public:
 	}
 	
 };
-/**
-	^image.font[alPHAbet;font-file-name.gif](height)
-	^image.font[alPHAbet;font-file-name.gif](height;width)
-*/
 static void _font(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -628,7 +618,6 @@ static void _font(Request& r, const Stri
 		height, width);
 }
 
-/// ^image.text(x;y)[text]
 static void _text(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -652,8 +641,8 @@ static void _text(Request& r, const Stri
 
 // constructor
 
-MImage::MImage(Pool& pool) : Methoded(pool) {
-	set_name(NEW String(pool, IMAGE_CLASS_NAME));
+MImage::MImage(Pool& apool) : Methoded(apool) {
+	set_name(*NEW String(pool(), IMAGE_CLASS_NAME));
 
 
 	// ^image:measure[DATA]