--- parser3/src/classes/image.C 2001/09/13 14:10:54 1.41 +++ parser3/src/classes/image.C 2001/10/19 15:20:40 1.58 @@ -2,12 +2,10 @@ Parser: @b image parser class. Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.41 2001/09/13 14:10:54 parser Exp $ + $Id: image.C,v 1.58 2001/10/19 15:20:40 parser Exp $ */ -static const char *RCSId="$Id: image.C,v 1.41 2001/09/13 14:10:54 parser Exp $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -47,10 +45,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 +81,7 @@ private: size_t offset; size_t size; }; +#endif /// GIF file header struct GIF_Header { @@ -129,20 +128,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(0, 0, 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 +153,15 @@ void measure_jpeg(Pool& pool, const Stri void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)(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); @@ -313,13 +314,15 @@ static void _html(Request& r, const Stri Hash *attribs=0; if(params->size()) { - Value &vattribs=params->get(0); + Value &vattribs=r.process(params->get(0), + 0/*no name*/, + false/*don't intercept string*/); if(vattribs.is_defined()) // allow 'void' - if(Hash *attribs=vattribs.get_hash()) { + if(attribs=vattribs.get_hash()) { Attrib_info attrib_info={&tag, 0}; attribs->for_each(append_attrib_pair, &attrib_info); } else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "attributes must be hash"); } @@ -334,18 +337,18 @@ static gdImage *load(Request& r, const S 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(0, 0, &file_name, "is not in GIF format"); return ℑ } else { - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "can not open '%s'", file_name_cstr); return 0; @@ -356,8 +359,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(); @@ -368,11 +370,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=params->as_int(0, r); - int height=params->as_int(1, r); + 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=params->as_int(2, r); + 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)); @@ -384,7 +386,7 @@ static void _gif(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "does not contain an image"); @@ -405,16 +407,16 @@ static void _line(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "does not contain an image"); image->Line( - params->as_int(0, r), - params->as_int(1, r), - params->as_int(2, r), - params->as_int(3, r), - image->Color(params->as_int(4, r))); + 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) { @@ -422,14 +424,14 @@ static void _fill(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "does not contain an image"); image->Fill( - params->as_int(0, r), - params->as_int(1, r), - image->Color(params->as_int(2, r))); + 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) { @@ -437,16 +439,16 @@ static void _rectangle(Request& r, const gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "does not contain an image"); image->Rectangle( - params->as_int(0, r), - params->as_int(1, r), - params->as_int(2, r), - params->as_int(3, r), - image->Color(params->as_int(4, r))); + 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) { @@ -454,42 +456,72 @@ static void _bar(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "does not contain an image"); image->FilledRectangle( - params->as_int(0, r), - params->as_int(1, r), - params->as_int(2, r), - params->as_int(3, r), - image->Color(params->as_int(4, r))); + 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, 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, 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, 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; ias_int(2+i*2+0, r); - p[i].y=params->as_int(2+i*2+1, r); - } - image->FilledPolygonReplaceColor(p, n, - image->Color(params->as_int(0, r)), // src color - image->Color(params->as_int(1, r)));// dest color + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, 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) { @@ -497,24 +529,21 @@ static void _polygon(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 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"); + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, 0, + &method_name, + "coordinates must be table"); - int n=(params->size()-1)/2; - - gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n); - for(int i=0; ias_int(2+i*2+0, r); - p[i].y=params->as_int(2+i*2+1, r); - } - image->Polygon(p, n, - image->Color(params->as_int(0, r))); + 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) { @@ -522,24 +551,21 @@ static void _polybar(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - PTHROW(0, 0, + throw Exception(0, 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"); + Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); + if(!table) + throw Exception(0, 0, + &method_name, + "coordinates must be table"); - int n=(params->size()-1)/2; - - gdImage::Point *p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*n); - for(int i=0; ias_int(2+i*2+0, r); - p[i].y=params->as_int(2+i*2+1, r); - } - image->FilledPolygon(p, n, - image->Color(params->as_int(0, r))); + 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 @@ -590,14 +616,14 @@ public: } /* ******************************** string ********************************** */ - /* - int string_width(const char *cstr){ + + int string_width(const String& s){ + const char *cstr=s.cstr(String::UL_AS_IS); 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); @@ -616,17 +642,17 @@ static void _font(Request& r, const Stri 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, r); + 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, r); + 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()) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "alphabet must not be empty"); @@ -639,8 +665,8 @@ static void _font(Request& r, const Stri static void _text(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - int x=params->as_int(0, r); - int y=params->as_int(1, r); + 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); @@ -648,15 +674,142 @@ static void _text(Request& r, const Stri if(vimage.font) vimage.font->string_display(*vimage.image, x, y, s); else - PTHROW(0, 0, + throw Exception(0, 0, + &method_name, + "set the font first"); + else + throw Exception(0, 0, + &method_name, + "does not contain an image"); +} + +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) { + VInt& result=*new(pool) VInt(pool, vimage.font->string_width(s)); + result.set_name(method_name); + r.write_assign_lang(result); + } else + throw Exception(0, 0, &method_name, "set the font first"); else - PTHROW(0, 0, + throw Exception(0, 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, 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(); + + gdImage *image=static_cast(r.self)->image; + if(!image) + throw Exception(0, 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, 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(0, 0, + &method_name, + msg); + + gdImage *src=static_cast(&value)->image; + if(!src) + throw Exception(0, 0, + &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, 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) { @@ -692,14 +845,17 @@ 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.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) @@ -708,6 +864,20 @@ MImage::MImage(Pool& apool) : Methoded(a // ^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