--- parser3/src/classes/image.C	2024/09/11 21:07:36	1.185
+++ parser3/src/classes/image.C	2026/04/25 13:38:46	1.199
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
@@ -26,7 +26,7 @@
 #include "pa_table.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.185 2024/09/11 21:07:36 moko Exp $";
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.199 2026/04/25 13:38:46 moko Exp $";
 
 // defines
 
@@ -189,7 +189,14 @@ public:
 		EXIF_TAG(0xa434,	LensModel);
 		EXIF_TAG(0xa435,	LensSerialNumber);
 	}
-} exif_tag_value2name;
+
+	static EXIF_tag_value2name &instance(){
+		static EXIF_tag_value2name *singleton=NULL;
+		if(!singleton)
+			singleton=new EXIF_tag_value2name;
+		return *singleton;
+	}
+};
 
 class EXIF_gps_tag_value2name: public Hash<int, const char*> {
 public:
@@ -226,7 +233,15 @@ public:
 		EXIF_TAG(0x1D,	GPSDateStamp);
 		EXIF_TAG(0x1E,	GPSDifferential);
 	}
-} exif_gps_tag_value2name;
+
+	static EXIF_gps_tag_value2name &instance(){
+		static EXIF_gps_tag_value2name *singleton=NULL;
+		if(!singleton)
+			singleton=new EXIF_gps_tag_value2name;
+		return *singleton;
+	}
+
+};
 
 
 ///*********************************************** support functions
@@ -428,7 +443,7 @@ static Value* parse_IFD_entry_formatted_
 			catch(...) { /*ignore bad date times*/ }
 		}
 
-		return new VString(*new String(cstr, String::L_TAINTED));
+		return new VString(cstr);
 	}
 
 	if(components_count==1)
@@ -438,7 +453,7 @@ static Value* parse_IFD_entry_formatted_
 	HashStringValue& hash=result->hash();
 	for(uint i=0; i<components_count; i++, value+=component_size) {
 		hash.put(
-			pa_uitoa(i),
+			String::Body::uitoa(i),
 			parse_IFD_entry_formatted_one_value(is_big, format, component_size, value));
 	}
 
@@ -512,10 +527,10 @@ static void parse_IFD_entry(HashStringVa
 	}
 
 	if(Value* value=parse_IFD_entry_value(is_big, reader, tiff_base, entry)) {
-		if(const char* name=(gps)?exif_gps_tag_value2name.get(tag):exif_tag_value2name.get(tag))
+		if(const char* name=(gps ? EXIF_gps_tag_value2name::instance().get(tag) : EXIF_tag_value2name::instance().get(tag)))
 			hash.put(name, value);
 		else
-			hash.put(pa_uitoa(tag), value);
+			hash.put(String::Body::uitoa((int)tag), value);
 	}
 }
 
@@ -629,7 +644,7 @@ static void measure_jpeg(const String& o
 			{
 				// Segments that contain size info
 				if(reader.read(buf, sizeof(JPG_Size_segment_body))<sizeof(JPG_Size_segment_body))
-					throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - can not fully read Size segment");
+					throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - cannot fully read Size segment");
 				JPG_Size_segment_body *body=(JPG_Size_segment_body *)buf;
 				
 				info.width=endian_to_ushort(true, body->width);
@@ -960,7 +975,7 @@ static void measure(const String& file_n
 		else
 			throw Exception(IMAGE_FORMAT, &file_name, "unhandled file name extension '%s'", cext);
 	} else
-		throw Exception(IMAGE_FORMAT, &file_name, "can not determine file type - no file name extension");
+		throw Exception(IMAGE_FORMAT, &file_name, "cannot determine file type - no file name extension");
 }
 
 // methods
@@ -979,31 +994,22 @@ static void _measure(Request& r, MethodP
 
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_hash(1, "methods options")) {
-			int valid_options=0;
 			for(HashStringValue::Iterator i(*options); i; i.next() ){
 				String::Body key=i.key();
 				Value* value=i.value();
 				if(key == "exif") {
 					if(r.process(*value).as_bool())
 						info.exif=&exif;
-					valid_options++;
-				}
-				if(key == "xmp") {
+				} else if(key == "xmp") {
 					if(r.process(*value).as_bool())
 						info.xmp=&xmp;
-					valid_options++;
-				}
-				if(key == "xmp-charset") {
+				} else if(key == "xmp-charset") {
 					info.xmp_charset=&pa_charsets.get(value->as_string());
-					valid_options++;
-				}
-				if(key == "video") {
+				} else if(key == "video") {
 					info.video=r.process(*value).as_bool();
-					valid_options++;
-				}
+				} else
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
-			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
 
 	const String* file_name;
@@ -1075,13 +1081,13 @@ static gdImage* load(Request& r, const S
 			throw Exception(IMAGE_FORMAT, &file_name, "is not in GIF format");
 		return image;
 	} else {
-		throw Exception("file.missing", 0, "can not open '%s'", file_name_cstr);
+		throw Exception("file.missing", 0, "cannot open '%s'", file_name_cstr);
 	}
 }
 
 
 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_file_name(0);
 
 	gdImage* image=load(r, file_name);
 	GET_SELF(r, VImage).set(&file_name, image->SX(), image->SY(), image);
@@ -1332,12 +1338,12 @@ 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");
+	const String& alphabet=params.as_string(0, "alphabet must be string");
 	size_t alphabet_length=alphabet.length(r.charsets.source());
 	if(!alphabet_length)
 		throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty");
 
-	gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE));
+	gdImage* image=load(r, params.as_file_name(1));
 
 	int spacebar_width=image->SX();
 	int monospace_width=0; // proportional
@@ -1384,14 +1390,14 @@ static void _font(Request& r, MethodPara
 static void _text(Request& r, MethodParams& params) {
 	int x=params.as_int(0, "x must be int", r);
 	int y=params.as_int(1, "y must be int", r);
-	const String& s=params.as_string(2, "text must not be code");
+	const String& s=params.as_string(2, "text must be string");
 
 	VImage& vimage=GET_SELF(r, VImage);
 	vimage.font().string_display(vimage.image(), x, y, s);
 }
 
 static void _length(Request& r, MethodParams& params) {
-	const String& s=params.as_string(0, "text must not be code");
+	const String& s=params.as_string(0, "text must be string");
 
 	VImage& vimage=GET_SELF(r, VImage);
 	r.write(*new VInt(vimage.font().string_width(s)));
@@ -1440,8 +1446,8 @@ 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)) {
-		return static_cast<VImage *>(vimage)->image();
+	if(VImage* vimage=dynamic_cast<VImage *>(&value)) {
+		return vimage->image();
 	} else
 		throw Exception(PARSER_RUNTIME, 0, msg);
 }