--- parser3/src/classes/image.C	2003/11/20 16:34:23	1.99
+++ parser3/src/classes/image.C	2004/02/19 15:38:00	1.107
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_IMAGE_C="$Date: 2003/11/20 16:34:23 $";
+static const char * const IDENT_IMAGE_C="$Date: 2004/02/19 15:38:00 $";
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -161,8 +161,6 @@ public:
 };
 
 class Measure_file_reader: public Measure_reader {
-
-	;
 	const String& file_name; const char* fname;
 	int f;
 
@@ -180,7 +178,7 @@ public:
 		if(ssize_t(read_size)<0 || read_size>limit)
 			throw Exception(0,
 				&file_name, 
-				"measure failed: actually read %lu bytes count not in [0..%lu] valid range", 
+				"measure failed: actually read %u bytes count not in [0..%u] valid range", 
 			read_size, limit);
 
 		return read_size;
@@ -331,7 +329,7 @@ static void measure_gif(const String& or
 			 Measure_reader& reader, ushort& width, ushort& height) {
 
 	const char* buf;
-	const int head_size=sizeof(GIF_Header);
+	const size_t head_size=sizeof(GIF_Header);
 	if(reader.read(buf, head_size)<head_size)
 		throw Exception("image.format", 
 			&origin_string, 
@@ -394,7 +392,7 @@ static Value* parse_IFD_entry_formatted_
 }
 
 // date.C
-time_t cstr_to_time_t(char *cstr, bool fail_on_error);
+tm cstr_to_time_t(char *cstr);
 
 static Value* parse_IFD_entry_formatted_value(bool is_big, ushort format, 
 					      size_t component_size, uint components_count, 
@@ -409,10 +407,10 @@ static Value* parse_IFD_entry_formatted_
 			char cstr_writable[JPEG_EXIF_DATE_CHARS]; 
 			strcpy(cstr_writable, cstr);
 
-			time_t t=cstr_to_time_t(cstr_writable, 
-				false/* do not throw exception, just return bad result */);
-			if(t>=0)
-				return new VDate(t);
+			try {
+				return new VDate(cstr_to_time_t(cstr_writable));
+			}
+			catch(...) { /*ignore bad date times*/ }
 		}
 
 		if(const char* premature_zero_pos=(const char* )memchr(cstr, 0, length))
@@ -637,7 +635,7 @@ static void measure_png(const String& or
 			 Measure_reader& reader, ushort& width, ushort& height) {
 
 	const char* buf;
-	const int head_size=sizeof(PNG_Header);
+	const size_t head_size=sizeof(PNG_Header);
 	if(reader.read(buf, head_size)<head_size)
 		throw Exception("image.format", 
 			&origin_string, 
@@ -703,12 +701,12 @@ static void _measure(Request& r, MethodP
 	ushort height=0;
 	Value* exif=0;
 	const String* file_name;
-	if(file_name=data.get_string()) {
-		File_measure_action_info info={0};
-		info.width=&width;
-		info.height=&height;
-		info.exif=&exif;
-		info.file_name=file_name;
+	if((file_name=data.get_string())) {
+		File_measure_action_info info={
+			&width, &height,
+			&exif,
+			file_name
+		};
 		file_read_action_under_lock(r.absolute(*file_name), 
 			"measure", file_measure_action, &info);
 	} else {
@@ -755,11 +753,10 @@ static void _html(Request& r, MethodPara
 	if(params.count()) {
 		// for backward compatibility: someday was ^html{}
 		Value& vattribs=r.process_to_value(params[0],
-			/*0/*no name* /,*/
 			false/*don't intercept string*/);
 		if(!vattribs.is_string()) // allow empty
-			if(attribs=vattribs.get_hash()) {
-				Attrib_info info={&tag};
+			if((attribs=vattribs.get_hash())) {
+				Attrib_info info={&tag, 0};
 				attribs->for_each(append_attrib_pair, &info);
 			} else
 				throw Exception("parser.runtime", 
@@ -997,9 +994,9 @@ const int Font::letter_spacing=1;
 Font::Font(//, 
 	const String& aalphabet, 
 	gdImage* aifont, int aheight, int amonospace, int aspacebarspace):
-	alphabet(aalphabet), 
 	height(aheight), monospace(amonospace),  spacebarspace(aspacebarspace),
-	ifont(aifont) {
+	ifont(aifont),
+	alphabet(aalphabet)	{
 }
 
 /* ******************************** char ********************************** */