--- parser3/src/classes/image.C	2005/07/28 11:23:01	1.112
+++ parser3/src/classes/image.C	2007/11/14 09:45:21	1.117
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_IMAGE_C="$Date: 2005/07/28 11:23:01 $";
+static const char * const IDENT_IMAGE_C="$Date: 2007/11/14 09:45:21 $";
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -757,16 +757,16 @@ static void _html(Request& r, MethodPara
 		if(!vattribs.is_string()) // allow empty
 			if((attribs=vattribs.get_hash())) {
 				Attrib_info info={&tag, 0};
-				attribs->for_each(append_attrib_pair, &info);
+				attribs->for_each<Attrib_info*>(append_attrib_pair, &info);
 			} else
-				throw Exception("parser.runtime", 
+				throw Exception(PARSER_RUNTIME, 
 					0, 
 					"attributes must be hash");
 	}
 
 	{
 		Attrib_info info={&tag, attribs};
-		fields.for_each(append_attrib_pair, &info);
+		fields.for_each<Attrib_info*>(append_attrib_pair, &info);
 	}
 	tag << " />";
 	r.write_pass_lang(tag);
@@ -794,7 +794,7 @@ static gdImage* load(Request& r,
 
 
 static void _load(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(0, "file name must not be code");
+	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
 
 	gdImage* image=load(r, file_name);
 	GET_SELF(r, VImage).set(&file_name, image->SX(), image->SY(), image);
@@ -817,7 +817,7 @@ static void _gif(Request& r, MethodParam
 
 	const String *file_name=0;
 	if(params.count()>0)
-		file_name=&params.as_string(0, "file name must be string");
+		file_name=&params.as_string(0, FILE_NAME_MUST_BE_STRING);
 
 	gdBuf buf=image.Gif();
 	
@@ -888,7 +888,7 @@ static void add_point(Table::element_typ
 static void _replace(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=params.as_no_junction(2, "coordinates must not be code").get_table();
+	Table* table=params.as_no_junction(2, COORDINATES_MUST_NOT_BE_CODE).get_table();
 	if(!table) 
 		throw Exception(0,
 			0,
@@ -905,7 +905,7 @@ static void _replace(Request& r, MethodP
 static void _polyline(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=params.as_no_junction(1, "coordinates must not be code").get_table();
+	Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table();
 	if(!table) 
 		throw Exception(0,
 			0,
@@ -922,7 +922,7 @@ static void _polyline(Request& r, Method
 static void _polygon(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=params.as_no_junction(1, "coordinates must not be code").get_table();
+	Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table();
 	if(!table) 
 		throw Exception(0,
 			0,
@@ -938,9 +938,9 @@ static void _polygon(Request& r, MethodP
 static void _polybar(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=params.as_no_junction(1, "coordinates must not be code").get_table();
+	Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table();
 	if(!table) 
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"coordinates must be table");
 
@@ -1020,7 +1020,7 @@ void Font::string_display(gdImage& image
 
 static void _font(Request& r, MethodParams& params) {
 	const String& alphabet=params.as_string(0, "alphabet must not be code");
-	gdImage* image=load(r, params.as_string(1, "file_name must not be code"));
+	gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE));
 	int spacebar_width=params.as_int(2, "spacebar_width must be int", r);
 	int monospace_width;
 	if(params.count()>3) {
@@ -1031,12 +1031,12 @@ static void _font(Request& r, MethodPara
 		monospace_width=0;
 
 	if(!alphabet.length())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"alphabet must not be empty");
 
 	if(int remainder=image->SY() % alphabet.length())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"font-file height(%d) not divisable by alphabet size(%d), remainder=%d",
 				image->SY(), alphabet.length(), remainder);
@@ -1109,7 +1109,7 @@ gdImage& as_image(MethodParams& params,
 	if(Value* vimage=value.as(VIMAGE_TYPE, false)) {
 		return static_cast<VImage *>(vimage)->image();
 	} else
-		throw Exception("parser.runtime", 
+		throw Exception(PARSER_RUNTIME, 
 			0, 
 			msg);
 }