--- parser3/src/classes/image.C	2016/10/26 19:10:31	1.155
+++ parser3/src/classes/image.C	2017/02/06 16:17:12	1.159
@@ -25,7 +25,7 @@
 #include "pa_vdate.h"
 #include "pa_table.h"
 
-volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.155 2016/10/26 19:10:31 moko Exp $";
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.159 2017/02/06 16:17:12 moko Exp $";
 
 // defines
 
@@ -527,7 +527,7 @@ static Value* parse_IFD_entry_value(bool
 		{
 			reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it), SEEK_SET);
 			const char* value;
-			if(reader.read(value, value_size)<sizeof(value_size))
+			if(reader.read(value, value_size)<value_size)
 				return 0;
 			result=parse_IFD_entry_formatted_value(is_big, format, component_size, components_count, (const uchar*)value);
 		}
@@ -781,13 +781,13 @@ static void _html(Request& r, MethodPara
 		fields.for_each<Attrib_info*>(append_attrib_pair, &info);
 	}
 	tag << " />";
-	r.write_pass_lang(tag);
+	r.write(tag);
 }
 
 /// @test wrap FILE to auto-object
 static gdImage* load(Request& r, const String& file_name){
 	const char* file_name_cstr=r.absolute(file_name).taint_cstr(String::L_FILE_SPEC);
-	if(FILE *f=fopen(file_name_cstr, "rb")) {
+	if(FILE *f=pa_fopen(file_name_cstr, "rb")) {
 		gdImage* image=new gdImage;
 		bool ok=image->CreateFromGif(f);
 		fclose(f);
@@ -830,7 +830,7 @@ static void _gif(Request& r, MethodParam
 
 	vfile.set_binary(false/*not tainted*/, (const char *)buf.ptr, buf.size, file_name, new VString(*new String("image/gif")));
 
-	r.write_no_lang(vfile);
+	r.write(vfile);
 }
 
 static void _line(Request& r, MethodParams& params) {
@@ -967,13 +967,13 @@ static void _polybar(Request& r, MethodP
 // Font class
 
 Font::Font(Charset& asource_charset, const String& aalphabet, gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing):
-	fsource_charset(asource_charset),
+	letterspacing(aletterspacing),
 	height(aheight),
 	monospace(amonospace),
 	spacebarspace(aspacebarspace),
-	letterspacing(aletterspacing),
 	ifont(aifont),
-	alphabet(aalphabet)	{
+	alphabet(aalphabet),
+	fsource_charset(asource_charset){
 
 	if(fsource_charset.isUTF8()){
 		size_t index=0;
@@ -1117,7 +1117,7 @@ static void _length(Request& r, MethodPa
 	const String& s=params.as_string(0, "text must not be code");
 
 	VImage& vimage=GET_SELF(r, VImage);
-	r.write_no_lang(*new VInt(vimage.font().string_width(s)));
+	r.write(*new VInt(vimage.font().string_width(s)));
 }
 
 static void _arc(Request& r, MethodParams& params) {
@@ -1202,7 +1202,7 @@ static void _pixel(Request& r, MethodPar
 		image.SetPixel(x, y, 
 			image.Color(params.as_int(2, "color must be int", r)));
 	} else 
-		r.write_no_lang(*new VInt(image.DecodeColor(image.GetPixel(x, y))));
+		r.write(*new VInt(image.DecodeColor(image.GetPixel(x, y))));
 }