--- parser3/src/classes/image.C	2010/10/21 15:06:27	1.136
+++ parser3/src/classes/image.C	2012/06/15 06:13:10	1.141
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_IMAGE_C="$Date: 2010/10/21 15:06:27 $";
-
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
 	Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
@@ -17,11 +15,9 @@ static const char * const IDENT_IMAGE_C=
 */
 
 #include "pa_config_includes.h"
-
-#include "pa_vmethod_frame.h"
-
 #include "gif.h"
 
+#include "pa_vmethod_frame.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vfile.h"
@@ -29,6 +25,8 @@ static const char * const IDENT_IMAGE_C=
 #include "pa_vdate.h"
 #include "pa_table.h"
 
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.141 2012/06/15 06:13:10 misha Exp $";
+
 // defines
 
 static const String spacebar_width_name("space");
@@ -890,18 +888,18 @@ static void _create(Request& r, MethodPa
 static void _gif(Request& r, MethodParams& params) {
 	gdImage& image=GET_SELF(r, VImage).image();
 
-	const String *file_name=0;
-	if(params.count()>0)
-		file_name=&params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String *file_name=params.count()>0?&params.as_string(0, FILE_NAME_MUST_BE_STRING):0;
 
 	gdBuf buf=image.Gif();
 	
 	VFile& vfile=*new VFile;
-	Value* content_type=new VString(*new String("image/gif"));
-	vfile.set(false/*not tainted*/, 
-		(const char*)buf.ptr, buf.size, 
-		file_name? file_name->taint_cstr(String::L_FILE_SPEC): 0, 
-		content_type);
+
+	vfile.set(false/*not tainted*/,
+		false/*binary*/,
+		(char*)buf.ptr,
+		buf.size,
+		file_name,
+		new VString(*new String("image/gif")));
 
 	r.write_no_lang(vfile);
 }
@@ -977,11 +975,7 @@ static void _replace(Request& r, MethodP
 	gdImage::Point* all_p=0;
 	size_t count=0;
 	if(params.count() == 3){
-		Table* table=params.as_no_junction(2, COORDINATES_MUST_NOT_BE_CODE).get_table();
-		if(!table) 
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"coordinates must be table");
+		Table* table=params.as_table(2, "coordinates");
 		count=table->count();
 		all_p=new(PointerFreeGC) gdImage::Point[count];
 		gdImage::Point* add_p=all_p;
@@ -1007,11 +1001,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();
-	if(!table) 
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"coordinates must be table");
+	Table* table=params.as_table(1, "coordinates");
 
 	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
 	gdImage::Point *add_p=all_p;	
@@ -1024,11 +1014,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();
-	if(!table) 
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"coordinates must be table");
+	Table* table=(Table*)params.as_table(1, "coordinates");
 
 	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
 	gdImage::Point *add_p=all_p;	
@@ -1040,11 +1026,7 @@ 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();
-	if(!table) 
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"coordinates must be table");
+	Table* table=(Table*)params.as_table(1, "coordinates");
 
 	gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()];
 	gdImage::Point *add_p=all_p;