--- parser3/src/classes/image.C	2009/06/25 08:44:36	1.126
+++ parser3/src/classes/image.C	2009/10/03 02:15:02	1.131
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_IMAGE_C="$Date: 2009/06/25 08:44:36 $";
+static const char * const IDENT_IMAGE_C="$Date: 2009/10/03 02:15:02 $";
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -39,7 +39,7 @@ static const String letter_spacing_name(
 
 class MImage: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue*) { return new VImage(); }
+	Value* create_new_value(Pool&) { return new VImage(); }
 
 public:
 	MImage();
@@ -731,7 +731,7 @@ static void measure_png(const String& or
 
 static void measure(const String& file_name, 
 			 Measure_reader& reader, ushort& width, ushort& height, Value** exif) {
-	const char* file_name_cstr=file_name.cstr(String::L_FILE_SPEC);
+	const char* file_name_cstr=file_name.taint_cstr(String::L_FILE_SPEC);
 	if(const char* cext=strrchr(file_name_cstr, '.')) {
 		cext++;
 		if(strcasecmp(cext, "GIF")==0)
@@ -786,7 +786,7 @@ static void _measure(Request& r, MethodP
 		file_read_action_under_lock(r.absolute(*file_name), 
 			"measure", file_measure_action, &info);
 	} else {
-		VFile* vfile=data.as_vfile();
+		VFile* vfile=data.as_vfile(String::L_AS_IS);
 		file_name=&vfile->fields().get(name_name)->as_string();
 		Measure_buf_reader reader(
 			vfile->value_ptr(),
@@ -851,7 +851,7 @@ static void _html(Request& r, MethodPara
 /// @test wrap FILE to auto-object
 static gdImage* load(Request& r, 
 					 const String& file_name){
-	const char* file_name_cstr=r.absolute(file_name).cstr(String::L_FILE_SPEC);
+	const char* file_name_cstr=r.absolute(file_name).taint_cstr(String::L_FILE_SPEC);
 	if(FILE *f=fopen(file_name_cstr, "rb")) {
 		gdImage* image=new gdImage;
 		bool ok=image->CreateFromGif(f);
@@ -901,7 +901,7 @@ static void _gif(Request& r, MethodParam
 	Value* content_type=new VString(*new String("image/gif"));
 	vfile.set(false/*not tainted*/, 
 		(const char*)buf.ptr, buf.size, 
-		file_name? file_name->cstr(String::L_FILE_SPEC): 0, 
+		file_name? file_name->taint_cstr(String::L_FILE_SPEC): 0, 
 		content_type);
 
 	r.write_no_lang(vfile);
@@ -1095,7 +1095,8 @@ 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");
-	if(!alphabet.length())
+	size_t alphabet_length=alphabet.length(r.charsets.source());
+	if(!alphabet_length)
 		throw Exception(PARSER_RUNTIME,
 			0,
 			"alphabet must not be empty");
@@ -1142,16 +1143,16 @@ static void _font(Request& r, MethodPara
 		}
 	}
 
-	if(int remainder=image->SY() % alphabet.length())
+	if(int remainder=image->SY() % alphabet_length)
 		throw Exception(PARSER_RUNTIME,
 			0,
 			"font-file height(%d) not divisable by alphabet size(%d), remainder=%d",
-				image->SY(), alphabet.length(), remainder);
+				image->SY(), alphabet_length, remainder);
 	
 	GET_SELF(r, VImage).set_font(new Font(
 		alphabet, 
 		image, 
-		image->SY() / alphabet.length(), monospace_width, spacebar_width, letter_spacing));
+		image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing));
 }
 
 static void _text(Request& r, MethodParams& params) {
@@ -1213,7 +1214,7 @@ static void _circle(Request& r, MethodPa
 gdImage& as_image(MethodParams& params, int index, const char* msg) {
 	Value& value=params.as_no_junction(index, msg);
 
-	if(Value* vimage=value.as(VIMAGE_TYPE, false)) {
+	if(Value* vimage=value.as(VIMAGE_TYPE)) {
 		return static_cast<VImage *>(vimage)->image();
 	} else
 		throw Exception(PARSER_RUNTIME,