--- parser3/src/classes/image.C 2009/06/14 00:33:36 1.124 +++ parser3/src/classes/image.C 2017/02/06 16:17:12 1.159 @@ -1,12 +1,10 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_IMAGE_C="$Date: 2009/06/14 00:33:36 $"; - /* 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,23 +25,27 @@ 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.159 2017/02/06 16:17:12 moko Exp $"; + +// defines + +static const String spacebar_width_name("space"); +static const String monospace_width_name("width"); +static const String letter_spacing_name("spacing"); + // class class MImage: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue*) { return new VImage(); } + Value* create_new_value(Pool&) { return new VImage(); } public: MImage(); - -public: // Methoded - bool used_directly() { return true; } - }; // globals -DECLARE_CLASS_VAR(image, new MImage, 0); +DECLARE_CLASS_VAR(image, new MImage); // helpers @@ -179,6 +179,14 @@ public: EXIF_TAG(0xa40b, DeviceSettingDescription); EXIF_TAG(0xa40c, SubjectDistanceRange); EXIF_TAG(0xa420, ImageUniqueID); + + // other tags + EXIF_TAG(0xa430, CameraOwnerName); + EXIF_TAG(0xa431, BodySerialNumber); + EXIF_TAG(0xa432, LensSpecification); + EXIF_TAG(0xa433, LensManufactor); + EXIF_TAG(0xa434, LensModel); + EXIF_TAG(0xa435, LensSerialNumber); } } exif_tag_value2name; @@ -230,12 +238,12 @@ public: }; class Measure_file_reader: public Measure_reader { - const String& file_name; const char* fname; + const String& file_name; int f; public: - Measure_file_reader(int af, const String& afile_name, const char* afname): - file_name(afile_name), fname(afname), f(af) { + Measure_file_reader(int af, const String& afile_name): + file_name(afile_name), f(af) { } override size_t read(const char* &abuf, size_t limit) { @@ -243,22 +251,15 @@ public: return 0; char* lbuf=new(PointerFreeGC) char[limit]; - size_t read_size=(size_t)::read(f, lbuf, limit); abuf=lbuf; - if(ssize_t(read_size)<0 || read_size>limit) - throw Exception(0, - &file_name, - "measure failed: actually read %u bytes count not in [0..%u] valid range", - read_size, limit); - + ssize_t read_size=::read(f, lbuf, limit); abuf=lbuf; + if(read_size<0) + throw Exception(0, &file_name, "measure read failed: %s (%d)", strerror(errno), errno); return read_size; } override void seek(long value, int whence) { if(lseek(f, value, whence)<0) - throw Exception(IMAGE_FORMAT, - &file_name, - "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", - value, whence, strerror(errno), errno, fname); + throw Exception(IMAGE_FORMAT, &file_name, "seek(value=%ld, whence=%d) failed: %s (%d)", value, whence, strerror(errno), errno); } override long tell() { return lseek(f, 0, SEEK_CUR); } @@ -290,16 +291,12 @@ public: case SEEK_CUR: new_offset=offset+value; break; case SEEK_SET: new_offset=(size_t)value; break; default: - throw Exception(0, - 0, - "whence #%d not supported", 0, whence); + throw Exception(0, 0, "whence #%d not supported", 0, whence); break; // never } if((ssize_t)new_offset<0 || new_offset>size) - throw Exception(IMAGE_FORMAT, - &file_name, - "seek(value=%l, whence=%d) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", + throw Exception(IMAGE_FORMAT, &file_name, "seek(value=%l, whence=%d) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", value, whence, new_offset, size); offset=new_offset; } @@ -396,31 +393,22 @@ inline uint endian_to_uint(bool is_big, x_endian_to_uint(b[0], b[1], b[2], b[3]); } -static void measure_gif(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height) { +static void measure_gif(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { const char* buf; const size_t head_size=sizeof(GIF_Header); if(reader.read(buf, head_size)signature, "GIF", 3)!=0) - throw Exception(IMAGE_FORMAT, - &origin_string, - "not GIF file - wrong signature"); + throw Exception(IMAGE_FORMAT, &origin_string, "not GIF file - wrong signature"); width=endian_to_ushort(false, head->width); height=endian_to_ushort(false, head->height); } -static Value* parse_IFD_entry_formatted_one_value( - bool is_big, - ushort format, - size_t component_size, - const uchar *value) { +static Value* parse_IFD_entry_formatted_one_value(bool is_big, ushort format, size_t component_size, const uchar *value) { switch(format) { case 1: // unsigned byte return new VInt((uchar)value[0]); @@ -463,23 +451,20 @@ static Value* parse_IFD_entry_formatted_ } // date.C -tm cstr_to_time_t(char *cstr); +tm cstr_to_time_t(char *, const char **); -static Value* parse_IFD_entry_formatted_value(bool is_big, ushort format, - size_t component_size, uint components_count, - const uchar *value) { +static Value* parse_IFD_entry_formatted_value(bool is_big, ushort format, size_t component_size, uint components_count, const uchar *value) { if(format==2) { // ascii string, exception: the only type with varying size const char* cstr=(const char* )value; size_t length=components_count; // Data format is "YYYY:MM:DD HH:MM:SS"+0x00, total 20bytes - if(length==JPEG_EXIF_DATE_CHARS - && isdigit((unsigned char)cstr[0]) - && cstr[length-1]==0) { - char cstr_writable[JPEG_EXIF_DATE_CHARS]; + if(length==JPEG_EXIF_DATE_CHARS && isdigit((unsigned char)cstr[0]) && cstr[length-1]==0) { + char cstr_writable[JPEG_EXIF_DATE_CHARS]; strcpy(cstr_writable, cstr); try { - return new VDate(cstr_to_time_t(cstr_writable)); + tm tmIn=cstr_to_time_t(cstr_writable, 0); + return new VDate(tmIn); } catch(...) { /*ignore bad date times*/ } } @@ -501,9 +486,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, long tiff_base, JPG_Exif_IFD_entry& entry) { size_t format2component_size[]={ 0, // undefined 1, // unsigned byte @@ -538,21 +521,15 @@ static Value* parse_IFD_entry_value( Value* result; if(value_size<=4) - result=parse_IFD_entry_formatted_value( - is_big, format, - component_size, components_count, - entry.value_or_offset_to_it); + result=parse_IFD_entry_formatted_value(is_big, format, component_size, components_count, entry.value_or_offset_to_it); else { long remembered=reader.tell(); { 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)signature, "Exif\0\0", 4+2)!=0) //signature invalid? @@ -633,8 +603,7 @@ static Value* parse_exif(Measure_reader& return vhash; } -static void measure_jpeg(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height, Value** exif) { +static void measure_jpeg(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height, Value** exif) { // JFIF format markers const uchar MARKER=0xFF; const uchar CODE_SIZE_A=0xC0; @@ -646,15 +615,11 @@ static void measure_jpeg(const String& o const char* buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)marker!=MARKER) - throw Exception(IMAGE_FORMAT, - &origin_string, - "not JPEG file - marker not found"); + throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - marker not found"); switch(head->code) { // http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html @@ -682,9 +645,7 @@ static void measure_jpeg(const String& o { // Segments that contain size info if(reader.read(buf, sizeof(JPG_Size_segment_body))width); @@ -696,26 +657,19 @@ static void measure_jpeg(const String& o reader.seek(segment_base+endian_to_ushort(true, head->length), SEEK_SET); } - throw Exception(IMAGE_FORMAT, - &origin_string, - "broken JPEG file - size frame not found"); + throw Exception(IMAGE_FORMAT, &origin_string, "broken JPEG file - size frame not found"); } -static void measure_png(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height) { +static void measure_png(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { const char* buf; const size_t head_size=sizeof(PNG_Header); if(reader.read(buf, head_size)signature, "IHDR", 4)!=0) - throw Exception(IMAGE_FORMAT, - &origin_string, - "not PNG file - wrong signature"); + throw Exception(IMAGE_FORMAT, &origin_string, "not PNG file - wrong signature"); width=endian_to_ushort(true, head->width); height=endian_to_ushort(true, head->height); @@ -723,9 +677,8 @@ static void measure_png(const String& or // measure center -static void measure(const String& file_name, - Measure_reader& reader, ushort& width, ushort& height, Value** exif) { - const char* file_name_cstr=file_name.cstr(String::L_FILE_SPEC); +static void measure(const String& file_name, Measure_reader& reader, ushort& width, ushort& height, Value** exif) { + const char* file_name_cstr=file_name.taint_cstr(String::L_FILE_SPEC); if(const char* cext=strrchr(file_name_cstr, '.')) { cext++; if(strcasecmp(cext, "GIF")==0) @@ -735,13 +688,9 @@ static void measure(const String& file_n else if(strcasecmp(cext, "PNG")==0) measure_png(file_name, reader, width, height); else - throw Exception(IMAGE_FORMAT, - &file_name, - "unhandled image file name extension '%s'", cext); + throw Exception(IMAGE_FORMAT, &file_name, "unhandled image 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 image type - no file name extension"); } // methods @@ -751,17 +700,13 @@ struct File_measure_action_info { ushort* width; ushort* height; Value** exif; - const String* file_name; }; #endif -static void file_measure_action( - struct stat& /*finfo*/, int f, - const String& /*file_spec*/, const char* fname, bool /*as_text*/, - void *context) { +static void file_measure_action(struct stat& /*finfo*/, int f, const String& file_spec, void *context) { File_measure_action_info& info=*static_cast(context); - Measure_file_reader reader(f, *info.file_name, fname); - measure(*info.file_name, reader, *info.width, *info.height, info.exif); + Measure_file_reader reader(f, file_spec); + measure(file_spec, reader, *info.width, *info.height, info.exif); } static void _measure(Request& r, MethodParams& params) { @@ -774,13 +719,11 @@ static void _measure(Request& r, MethodP if((file_name=data.get_string())) { File_measure_action_info info={ &width, &height, - &exif, - file_name + &exif }; - file_read_action_under_lock(r.absolute(*file_name), - "measure", file_measure_action, &info); + file_read_action_under_lock(r.absolute(*file_name), "measure", file_measure_action, &info); } else { - VFile* vfile=data.as_vfile(); + VFile* vfile=data.as_vfile(String::L_AS_IS); file_name=&vfile->fields().get(name_name)->as_string(); Measure_buf_reader reader( vfile->value_ptr(), @@ -799,15 +742,16 @@ struct Attrib_info { HashStringValue* skip; ///< tag attributes not to append to tag string [to skip] }; #endif -static void append_attrib_pair( - HashStringValue::key_type key, - HashStringValue::value_type value, - Attrib_info* info) { - // skip user-specified and internal(starting with "line-") attributes - if(info->skip && info->skip->get(key) || key.pos("line-")==0) +static void append_attrib_pair(HashStringValue::key_type key, HashStringValue::value_type value, Attrib_info* info) { + // skip user-specified, internal(starting with "line-") attributes and border attribute with empty value + if( + (info->skip && info->skip->get(key)) + || key.pos("line-")==0 + || (key=="border" && !value->is_defined()) + ) return; - // src="a.gif" width=123 ismap[=-1] + // src="a.gif" width="123" ismap[=-1] *info->tag << " " << key; if(value->is_string() || value->as_int()>=0) *info->tag << "=\"" << value->as_string() << "\""; @@ -822,16 +766,14 @@ static void _html(Request& r, MethodPara if(params.count()) { // for backward compatibility: someday was ^html{} - Value& vattribs=r.process_to_value(params[0], - false/*don't intercept string*/); - if(!vattribs.is_string()) // allow empty + Value& vattribs=r.process(params[0]); + if(!vattribs.is_string()) { // allow empty if((attribs=vattribs.get_hash())) { Attrib_info info={&tag, 0}; attribs->for_each(append_attrib_pair, &info); } else - throw Exception(PARSER_RUNTIME, - 0, - "attributes must be hash"); + throw Exception(PARSER_RUNTIME, 0, "attributes must be hash"); + } } { @@ -839,26 +781,21 @@ static void _html(Request& r, MethodPara fields.for_each(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).cstr(String::L_FILE_SPEC); - if(FILE *f=fopen(file_name_cstr, "rb")) { +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=pa_fopen(file_name_cstr, "rb")) { gdImage* image=new gdImage; bool ok=image->CreateFromGif(f); fclose(f); if(!ok) - throw Exception(IMAGE_FORMAT, - &file_name, - "is not in GIF format"); + throw Exception(IMAGE_FORMAT, &file_name, "is not in GIF format"); return image; } else { - throw Exception("file.missing", - 0, - "can not open '%s'", file_name_cstr); + throw Exception("file.missing", 0, "can not open '%s'", file_name_cstr); } } @@ -885,20 +822,15 @@ 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=¶ms.as_string(0, FILE_NAME_MUST_BE_STRING); + const String *file_name=params.count()>0?¶ms.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->cstr(String::L_FILE_SPEC): 0, - content_type); - r.write_no_lang(vfile); + vfile.set_binary(false/*not tainted*/, (const char *)buf.ptr, buf.size, file_name, new VString(*new String("image/gif"))); + + r.write(vfile); } static void _line(Request& r, MethodParams& params) { @@ -944,42 +876,57 @@ static void _bar(Request& r, MethodParam } #ifndef DOXYGEN -static void add_point(Table::element_type row, - gdImage::Point **p) { +static void add_point(Table::element_type row, gdImage::Point **p) { if(row->count()!=2) - throw Exception(0, - 0, - "coordinates table must contain two columns: x and y values"); + throw Exception(0, 0, "coordinates table must contain two columns: x and y values"); (**p).x=row->get(0)->as_int(); (**p).y=row->get(1)->as_int(); (*p)++; } #endif +#ifndef DOXYGEN +static void add_point(int x, int y, gdImage::Point **p) { + (**p).x=x; + (**p).y=y; + (*p)++; +} +#endif static void _replace(Request& r, MethodParams& params) { + int src_color=params.as_int(0, "src color must be int", r); + int dest_color=params.as_int(1, "dest color must be int", r); + gdImage& image=GET_SELF(r, VImage).image(); - 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"); + 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); + } else { + int max_x=image.SX()-1; + int max_y=image.SY()-1; + if(max_x > 0 && max_y > 0){ + count=4; + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + add_point(0, 0, &add_p); + add_point(max_x, 0, &add_p); + add_point(max_x, max_y, &add_p); + add_point(0, max_y, &add_p); + } + } - gdImage::Point *all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.FilledPolygonReplaceColor(all_p, table->count(), - image.Color(params.as_int(0, "src color must be int", r)), - image.Color(params.as_int(1, "dest color must be int", r))); + if(count) + image.FilledPolygonReplaceColor(all_p, count, image.Color(src_color), image.Color(dest_color)); } 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; @@ -992,11 +939,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; @@ -1008,11 +951,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; @@ -1027,14 +966,20 @@ static void _polybar(Request& r, MethodP // Font class -const int Font::letter_spacing=1; - -Font::Font(//, - const String& aalphabet, - gdImage* aifont, int aheight, int amonospace, int aspacebarspace): - height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), +Font::Font(Charset& asource_charset, const String& aalphabet, gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing): + letterspacing(aletterspacing), + height(aheight), + monospace(amonospace), + spacebarspace(aspacebarspace), ifont(aifont), - alphabet(aalphabet) { + alphabet(aalphabet), + fsource_charset(asource_charset){ + + if(fsource_charset.isUTF8()){ + size_t index=0; + for(UTF8_string_iterator i(alphabet); i.has_next(); ) + fletter2index.put_dont_replace(i.next(), index++); + } } /* ******************************** char ********************************** */ @@ -1044,6 +989,11 @@ size_t Font::index_of(char ch) { return alphabet.pos(ch); } +size_t Font::index_of(XMLCh ch) { + if(ch==' ') return STRING_NOT_FOUND; + return fletter2index.get(ch); +} + int Font::index_width(size_t index) { if(index==STRING_NOT_FOUND) return spacebarspace; @@ -1064,24 +1014,40 @@ void Font::index_display(gdImage& image, /* ******************************** string ********************************** */ int Font::step_width(int index) { - return letter_spacing + (monospace ? monospace : index_width(index)); + return letterspacing + (monospace ? monospace : index_width(index)); } // counts trailing letter_spacing, consider this OK. useful for contiuations int Font::string_width(const String& s){ const char* cstr=s.cstr(); int result=0; - for(const char* current=cstr; *current; current++) - result+=step_width(index_of(*current)); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ) + result+=step_width(index_of(i.next())); + } else { + for(const char* current=cstr; *current; current++) + result+=step_width(index_of(*current)); + } + return result; } void Font::string_display(gdImage& image, int x, int y, const String& s){ const char* cstr=s.cstr(); - for(const char* current=cstr; *current; current++) { - size_t index=index_of(*current); - index_display(image, x, y, index); - x+=step_width(index); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ){ + size_t index=index_of(i.next()); + index_display(image, x, y, index); + x+=step_width(index); + } + } else { + for(const char* current=cstr; *current; current++) { + size_t index=index_of(*current); + index_display(image, x, y, index); + x+=step_width(index); + } } } @@ -1090,31 +1056,52 @@ void Font::string_display(gdImage& image static void _font(Request& r, MethodParams& params) { const String& alphabet=params.as_string(0, "alphabet must not be code"); + size_t alphabet_length=alphabet.length(r.charsets.source()); + if(!alphabet_length) + throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); + gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE)); - int spacebar_width=params.as_int(2, "spacebar_width must be int", r); - int monospace_width; - if(params.count()>3) { - monospace_width=params.as_int(3, "monospace_width must be int", r); - if(!monospace_width) - monospace_width=image->SX(); - } else - monospace_width=0; - if(!alphabet.length()) - throw Exception(PARSER_RUNTIME, - 0, - "alphabet must not be empty"); - - if(int remainder=image->SY() % alphabet.length()) - throw Exception(PARSER_RUNTIME, - 0, - "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", - image->SY(), alphabet.length(), remainder); + int spacebar_width=image->SX(); + int monospace_width=0; // proportional + int letter_spacing=1; + if(params.count()>2){ + if(HashStringValue* options=params[2].get_hash()){ + // third option is hash + if(params.count()>3) + throw Exception(PARSER_RUNTIME, 0, "too many params were specified"); + int valid_options=0; + if(Value* vspacebar_width=options->get(spacebar_width_name)){ + valid_options++; + spacebar_width=r.process(*vspacebar_width).as_int(); + } + if(Value* vmonospace_width=options->get(monospace_width_name)){ + valid_options++; + monospace_width=r.process(*vmonospace_width).as_int(); + if(!monospace_width) + monospace_width=image->SX(); + } + if(Value* vletter_spacing=options->get(letter_spacing_name)){ + valid_options++; + letter_spacing=r.process(*vletter_spacing).as_int(); + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } else { + // backward + spacebar_width=params.as_int(2, "param must be int or hash", r); + if(params.count()>3) { + monospace_width=params.as_int(3, "monospace_width must be int", r); + if(!monospace_width) + monospace_width=image->SX(); + } + } + } + + if(int remainder=image->SY() % alphabet_length) + throw Exception(PARSER_RUNTIME, 0, "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", image->SY(), alphabet_length, remainder); - GET_SELF(r, VImage).set_font(new Font( - alphabet, - image, - image->SY() / alphabet.length(), monospace_width, spacebar_width)); + GET_SELF(r, VImage).set_font(new Font(r.charsets.source(), alphabet, image, image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); } static void _text(Request& r, MethodParams& params) { @@ -1130,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) { @@ -1176,12 +1163,10 @@ static void _circle(Request& r, MethodPa gdImage& as_image(MethodParams& params, int index, const char* msg) { Value& value=params.as_no_junction(index, msg); - if(Value* vimage=value.as(VIMAGE_TYPE, false)) { + if(Value* vimage=value.as(VIMAGE_TYPE)) { return static_cast(vimage)->image(); } else - throw Exception(PARSER_RUNTIME, - 0, - msg); + throw Exception(PARSER_RUNTIME, 0, msg); } static void _copy(Request& r, MethodParams& params) { @@ -1217,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)))); } @@ -1254,7 +1239,8 @@ MImage::MImage(): Methoded("image") { add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); // ^image.replace(color-source;color-dest)[table x:y] - add_native_method("replace", Method::CT_DYNAMIC, _replace, 3, 3); + // ^image.replace(color-source;color-dest) + add_native_method("replace", Method::CT_DYNAMIC, _replace, 2, 3); // ^image.polyline(color)[table x:y] add_native_method("polyline", Method::CT_DYNAMIC, _polyline, 2, 2); @@ -1265,14 +1251,16 @@ MImage::MImage(): Methoded("image") { // ^image.polybar(color)[table x:y] add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 2, 2); - // ^image.font[alPHAbet;font-file-name.gif](spacebar_width) - // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;width) - add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); + // ^image.font[alPHAbet;font-file-name.gif] + // ^image.font[alPHAbet;font-file-name.gif](spacebar_width) + // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;letter_width) + // ^image.font[alPHAbet;font-file-name.gif][$.space-width(.) $.letter-width(.) $.letter-space(.)] + add_native_method("font", Method::CT_DYNAMIC, _font, 2, 4); - // ^image.text(x;y)[text] + // ^image.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); - // ^image.ngth[text] + // ^image.length[text] add_native_method("length", Method::CT_DYNAMIC, _length, 1, 1); // ^image.arc(center x;center y;width;height;start in degrees;end in degrees;color)