--- parser3/src/classes/image.C	2003/09/01 07:12:23	1.92
+++ parser3/src/classes/image.C	2003/11/20 16:34:23	1.99
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_IMAGE_C="$Date: 2003/09/01 07:12:23 $";
+static const char * const IDENT_IMAGE_C="$Date: 2003/11/20 16:34:23 $";
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -33,7 +33,7 @@ static const char* IDENT_IMAGE_C="$Date:
 
 class MImage: public Methoded {
 public: // VStateless_class
-	Value* create_new_value() { return new VImage(); }
+	Value* create_new_value(Pool&) { return new VImage(); }
 
 public:
 	MImage();
@@ -410,7 +410,7 @@ static Value* parse_IFD_entry_formatted_
 			strcpy(cstr_writable, cstr);
 
 			time_t t=cstr_to_time_t(cstr_writable, 
-				0/* do not throw exception, just return bad result */);
+				false/* do not throw exception, just return bad result */);
 			if(t>=0)
 				return new VDate(t);
 		}
@@ -427,7 +427,7 @@ static Value* parse_IFD_entry_formatted_
 	HashStringValue& hash=result->hash();
 	for(uint i=0; i<components_count; i++, value+=component_size) {
 		hash.put(
-			StringBody::Format(i),
+			String::Body::Format(i),
 			parse_IFD_entry_formatted_one_value(is_big, format, component_size, value));
 	}
 
@@ -512,9 +512,9 @@ static void parse_IFD_entry(HashStringVa
 	
 	if(Value* value=parse_IFD_entry_value(is_big, reader, tiff_base, entry)) {
 		if(const char* name=exif_tag_value2name.get(tag))
-			hash.put(StringBody(name), value);
+			hash.put(String::Body(name), value);
 		else
-			hash.put(StringBody::Format(tag), value);
+			hash.put(String::Body::Format(tag), value);
 	}
 }
 
@@ -687,8 +687,8 @@ struct File_measure_action_info {
 };
 #endif
 static void file_measure_action(
-								struct stat& finfo, int f, 
-								const String& file_spec, const char* fname, bool as_text,
+								struct stat& /*finfo*/, int f, 
+								const String& /*file_spec*/, const char* fname, bool /*as_text*/,
 								void *context) {
 	File_measure_action_info& info=*static_cast<File_measure_action_info *>(context);
 
@@ -792,7 +792,6 @@ static gdImage* load(Request& r,
 		throw Exception("file.missing", 
 			0, 
 			"can not open '%s'", file_name_cstr);
-		return 0;
 	}
 }
 
@@ -805,7 +804,6 @@ static void _load(Request& r, MethodPara
 }
 
 static void _create(Request& r, MethodParams& params) {
-
 	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;
@@ -818,27 +816,29 @@ static void _create(Request& r, MethodPa
 }
 
 static void _gif(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
 			0, 
 			"does not contain an image");
 
-	// could _ but don't thing it's wise to use $image.src for vfile.name
+	const String *file_name=0;
+	if(params.count()>0)
+		file_name=&params.as_string(0, "file name must be string");
 
 	gdBuf buf=image->Gif();
 	
 	VFile& vfile=*new VFile;
 	Value* content_type=new VString(*new String("image/gif"));
 	vfile.set(false/*not tainted*/, 
-		(const char*)buf.ptr, buf.size, 0, content_type);
+		(const char*)buf.ptr, buf.size, 
+		file_name? file_name->cstr(String::L_FILE_SPEC): 0, 
+		content_type);
 
 	r.write_no_lang(vfile);
 }
 
 static void _line(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -854,7 +854,6 @@ static void _line(Request& r, MethodPara
 }
 
 static void _fill(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -868,7 +867,6 @@ static void _fill(Request& r, MethodPara
 }
 
 static void _rectangle(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -884,7 +882,6 @@ static void _rectangle(Request& r, Metho
 }
 
 static void _bar(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -908,7 +905,6 @@ static void add_point(Table::element_typ
 }
 #endif
 static void _replace(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -930,7 +926,6 @@ static void _replace(Request& r, MethodP
 }
 
 static void _polyline(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -952,7 +947,6 @@ static void _polyline(Request& r, Method
 }
 
 static void _polygon(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -973,7 +967,6 @@ static void _polygon(Request& r, MethodP
 }
 
 static void _polybar(Request& r, MethodParams& params) {
-
 	gdImage* image=GET_SELF(r, VImage).image;
 	if(!image)
 		throw Exception(0, 
@@ -1242,7 +1235,7 @@ MImage::MImage(): Methoded("image") {
 	add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3);
 
 	// ^image.gif[]
-	add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0);
+	add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 1);
 
 	// ^image.line(x0;y0;x1;y1;color)
 	add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5);