--- parser3/src/classes/image.C 2001/08/31 10:18:08 1.35 +++ parser3/src/classes/image.C 2002/04/18 10:50:59 1.71 @@ -1,13 +1,11 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: image.C,v 1.35 2001/08/31 10:18:08 parser Exp $ + $Id: image.C,v 1.71 2002/04/18 10:50:59 paf Exp $ */ -static const char *RCSId="$Id: image.C,v 1.35 2001/08/31 10:18:08 parser Exp $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -27,10 +25,6 @@ static const char *RCSId="$Id: image.C,v #include "pa_vfile.h" #include "pa_vimage.h" -// defines - -#define IMAGE_CLASS_NAME "image" - // class class MImage : public Methoded { @@ -47,10 +41,10 @@ public: // Methoded // helpers -/// simple buffered reader[from memory/file], used in _measure +#ifndef DOXYGEN class Measure_reader { public: - enum { READ_CHUNK_SIZE=0x400*10 };// 10K + enum { READ_CHUNK_SIZE=0x400*20 };// 20K typedef size_t(*Func)(void *& buf, size_t limit, void *info); Measure_reader(Func afunc, void *ainfo) : @@ -83,6 +77,7 @@ private: size_t offset; size_t size; }; +#endif /// GIF file header struct GIF_Header { @@ -129,20 +124,21 @@ void measure_gif(Pool& pool, const Strin void *buf; const int head_size=sizeof(GIF_Header); if(reader.read(buf, head_size)type, "GIF", 3)!=0) - PTHROW(0, 0, + throw Exception("image.format", origin_string, - "not GIF file - signature not found"); + "not GIF file - wrong signature"); width=little_endian_to_int(head->width); height=little_endian_to_int(head->height); } +/// @test remove ugly mech in reader - 20K limit void measure_jpeg(Pool& pool, const String *origin_string, Measure_reader& reader, int& width, int& height) { // JFIF format markers @@ -153,15 +149,15 @@ void measure_jpeg(Pool& pool, const Stri void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)(info); buf=rmi.ptr; @@ -232,11 +229,12 @@ static size_t read_mem(void*& buf, size_ return read_size; } -/// used by image: _measure / read_disk +#ifndef DOXYGEN struct Read_disk_info { const String *file_spec; size_t offset; }; +#endif static size_t read_disk(void*& buf, size_t limit, void *info) { Read_disk_info& rdi=*static_cast(info); Pool& pool=rdi.file_spec->pool(); @@ -283,15 +281,17 @@ static void _measure(Request& r, const S static_cast(r.self)->set(file_name, width, height); } -/// used by image: _html / append_attrib_pair +#ifndef DOXYGEN struct Attrib_info { String *tag; ///< html tag being constructed Hash *skip; ///< tag attributes not to append to tag string [to skip] }; +#endif static void append_attrib_pair(const Hash::Key& key, Hash::Val *val, void *info) { Attrib_info& ai=*static_cast(info); - if(ai.skip && ai.skip->get(key)) + // skip user-specified and internal(starting with "line-") attributes + if(ai.skip && ai.skip->get(key) || key.pos("line-")==0) return; Value& value=*static_cast(val); @@ -309,14 +309,20 @@ static void _html(Request& r, const Stri const Hash& fields=static_cast(r.self)->fields(); Hash *attribs=0; - if(params->size()) - if(attribs=params->get(0).get_hash()) { - Attrib_info attrib_info={&tag, 0}; - attribs->for_each(append_attrib_pair, &attrib_info); - } else - PTHROW(0, 0, - &method_name, - "attributes must be must be hash"); + if(params->size()) { + // for backward compatibility: someday was ^html{} + Value &vattribs=r.process_to_value(params->get(0), + /*0/*no name* /,*/ + false/*don't intercept string*/); + if(vattribs.is_defined()) // allow 'void' + if(attribs=vattribs.get_hash(&method_name)) { + Attrib_info attrib_info={&tag, 0}; + attribs->for_each(append_attrib_pair, &attrib_info); + } else + throw Exception("parser.runtime", + &method_name, + "attributes must be hash"); + } Attrib_info attrib_info={&tag, attribs}; fields.for_each(append_attrib_pair, &attrib_info); @@ -324,22 +330,23 @@ static void _html(Request& r, const Stri r.write_pass_lang(tag); } +/// @test wrap FILE to auto-object static gdImage *load(Request& r, const String& method_name, const String& file_name){ Pool& pool=r.pool(); - const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_NAME); + const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_SPEC); if(FILE *f=fopen(file_name_cstr, "rb")) { gdImage& image=*new(pool) gdImage(pool); bool ok=image.CreateFromGif(f); fclose(f); if(!ok) - PTHROW(0, 0, + throw Exception("image.format", &file_name, "is not in GIF format"); return ℑ } else { - PTHROW(0, 0, + throw Exception("file.missing", &method_name, "can not open '%s'", file_name_cstr); return 0; @@ -350,8 +357,7 @@ static gdImage *load(Request& r, const S static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params->as_no_junction(0, "file name must not be code"); - const String& file_name=vfile_name.as_string(); + const String& file_name=params->as_string(0, "file name must not be code"); gdImage& image=*load(r, method_name, file_name); int width=image.SX(); @@ -362,11 +368,11 @@ static void _load(Request& r, const Stri static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - int width=r.process(params->get(0)).as_int(); - int height=r.process(params->get(1)).as_int(); + int width=params->as_int(0, "width must be int", r); + int height=params->as_int(1, "height must be int", r); int bgcolor_value=0xffFFff; if(params->size()>2) - bgcolor_value=r.process(params->get(2)).as_int(); + bgcolor_value=params->as_int(2, "color must be int", r); gdImage& image=*new(pool) gdImage(pool); image.Create(width, height); image.FilledRectangle(0, 0, width-1, height-1, image.Color(bgcolor_value)); @@ -378,7 +384,7 @@ static void _gif(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -387,9 +393,9 @@ static void _gif(Request& r, const Strin String out(pool); image->Gif(out); VFile& vfile=*new(pool) VFile(pool); - String& image_gif=*new(pool) String(pool, "image/gif"); + Value *content_type=new(pool) VString(*new(pool) String(pool, "image/gif")); vfile.set(false/*not tainted*/, - out.cstr(String::UL_AS_IS), out.size(), 0, &image_gif); + out.cstr(), out.size(), 0, content_type); r.write_no_lang(vfile); } @@ -399,16 +405,16 @@ static void _line(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); image->Line( - r.process(params->get(0)).as_int(), - r.process(params->get(1)).as_int(), - r.process(params->get(2)).as_int(), - r.process(params->get(3)).as_int(), - image->Color(r.process(params->get(4)).as_int())); + params->as_int(0, "x0 must be int", r), + params->as_int(1, "y0 must be int", r), + params->as_int(2, "x1 must be int", r), + params->as_int(3, "y1 must be int", r), + image->Color(params->as_int(4, "color must be int", r))); } static void _fill(Request& r, const String& method_name, MethodParams *params) { @@ -416,14 +422,14 @@ static void _fill(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); image->Fill( - r.process(params->get(0)).as_int(), - r.process(params->get(1)).as_int(), - image->Color(r.process(params->get(2)).as_int())); + params->as_int(0, "x must be int", r), + params->as_int(1, "y must be int", r), + image->Color(params->as_int(2, "color must be int", r))); } static void _rectangle(Request& r, const String& method_name, MethodParams *params) { @@ -431,16 +437,16 @@ static void _rectangle(Request& r, const gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); image->Rectangle( - r.process(params->get(0)).as_int(), - r.process(params->get(1)).as_int(), - r.process(params->get(2)).as_int(), - r.process(params->get(3)).as_int(), - image->Color(r.process(params->get(4)).as_int())); + params->as_int(0, "x0 must be int", r), + params->as_int(1, "y0 must be int", r), + params->as_int(2, "x1 must be int", r), + params->as_int(3, "y1 must be int", r), + image->Color(params->as_int(4, "color must be int", r))); } static void _bar(Request& r, const String& method_name, MethodParams *params) { @@ -448,42 +454,72 @@ static void _bar(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); image->FilledRectangle( - r.process(params->get(0)).as_int(), - r.process(params->get(1)).as_int(), - r.process(params->get(2)).as_int(), - r.process(params->get(3)).as_int(), - image->Color(r.process(params->get(4)).as_int())); + params->as_int(0, "x0 must be int", r), + params->as_int(1, "y0 must be int", r), + params->as_int(2, "x1 must be int", r), + params->as_int(3, "y1 must be int", r), + image->Color(params->as_int(4, "color must be int", r))); +} + +#ifndef DOXYGEN +static void add_point(Array::Item *value, void *info) { + Array& row=*static_cast(value); + gdImage::Point **p=static_cast(info); + + (**p).x=row.get_string(0)->as_int(); + (**p).y=row.get_string(1)->as_int(); + (*p)++; } - +#endif static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); - if((params->size()-2)%2) // I see your thoughts, but that's more readable - PTHROW(0, 0, + Table *table=params->as_no_junction(2, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, + &method_name, + "coordinates must be table"); + + gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image->FilledPolygonReplaceColor(all_p, table->size(), + image->Color(params->as_int(0, "src color must be int", r)), + image->Color(params->as_int(1, "dest color must be int", r))); +} + +static void _polyline(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.self)->image; + if(!image) + throw Exception(0, &method_name, - "y coordinate missing"); + "does not contain an image"); - int n=(params->size()-2)/2; - - gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n); - for(int i=0; iget(2+i*2+0)).as_int(); - p[i].y=r.process(params->get(2+i*2+1)).as_int(); - } - image->FilledPolygonReplaceColor(p, n, - image->Color(r.process(params->get(0)).as_int()), // src color - image->Color(r.process(params->get(1)).as_int()));// dest color + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, + &method_name, + "coordinates must be table"); + + gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image->Polygon(all_p, table->size(), + image->Color(params->as_int(0, "color must be int", r)), + false/*not closed*/); } static void _polygon(Request& r, const String& method_name, MethodParams *params) { @@ -491,24 +527,21 @@ static void _polygon(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); - if((params->size()-1)%2) // [I see..] see now? - PTHROW(0, 0, - &method_name, - "y coordinate missing"); - - int n=(params->size()-1)/2; - - gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n); - for(int i=0; iget(1+i*2+0)).as_int(); - p[i].y=r.process(params->get(1+i*2+1)).as_int(); - } - image->Polygon(p, n, - image->Color(r.process(params->get(0)).as_int())); + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, + &method_name, + "coordinates must be table"); + + gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image->Polygon(all_p, table->size(), + image->Color(params->as_int(0, "color must be int", r))); } static void _polybar(Request& r, const String& method_name, MethodParams *params) { @@ -516,24 +549,21 @@ static void _polybar(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); - if((params->size()-1)%2) // [I see..] see now? - PTHROW(0, 0, - &method_name, - "y coordinate missing"); - - int n=(params->size()-1)/2; - - gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n); - for(int i=0; iget(1+i*2+0)).as_int(); - p[i].y=r.process(params->get(1+i*2+1)).as_int(); - } - image->FilledPolygon(p, n, - image->Color(r.process(params->get(0)).as_int())); + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception("parser.runtime", + &method_name, + "coordinates must be table"); + + gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image->FilledPolygon(all_p, table->size(), + image->Color(params->as_int(0, "color must be int", r))); } // font @@ -544,7 +574,7 @@ static void _polybar(Request& r, const S class Font : public Pooled { public: - const static int kerning; + const static int letter_spacing; int height; ///< Font heigth int monospace; ///< Default char width int spacebarspace; ///< spacebar width @@ -584,70 +614,201 @@ public: } /* ******************************** string ********************************** */ - /* - int string_width(const char *cstr){ + + int string_width(const String& s){ + const char *cstr=s.cstr(); int result=0; for(; *cstr; cstr++) result+=index_width(index_of(*cstr)); return result; } - */ void string_display(gdImage& image, int x, int y, const String& s){ - const char *cstr=s.cstr(String::UL_AS_IS); + const char *cstr=s.cstr(); if(cstr) for(; *cstr; cstr++) { int index=index_of(*cstr); index_display(image, x, y, index); - x+=kerning + (monospace ? monospace : index_width(index)); + x+=letter_spacing + (monospace ? monospace : index_width(index)); } } }; -const int Font::kerning=1; +const int Font::letter_spacing=1; static void _font(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& valphabet=params->as_no_junction(0, "alphabet must not be code"); - Value& file_name=params->as_no_junction(1, "file_name must not be code"); - int height=r.process(params->get(2)).as_int(); - int spacebar_width=r.process(params->get(3)).as_int(); - - int monospace_width=params->size()>4?r.process(params->get(4)).as_int():0; + const String& alphabet=params->as_string(0, "alphabet must not be code"); + gdImage& image=*load(r, method_name, 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->size()>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.size()) + throw Exception("parser.runtime", + &method_name, + "alphabet must not be empty"); + static_cast(r.self)->font=new(pool) Font(pool, - valphabet.as_string(), - *load(r, method_name, file_name.as_string()), - height, monospace_width, spacebar_width); + alphabet, + image, + image.SY() / alphabet.size(), monospace_width, spacebar_width); } static void _text(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - int x=r.process(params->get(0)).as_int(); - int y=r.process(params->get(1)).as_int(); - const String& s=r.process(params->get(2)).as_string(); + int x=params->as_int(0, "x must be int", r); + int y=params->as_int(1, "y must be int", r); + const String& s=params->as_string(2, "text must not be code"); VImage& vimage=*static_cast(r.self); if(vimage.image) if(vimage.font) vimage.font->string_display(*vimage.image, x, y, s); else - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, "set the font first"); else - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); } -// constructor +static void _length(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + const String& s=params->as_string(0, "text must not be code"); + + VImage& vimage=*static_cast(r.self); + if(vimage.image) + if(vimage.font) { + r.write_no_lang(*new(pool) VInt(pool, vimage.font->string_width(s))); + } else + throw Exception("parser.runtime", + &method_name, + "set the font first"); + else + throw Exception(0, + &method_name, + "does not contain an image"); +} + +static void _arc(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.self)->image; + if(!image) + throw Exception(0, + &method_name, + "does not contain an image"); + + image->Arc( + params->as_int(0, "center_x must be int", r), + params->as_int(1, "center_y must be int", r), + params->as_int(2, "width must be int", r), + params->as_int(3, "height must be int", r), + params->as_int(4, "start degrees must be int", r), + params->as_int(5, "end degrees must be int", r), + image->Color(params->as_int(6, "cx must be int", r))); +} + +static void _sector(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); -MImage::MImage(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); + gdImage *image=static_cast(r.self)->image; + if(!image) + throw Exception(0, + &method_name, + "does not contain an image"); + image->Sector( + params->as_int(0, "center_x must be int", r), + params->as_int(1, "center_y must be int", r), + params->as_int(2, "width must be int", r), + params->as_int(3, "height must be int", r), + params->as_int(4, "start degrees must be int", r), + params->as_int(5, "end degrees must be int", r), + image->Color(params->as_int(6, "color must be int", r))); +} +static void _circle(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.self)->image; + if(!image) + throw Exception(0, + &method_name, + "does not contain an image"); + + int size=params->as_int(2, "radius must be int", r)*2; + image->Arc( + params->as_int(0, "center_x must be int", r), + params->as_int(1, "center_y must be int", r), + size, //w + size, //h + 0, //s + 360, //e + image->Color(params->as_int(3, "color must be int", r))); +} + +gdImage& as_image(Pool& pool, const String& method_name, MethodParams *params, + int index, const char *msg) { + Value& value=params->as_no_junction(index, msg); + + if(strcmp(value.type(), VIMAGE_TYPE)!=0) + throw Exception("parser.runtime", + &method_name, + msg); + + gdImage *src=static_cast(&value)->image; + if(!src) + throw Exception("parser.runtime", + &method_name, + msg); + + return *src; +} + +static void _copy(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *dest=static_cast(r.self)->image; + if(!dest) + throw Exception(0, + &method_name, + "self does not contain an image"); + + gdImage& src=as_image(pool, method_name, params, 0, "src must be image"); + + int sx=params->as_int(1, "src_x must be int", r); + int sy=params->as_int(2, "src_y must be int", r); + int sw=params->as_int(3, "src_w must be int", r); + int sh=params->as_int(4, "src_h must be int", r); + int dx=params->as_int(5, "dest_x must be int", r); + int dy=params->as_int(6, "dest_y must be int", r); + if(params->size()>1+2+2+2) { + int dw=params->as_int(1+2+2+2, "dest_w must be int", r); + int dh=(int)(params->size()>1+2+2+2+1? + params->as_int(1+2+2+2+1, "dest_h must be int", r):sh*(((double)dw)/((double)sw))); + int tolerance=params->size()>1+2+2+2+2? + params->as_int(1+2+2+2+2, "tolerance must be int", r):150; + + src.CopyResampled(*dest, dx, dy, sx, sy, dw, dh, sw, sh, tolerance); + } else + src.Copy(*dest, dx, dy, sx, sy, sw, sh); +} + + +// constructor + +MImage::MImage(Pool& apool) : Methoded(apool, "image") { // ^image:measure[DATA] add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); @@ -677,22 +838,39 @@ MImage::MImage(Pool& apool) : Methoded(a // ^image.bar(x0;y0;x1;y1;color) add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); - // ^image.replace(color-source;color-dest)(x;y)... point coord pairs - add_native_method("replace", Method::CT_DYNAMIC, _replace, 2+3*2, 2+100*2); + // ^image.replace(color-source;color-dest)[table x:y] + add_native_method("replace", Method::CT_DYNAMIC, _replace, 3, 3); - // ^image.polygon(color)(x;y)... point coord pairs - add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 1+3*2, 1+100*2); + // ^image.polyline(color)[table x:y] + add_native_method("polyline", Method::CT_DYNAMIC, _polyline, 2, 2); - // ^image.polybar(color)(x;y)... point coord pairs - add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*2); + // ^image.polygon(color)[table x:y] + add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 2, 2); - // ^image.font[alPHAbet;font-file-name.gif](height;spacebar_width) - // ^image.font[alPHAbet;font-file-name.gif](height;spacebar_width;width) - add_native_method("font", Method::CT_DYNAMIC, _font, 4, 5); + // ^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.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); + // ^image.ngth[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) + add_native_method("arc", Method::CT_DYNAMIC, _arc, 7, 7); + + // ^image.sector(center x;center y;width;height;start in degrees;end in degrees;color) + add_native_method("sector", Method::CT_DYNAMIC, _sector, 7, 7); + + // ^image.circle(center x;center y;r;color) + add_native_method("circle", Method::CT_DYNAMIC, _circle, 4, 4); + + // ^image.copy[source](src x;src y;src w;src h;dst x;dst y[;dest w[;dest h[;tolerance]]]) + add_native_method("copy", Method::CT_DYNAMIC, _copy, 1+2+2+2, (1+2+2+2)+2+1); } // global variable