--- parser3/src/classes/image.C 2015/09/18 00:08:12 1.147 +++ parser3/src/classes/image.C 2019/12/03 15:09:49 1.166 @@ -1,7 +1,7 @@ /** @file Parser: @b image parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -24,8 +24,9 @@ #include "pa_vimage.h" #include "pa_vdate.h" #include "pa_table.h" +#include "pa_charsets.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.147 2015/09/18 00:08:12 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.166 2019/12/03 15:09:49 moko Exp $"; // defines @@ -45,7 +46,7 @@ public: // globals -DECLARE_CLASS_VAR(image, new MImage, 0); +DECLARE_CLASS_VAR(image, new MImage); // helpers @@ -179,6 +180,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 +239,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) { @@ -251,10 +260,7 @@ public: 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); } @@ -285,17 +291,14 @@ public: switch(whence) { case SEEK_CUR: new_offset=offset+value; break; case SEEK_SET: new_offset=(size_t)value; break; + case SEEK_END: new_offset=size; 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; } @@ -308,23 +311,36 @@ public: /// PNG file header struct PNG_Header { - char dummy[12]; - char signature[4]; //< must be "IHDR" - uchar high_width[2]; //< image width high bytes [we ignore for now] - uchar width[2]; //< image width low bytes - uchar high_height[2]; //< image height high bytes [we ignore for now] - uchar height[4]; //< image height + char dummy[12]; + char signature[4]; //< must be "IHDR" + uchar high_width[2]; //< image width high bytes [we ignore for now] + uchar width[2]; //< image width low bytes + uchar high_height[2]; //< image height high bytes [we ignore for now] + uchar height[4]; //< image height }; /// GIF file header struct GIF_Header { - char signature[3]; // 'GIF' - char version[3]; - uchar width[2]; - uchar height[2]; - char dif; - char fonColor; - char nulls; + char signature[3]; // 'GIF' + char version[3]; + uchar width[2]; + uchar height[2]; + char dif; + char fonColor; + char nulls; +}; + +/// BMP file header + DIB header part +struct BMP_Header { + char signature[2]; // 'BM' + uchar file_size[4]; + uchar reserved[4]; + uchar bitmap_offset[4]; + uchar header_size[4]; + uchar width[2]; + uchar high_width[2]; //< image width high bytes [we ignore for now] + uchar height[2]; + uchar high_height[2]; //< image height high bytes [we ignore for now] }; /// JPEG record head @@ -335,21 +351,16 @@ struct JPG_Segment_head { }; /// JPEG frame header struct JPG_Size_segment_body { - char data; //< data precision of bits/sample - uchar height[2]; //< image height - uchar width[2]; //< image width - char numComponents; //< number of color components -}; - -/// JPEG frame header -struct JPG_Exif_segment_begin { - char signature[6]; // Exif\0\0 + char data; //< data precision of bits/sample + uchar height[2]; //< image height + uchar width[2]; //< image width + char numComponents; //< number of color components }; /// JPEG Exif TIFF Header struct JPG_Exif_TIFF_header { - uchar byte_align_identifier[2]; - char dummy[2]; // always 000A [or 0A00] + char byte_align_identifier[2]; + uchar signature[2]; // always 000A [or 0A00] uchar first_IFD_offset[4]; // Usually the first IFD starts immediately next to TIFF header, so this offset has value '0x00000008'. }; @@ -372,6 +383,17 @@ struct JPG_Exif_IFD_entry { #define JPEG_EXIF_DATE_CHARS 20 + +#ifndef DOXYGEN +struct Measure_info { + ushort width; + ushort height; + Value** exif; + Value** xmp; + Charset* xmp_charset; +}; +#endif + // inline ushort x_endian_to_ushort(uchar b0, uchar b1) { @@ -392,31 +414,7 @@ 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) { - - 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"); - - 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]); @@ -461,17 +459,13 @@ static Value* parse_IFD_entry_formatted_ // date.C 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 { @@ -498,9 +492,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 @@ -535,21 +527,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? - return 0; // ignore invalid block uint tiff_base=reader.tell(); if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))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"); + + ushort segment_length=endian_to_ushort(true, head->length); switch(head->code) { - // http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html - case CODE_EXIF: - if(exif && !*exif) // seen .jpg with some xml under EXIF tag, after real exif block :) - *exif=parse_exif(reader, origin_string); + // http://dev.exiv2.org/projects/exiv2/wiki/The_Metadata_in_JPEG_files + case CODE_APP1: + { + const size_t EXIF_SIG_LEN=6; // Exif\0\0 + const size_t XMP_SIG_LEN=29; // http://ns.adobe.com/xap/1.0/\0 + + if(segment_lengthwidth); - height=endian_to_ushort(true, body->height); - } + info.width=endian_to_ushort(true, body->width); + info.height=endian_to_ushort(true, body->height); + } return; }; - reader.seek(segment_base+endian_to_ushort(true, head->length), SEEK_SET); + reader.seek(segment_base + segment_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 bool parse_tiff_IFD(bool is_big, Measure_reader& reader, Measure_info &info) { + const char* buf; + if(reader.read(buf, sizeof(JPG_Exif_IFD_begin))directory_entry_count); + for(int i=0; itag); + + if(entry_tag == 256 || entry_tag == 257){ + ushort entry_format=endian_to_ushort(is_big, entry->format); + 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; + if(info.width && info.height) + return true; + } + } + + return false; + // then goes: LLLLLLLL Offset to next IFD [not going there] +} + +static void measure_tiff(const String& origin_string, Measure_reader& reader, Measure_info &info) { + const char* buf; + + if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))byte_align_identifier, "II", 2)!=0 && strncmp(head->byte_align_identifier, "MM", 2)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + bool is_big=head->byte_align_identifier[0]=='M'; // [M]otorola vs [I]ntel + + if(endian_to_ushort(is_big, head->signature) != 42) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + reader.seek(endian_to_uint(is_big, head->first_IFD_offset), SEEK_SET); + if(!parse_tiff_IFD(is_big, reader, info)) + throw Exception(IMAGE_FORMAT, &origin_string, "broken TIFF file - size field entry not found"); +} + +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"); + + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->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); } +static void measure_bmp(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + + const char* buf; + const size_t head_size=sizeof(BMP_Header); + if(reader.read(buf, head_size)signature, "BM", 2)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not BMP file - wrong signature"); + + reader.seek(0, SEEK_END); + if((uint)reader.tell() != endian_to_uint(false, head->file_size)) + throw Exception(IMAGE_FORMAT, &origin_string, "not BMP file - length header and file size do not match"); + + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); +} + // measure center -static void measure(const String& file_name, - Measure_reader& reader, ushort& width, ushort& height, Value** exif) { +static void measure(const String& file_name, Measure_reader& reader, Measure_info &info) { 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) - measure_gif(file_name, reader, width, height); - else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) - measure_jpeg(file_name, reader, width, height, exif); + measure_gif(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) + measure_jpeg(file_name, reader, info); else if(strcasecmp(cext, "PNG")==0) - measure_png(file_name, reader, width, height); + measure_png(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "BMP")==0) + measure_bmp(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "TIF")==0 || strcasecmp(cext, "TIFF")==0) + measure_tiff(file_name, reader, info); 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 -#ifndef DOXYGEN -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) { - 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); +static void file_measure_action(struct stat& /*finfo*/, int f, const String& file_spec, void *context) { + Measure_file_reader reader(f, file_spec); + measure(file_spec, reader, *static_cast(context)); } static void _measure(Request& r, MethodParams& params) { Value& data=params.as_no_junction(0, "data must not be code"); - ushort width=0; - ushort height=0; Value* exif=0; + Value* xmp=0; + Measure_info info={ 0, 0, 0, 0, &pa_UTF8_charset }; + + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1, "methods options")) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next() ){ + String::Body key=i.key(); + Value* value=i.value(); + if(key == "exif") { + if(r.process(*value).as_bool()) + info.exif=&exif; + valid_options++; + } + if(key == "xmp") { + if(r.process(*value).as_bool()) + info.xmp=&xmp; + valid_options++; + } + if(key == "xmp-charset") { + info.xmp_charset=&pa_charsets.get(value->as_string()); + valid_options++; + } + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + const String* file_name; - if((file_name=data.get_string())) { - File_measure_action_info info={ - &width, &height, - &exif, - file_name - }; - file_read_action_under_lock(r.absolute(*file_name), - "measure", file_measure_action, &info); + + if(file_name=data.get_string()) { + file_read_action_under_lock(r.absolute(*file_name), "measure", file_measure_action, &info); } else { 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(), - vfile->value_size(), - *file_name - ); - measure(*file_name, reader, width, height, &exif); + Measure_buf_reader reader(vfile->value_ptr(), vfile->value_size(), *file_name); + measure(*file_name, reader, info); } - GET_SELF(r, VImage).set(file_name, width, height, 0, exif); + GET_SELF(r, VImage).set(file_name, info.width, info.height, 0, exif, xmp); } -#ifndef DOXYGEN -struct Attrib_info { - String* tag; ///< html tag being constructed - 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, 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()) - ) +static void append_attrib_pair(String &tag, String::Body key, Value* value){ + // skip border attribute with empty value + if(key=="border" && !value->is_defined()) return; // src="a.gif" width="123" ismap[=-1] - *info->tag << " " << key; + tag << " " << key; if(value->is_string() || value->as_int()>=0) - *info->tag << "=\"" << value->as_string() << "\""; + tag << "=\"" << value->as_string() << "\""; } -static void _html(Request& r, MethodParams& params) { +static void _html(Request& r, MethodParams& params) { String tag; tag << "for_each(append_attrib_pair, &info); + for(HashStringValue::Iterator i(*attribs); i; i.next() ) + append_attrib_pair(tag, i.key(), i.value()); } else - throw Exception(PARSER_RUNTIME, - 0, - "attributes must be hash"); + throw Exception(PARSER_RUNTIME, 0, "attributes must be hash"); } } - { - Attrib_info info={&tag, attribs}; - fields.for_each(append_attrib_pair, &info); + for(HashStringValue::Iterator i(fields); i; i.next() ){ + String::Body key=i.key(); + // skip user-specified attributes + if(attribs && attribs->get(key)) + continue; + // allow only html attributes (to exclude exif, line-*) + if(key=="src" || key=="width" || key=="height" || key=="border") + append_attrib_pair(tag, key, i.value()); } + tag << " />"; - r.write_pass_lang(tag); + r.write(tag); } /// @test wrap FILE to auto-object -static gdImage* load(Request& r, - const String& file_name){ +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); 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); } } @@ -894,7 +955,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) { @@ -940,20 +1001,16 @@ 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) { +static void add_point(int x, int y, gdImage::Point **p) { (**p).x=x; (**p).y=y; (*p)++; @@ -1034,17 +1091,14 @@ 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), +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), - letterspacing(aletterspacing), ifont(aifont), - alphabet(aalphabet) { + alphabet(aalphabet), + fsource_charset(asource_charset){ if(fsource_charset.isUTF8()){ size_t index=0; @@ -1129,9 +1183,7 @@ static void _font(Request& r, MethodPara 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"); + throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE)); @@ -1146,17 +1198,17 @@ static void _font(Request& r, MethodPara int valid_options=0; if(Value* vspacebar_width=options->get(spacebar_width_name)){ valid_options++; - spacebar_width=r.process_to_value(*vspacebar_width).as_int(); + spacebar_width=r.process(*vspacebar_width).as_int(); } if(Value* vmonospace_width=options->get(monospace_width_name)){ valid_options++; - monospace_width=r.process_to_value(*vmonospace_width).as_int(); + 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_to_value(*vletter_spacing).as_int(); + letter_spacing=r.process(*vletter_spacing).as_int(); } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -1172,16 +1224,9 @@ static void _font(Request& r, MethodPara } 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); + 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( - r.charsets.source(), - alphabet, - image, - image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); + 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) { @@ -1197,7 +1242,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) { @@ -1246,9 +1291,7 @@ gdImage& as_image(MethodParams& params, 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) { @@ -1284,7 +1327,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)))); } @@ -1292,7 +1335,8 @@ static void _pixel(Request& r, MethodPar MImage::MImage(): Methoded("image") { // ^image:measure[DATA] - add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); + // ^image:measure[DATA; $.exif(false) $.xmp(false) $.xmp-charset[UTF-8] ] + add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 2); // ^image.html[] // ^image.html[hash]