--- parser3/src/classes/image.C 2001/10/04 14:56:29 1.47 +++ parser3/src/classes/image.C 2002/09/18 08:52:48 1.76 @@ -1,12 +1,12 @@ /** @file 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.47 2001/10/04 14:56:29 parser Exp $ + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_IMAGE_C="$Date: 2002/09/18 08:52:48 $"; + /* jpegsize: gets the width and height (in pixels) of a jpeg file Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 @@ -25,10 +25,6 @@ #include "pa_vfile.h" #include "pa_vimage.h" -// defines - -#define IMAGE_CLASS_NAME "image" - // class class MImage : public Methoded { @@ -83,9 +79,19 @@ private: }; #endif +/// PNG file header +struct PNG_Header { + char dummy[12]; + char signature[4]; //< must be "IHDR" + unsigned char high_width[2]; //< image width high bytes [we ignore for now] + unsigned char width[2]; //< image width low bytes + unsigned char high_height[2]; //< image height high bytes [we ignore for now] + unsigned char height[4]; //< image height +}; + /// GIF file header struct GIF_Header { - char type[3]; // 'GIF' + char signature[3]; // 'GIF' char version[3]; unsigned char width[2]; unsigned char height[2]; @@ -128,13 +134,13 @@ 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, + if(strncmp(head->signature, "GIF", 3)!=0) + throw Exception("image.format", origin_string, "not GIF file - wrong signature"); @@ -142,6 +148,7 @@ void measure_gif(Pool& pool, const Strin 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 @@ -152,13 +159,13 @@ void measure_jpeg(Pool& pool, const Stri void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)signature, "IHDR", 4)!=0) + throw Exception("image.format", + origin_string, + "not PNG file - wrong signature"); + + width=big_endian_to_int(head->width); + height=big_endian_to_int(head->height); +} + // measure center void measure(Pool& pool, const String& file_name, Measure_reader& reader, int& width, int& height) { - if(const char *cext=strrchr(file_name.cstr(), '.')) { + if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) { cext++; if(strcasecmp(cext, "GIF")==0) measure_gif(pool, &file_name, reader, width, height); else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) measure_jpeg(pool, &file_name, reader, width, height); + else if(strcasecmp(cext, "PNG")==0) + measure_png(pool, &file_name, reader, width, height); else - PTHROW(0, 0, + throw Exception("image.format", &file_name, "unhandled image file name extension '%s'", cext); } else - PTHROW(0, 0, + throw Exception("image.format", &file_name, "can not determine image type - no file name extension"); } @@ -281,7 +310,7 @@ static void _measure(Request& r, const S int width, height; measure(pool, *file_name, reader, width, height); - static_cast(r.self)->set(file_name, width, height); + static_cast(r.get_self())->set(file_name, width, height); } #ifndef DOXYGEN @@ -293,7 +322,8 @@ struct Attrib_info { 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); @@ -308,17 +338,20 @@ static void _html(Request& r, const Stri String tag(pool); tag << "(r.self)->fields(); + const Hash& fields=static_cast(r.get_self())->fields(); Hash *attribs=0; if(params->size()) { - Value &vattribs=params->get(0); + // 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(Hash *attribs=vattribs.get_hash()) { + if(attribs=vattribs.get_hash(&method_name)) { Attrib_info attrib_info={&tag, 0}; attribs->for_each(append_attrib_pair, &attrib_info); } else - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, "attributes must be hash"); } @@ -329,6 +362,7 @@ 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(); @@ -339,12 +373,12 @@ static gdImage *load(Request& r, const S 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; @@ -360,29 +394,29 @@ static void _load(Request& r, const Stri gdImage& image=*load(r, method_name, file_name); int width=image.SX(); int height=image.SY(); - static_cast(r.self)->set(&file_name, width, height, &image); + static_cast(r.get_self())->set(&file_name, width, height, &image); } 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)); - static_cast(r.self)->set(0, width, height, &image); + static_cast(r.get_self())->set(0, width, height, &image); } static void _gif(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -393,7 +427,7 @@ static void _gif(Request& r, const Strin VFile& vfile=*new(pool) VFile(pool); 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, content_type); + out.cstr(), out.size(), 0, content_type); r.write_no_lang(vfile); } @@ -401,67 +435,67 @@ static void _gif(Request& r, const Strin static void _line(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(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) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(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) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(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) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(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 @@ -477,15 +511,15 @@ static void add_point(Array::Item *value static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); Table *table=params->as_no_junction(2, "coordinates must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -493,22 +527,22 @@ static void _replace(Request& r, const S 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, r)), // src color - image->Color(params->as_int(1, r)));// dest color + 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; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -516,22 +550,22 @@ static void _polyline(Request& r, const 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, r)), + 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) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -539,21 +573,21 @@ static void _polygon(Request& r, const S 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, r))); + image->Color(params->as_int(0, "color must be int", r))); } static void _polybar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) - PTHROW(0, 0, + throw Exception(0, &method_name, "does not contain an image"); Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, "coordinates must be table"); @@ -561,7 +595,7 @@ static void _polybar(Request& r, const S 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, r))); + image->Color(params->as_int(0, "color must be int", r))); } // font @@ -614,7 +648,7 @@ public: /* ******************************** string ********************************** */ int string_width(const String& s){ - const char *cstr=s.cstr(String::UL_AS_IS); + const char *cstr=s.cstr(); int result=0; for(; *cstr; cstr++) result+=index_width(index_of(*cstr)); @@ -622,7 +656,7 @@ public: } 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); @@ -638,21 +672,21 @@ 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("parser.runtime", &method_name, "alphabet must not be empty"); - static_cast(r.self)->font=new(pool) Font(pool, + static_cast(r.get_self())->font=new(pool) Font(pool, alphabet, image, image.SY() / alphabet.size(), monospace_width, spacebar_width); @@ -661,20 +695,20 @@ 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); + VImage& vimage=*static_cast(r.get_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"); } @@ -684,28 +718,131 @@ static void _length(Request& r, const St const String& s=params->as_string(0, "text must not be code"); - VImage& vimage=*static_cast(r.self); + VImage& vimage=*static_cast(r.get_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); + r.write_no_lang(*new(pool) VInt(pool, vimage.font->string_width(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 _arc(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.get_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(); + + gdImage *image=static_cast(r.get_self())->image; + if(!image) + throw Exception(0, + &method_name, + "does not contain an image"); -MImage::MImage(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); + 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.get_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) { + gdImage *src=0; + + Value& value=params->as_no_junction(index, msg); + + if(Value *vimage=value.as(VIMAGE_TYPE, false)) { + src=static_cast(vimage)->image; + if(!src) + throw Exception("parser.runtime", + &method_name, + msg); + } else + 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.get_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); @@ -757,6 +894,17 @@ MImage::MImage(Pool& apool) : Methoded(a // ^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