--- parser3/src/classes/image.C 2016/03/31 21:46:19 1.151 +++ parser3/src/classes/image.C 2016/10/26 19:10:31 1.155 @@ -25,7 +25,7 @@ #include "pa_vdate.h" #include "pa_table.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.151 2016/03/31 21:46:19 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.155 2016/10/26 19:10:31 moko Exp $"; // defines @@ -238,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) { @@ -259,10 +259,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); } @@ -294,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; } @@ -400,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]); @@ -469,17 +453,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 { @@ -506,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 @@ -543,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(); { @@ -554,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? @@ -638,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; @@ -651,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 @@ -687,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); @@ -701,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); @@ -728,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++; @@ -740,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 @@ -756,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) { @@ -779,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(); @@ -804,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)) @@ -831,15 +766,13 @@ 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*/); + 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"); } } @@ -852,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); } } @@ -948,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)++; @@ -1042,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), @@ -1137,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)); @@ -1154,17 +1073,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); @@ -1180,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) { @@ -1254,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) {