--- parser3/src/classes/image.C	2016/11/01 23:10:40	1.157
+++ 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.157 2016/11/01 23:10:40 moko Exp $";
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.159 2017/02/06 16:17:12 moko Exp $";
 
 // defines
 
@@ -787,7 +787,7 @@ static void _html(Request& r, MethodPara
 /// @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);
@@ -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;