--- parser3/src/classes/image.C	2020/12/03 22:48:09	1.174
+++ parser3/src/classes/image.C	2020/12/23 15:01:13	1.181
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://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.174 2020/12/03 22:48:09 moko Exp $";
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.181 2020/12/23 15:01:13 moko Exp $";
 
 // defines
 
@@ -308,6 +308,7 @@ struct Measure_info {
 	Value** exif;
 	Value** xmp;
 	Charset* xmp_charset;
+	bool	video;
 };
 
 
@@ -447,7 +448,7 @@ static Value* parse_IFD_entry_formatted_
 	return result;
 }
 
-static Value* parse_IFD_entry_value(bool is_big, Measure_reader& reader, long tiff_base, JPG_Exif_IFD_entry& entry) {
+static Value* parse_IFD_entry_value(bool is_big, Measure_reader& reader, uint64_t tiff_base, JPG_Exif_IFD_entry& entry) {
 	size_t format2component_size[]={
 		0, // undefined
 		1, // unsigned byte
@@ -498,9 +499,9 @@ static Value* parse_IFD_entry_value(bool
 	return result;
 }
 
-static void parse_IFD(HashStringValue& hash, bool is_big, Measure_reader& reader, long tiff_base, bool gps=false);
+static void parse_IFD(HashStringValue& hash, bool is_big, Measure_reader& reader, uint64_t tiff_base, bool gps=false);
 
-static void parse_IFD_entry(HashStringValue& hash, bool is_big, Measure_reader& reader, long tiff_base, JPG_Exif_IFD_entry& entry, bool gps=false) {
+static void parse_IFD_entry(HashStringValue& hash, bool is_big, Measure_reader& reader, uint64_t tiff_base, JPG_Exif_IFD_entry& entry, bool gps=false) {
 	ushort tag=endian_to_ushort(is_big, entry.tag);
 
 	if(tag==JPG_IFD_TAG_EXIF_OFFSET || tag==JPG_IFD_TAG_EXIF_GPS_OFFSET){
@@ -521,7 +522,7 @@ static void parse_IFD_entry(HashStringVa
 	}
 }
 
-static void parse_IFD(HashStringValue& hash, bool is_big, Measure_reader& reader, long tiff_base, bool gps) {
+static void parse_IFD(HashStringValue& hash, bool is_big, Measure_reader& reader, uint64_t tiff_base, bool gps) {
 	const char* buf;
 	if(reader.read(buf, sizeof(JPG_Exif_IFD_begin))<sizeof(JPG_Exif_IFD_begin))
 		return;
@@ -540,7 +541,7 @@ static void parse_IFD(HashStringValue& h
 static Value* parse_exif(Measure_reader& reader) {
 	const char* buf;
 
-	uint tiff_base=reader.tell();
+	uint64_t tiff_base=reader.tell();
 	if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))<sizeof(JPG_Exif_TIFF_header))
 		return 0;
 
@@ -586,7 +587,7 @@ static void measure_jpeg(const String& o
 		throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - wrong signature");
 
 	while(true) {
-		uint segment_base=reader.tell()+2/*marker,code*/;
+		uint64_t segment_base=reader.tell()+2/*marker,code*/;
 		if(reader.read(buf, sizeof(JPG_Segment_head))<sizeof(JPG_Segment_head))
 			break;
 		JPG_Segment_head *head=(JPG_Segment_head *)buf;
@@ -667,7 +668,7 @@ static bool parse_tiff_IFD(bool is_big,
 			if(entry_format != 3 && entry_format != 4 || endian_to_uint(is_big, entry->components_count) != 1)
 				return false;
 			uint value = (entry_format == 3) ? endian_to_ushort(is_big, entry->value_or_offset_to_it) : endian_to_uint(is_big, entry->value_or_offset_to_it);
-			(entry_tag == 256) ? info.width=value : info.height=value;
+			(entry_tag == 256) ? info.width=(short)value : info.height=(short)value;
 			if(info.width && info.height)
 				return true;
 		}
@@ -955,11 +956,14 @@ static void measure(const String& file_n
 		else if(strcasecmp(cext, "TIF")==0 || strcasecmp(cext, "TIFF")==0)
 			measure_tiff(file_name, reader, info);
 		else if(strcasecmp(cext, "MP4")==0 || strcasecmp(cext, "MOV")==0)
-			measure_mp4(file_name, reader, info.width, info.height);
+			if(info.video)
+				measure_mp4(file_name, reader, info.width, info.height);
+			else
+				throw Exception(IMAGE_FORMAT, &file_name, "handling disabled for file name extension '%s'", cext);
 		else
-			throw Exception(IMAGE_FORMAT, &file_name, "unhandled image file name extension '%s'", cext);
+			throw Exception(IMAGE_FORMAT, &file_name, "unhandled file name extension '%s'", cext);
 	} else
-		throw Exception(IMAGE_FORMAT, &file_name, "can not determine image type - no file name extension");
+		throw Exception(IMAGE_FORMAT, &file_name, "can not determine file type - no file name extension");
 }
 
 // methods
@@ -974,7 +978,7 @@ static void _measure(Request& r, MethodP
 
 	Value* exif=0;
 	Value* xmp=0;
-	Measure_info info={ 0, 0, 0, 0, &pa_UTF8_charset };
+	Measure_info info={ 0, 0, 0, 0, &pa_UTF8_charset, false };
 
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_hash(1, "methods options")) {
@@ -996,6 +1000,10 @@ static void _measure(Request& r, MethodP
 					info.xmp_charset=&pa_charsets.get(value->as_string());
 					valid_options++;
 				}
+				if(key == "video") {
+					info.video=r.process(*value).as_bool();
+					valid_options++;
+				}
 			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -1175,11 +1183,12 @@ static void _replace(Request& r, MethodP
 	gdImage::Point* all_p=0;
 	size_t count=0;
 	if(params.count() == 3){
-		Table* table=params.as_table(2, "coordinates");
-		count=table->count();
-		all_p=new(PointerFreeGC) gdImage::Point[count];
-		gdImage::Point* add_p=all_p;
-		table->for_each(add_point, &add_p);
+		if(Table* table=params.as_table(2, "coordinates")){
+			count=table->count();
+			all_p=new(PointerFreeGC) gdImage::Point[count];
+			gdImage::Point* add_p=all_p;
+			table->for_each(add_point, &add_p);
+		}
 	} else {
 		int max_x=image.SX()-1;
 		int max_y=image.SY()-1;
@@ -1201,38 +1210,34 @@ static void _replace(Request& r, MethodP
 static void _polyline(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=params.as_table(1, "coordinates");
-
-	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
-	gdImage::Point *add_p=all_p;	
-	table->for_each(add_point, &add_p);
-	image.Polygon(all_p, table->count(), 
-		image.Color(params.as_int(0, "color must be int", r)),
-		false/*not closed*/);
+	if(Table* table=params.as_table(1, "coordinates")){
+		gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
+		gdImage::Point *add_p=all_p;
+		table->for_each(add_point, &add_p);
+		image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r)), false/*not closed*/);
+	}
 }
 
 static void _polygon(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=(Table*)params.as_table(1, "coordinates");
-
-	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
-	gdImage::Point *add_p=all_p;	
-	table->for_each(add_point, &add_p);
-	image.Polygon(all_p, table->count(), 
-		image.Color(params.as_int(0, "color must be int", r)));
+	if(Table* table=(Table*)params.as_table(1, "coordinates")){
+		gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
+		gdImage::Point *add_p=all_p;
+		table->for_each(add_point, &add_p);
+		image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r)));
+	}
 }
 
 static void _polybar(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	Table* table=(Table*)params.as_table(1, "coordinates");
-
-	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
-	gdImage::Point *add_p=all_p;	
-	table->for_each(add_point, &add_p);
-	image.FilledPolygon(all_p, table->count(), 
-		image.Color(params.as_int(0, "color must be int", r)));
+	if(Table* table=(Table*)params.as_table(1, "coordinates")){
+		gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
+		gdImage::Point *add_p=all_p;
+		table->for_each(add_point, &add_p);
+		image.FilledPolygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r)));
+	}
 }
 
 // font