--- parser3/src/classes/image.C 2010/10/21 15:06:27 1.136 +++ parser3/src/classes/image.C 2016/10/26 19:10:31 1.155 @@ -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: 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.155 2016/10/26 19:10:31 moko Exp $"; + // defines static const String spacebar_width_name("space"); @@ -47,7 +45,7 @@ public: // globals -DECLARE_CLASS_VAR(image, new MImage, 0); +DECLARE_CLASS_VAR(image, new MImage); // helpers @@ -181,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; @@ -232,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) { @@ -245,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); } @@ -292,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; } @@ -398,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]); @@ -465,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*/ } } @@ -503,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 @@ -540,10 +521,7 @@ 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(); { @@ -551,10 +529,7 @@ static Value* parse_IFD_entry_value( const char* value; if(reader.read(value, value_size)signature, "Exif\0\0", 4+2)!=0) //signature invalid? @@ -635,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; @@ -648,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 @@ -684,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); @@ -698,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); @@ -725,8 +677,7 @@ 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) { +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++; @@ -737,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 @@ -753,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) { @@ -776,11 +719,9 @@ 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(String::L_AS_IS); file_name=&vfile->fields().get(name_name)->as_string(); @@ -801,10 +742,7 @@ 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) { +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)) @@ -828,15 +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"); + } } { @@ -848,22 +785,17 @@ static void _html(Request& r, MethodPara } /// @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")) { 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); } } @@ -890,18 +822,13 @@ 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->taint_cstr(String::L_FILE_SPEC): 0, - content_type); + + 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); } @@ -949,20 +876,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)++; @@ -977,11 +900,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 +926,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 +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; @@ -1040,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; @@ -1059,10 +966,7 @@ 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): +Font::Font(Charset& asource_charset, const String& aalphabet, gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing): fsource_charset(asource_charset), height(aheight), monospace(amonospace), @@ -1154,9 +1058,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)); @@ -1164,32 +1066,30 @@ static void _font(Request& r, MethodPara int monospace_width=0; // proportional int letter_spacing=1; if(params.count()>2){ - if(HashStringValue* options=params.as_no_junction(2, "param must be int or hash").get_hash()){ + if(HashStringValue* options=params[2].get_hash()){ // third option is hash if(params.count()>3) - throw Exception(PARSER_RUNTIME, - 0, - "too many options were specified"); + 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_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); } else { // backward - spacebar_width=params.as_int(2, "spacebar_width must be int", r); + 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) @@ -1199,16 +1099,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) { @@ -1273,9 +1166,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) {