--- parser3/src/classes/image.C 2001/08/28 14:43:07 1.34 +++ parser3/src/classes/image.C 2001/09/18 16:05:42 1.44 @@ -4,10 +4,8 @@ Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: image.C,v 1.34 2001/08/28 14:43:07 parser Exp $ */ -static const char *RCSId="$Id: image.C,v 1.34 2001/08/28 14:43:07 parser Exp $"; +static const char *RCSId="$Id: image.C,v 1.44 2001/09/18 16:05:42 parser Exp $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -47,7 +45,7 @@ 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 @@ -83,6 +81,7 @@ private: size_t offset; size_t size; }; +#endif /// GIF file header struct GIF_Header { @@ -137,7 +136,7 @@ void measure_gif(Pool& pool, const Strin if(strncmp(head->type, "GIF", 3)!=0) PTHROW(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); @@ -161,7 +160,7 @@ void measure_jpeg(Pool& pool, const Stri if(!(signature[0]==0xFF && signature[1]==0xD8)) PTHROW(0, 0, origin_string, - "not JPEG file - signature not found"); + "not JPEG file - wrong signature"); bool found=false; while(true) { @@ -219,11 +218,12 @@ void measure(Pool& pool, const String& f "can not determine image type - no file name extension"); } -/// used by image: _measure / read_mem +#ifndef DOXYGEN struct Read_mem_info { unsigned char *ptr; unsigned char *eof; }; +#endif static size_t read_mem(void*& buf, size_t limit, void *info) { Read_mem_info& rmi=*static_cast(info); buf=rmi.ptr; @@ -232,11 +232,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,11 +284,12 @@ 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); @@ -309,14 +311,17 @@ 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()) { + Value &vattribs=params->get(0); + if(vattribs.is_defined()) // allow 'void' + if(Hash *attribs=vattribs.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 hash"); + } Attrib_info attrib_info={&tag, attribs}; fields.for_each(append_attrib_pair, &attrib_info); @@ -328,7 +333,7 @@ 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); @@ -350,8 +355,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 +366,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, r); + int height=params->as_int(1, r); int bgcolor_value=0xffFFff; if(params->size()>2) - bgcolor_value=r.process(params->get(2)).as_int(); + bgcolor_value=params->as_int(2, r); gdImage& image=*new(pool) gdImage(pool); image.Create(width, height); image.FilledRectangle(0, 0, width-1, height-1, image.Color(bgcolor_value)); @@ -387,9 +391,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(String::UL_AS_IS), out.size(), 0, content_type); r.write_no_lang(vfile); } @@ -404,11 +408,11 @@ static void _line(Request& r, const Stri "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, r), + params->as_int(1, r), + params->as_int(2, r), + params->as_int(3, r), + image->Color(params->as_int(4, r))); } static void _fill(Request& r, const String& method_name, MethodParams *params) { @@ -421,9 +425,9 @@ static void _fill(Request& r, const Stri "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, r), + params->as_int(1, r), + image->Color(params->as_int(2, r))); } static void _rectangle(Request& r, const String& method_name, MethodParams *params) { @@ -436,11 +440,11 @@ static void _rectangle(Request& r, const "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, r), + params->as_int(1, r), + params->as_int(2, r), + params->as_int(3, r), + image->Color(params->as_int(4, r))); } static void _bar(Request& r, const String& method_name, MethodParams *params) { @@ -453,13 +457,23 @@ static void _bar(Request& r, const Strin "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, r), + params->as_int(1, r), + params->as_int(2, r), + params->as_int(3, r), + image->Color(params->as_int(4, 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(); @@ -469,21 +483,41 @@ static void _replace(Request& r, const S &method_name, "does not contain an image"); - if((params->size()-2)%2) // I see your thoughts, but that's more readable + Table *table=params->as_no_junction(2, "coordinates must not be code").get_table(); + if(!table) + PTHROW(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, r)), // src color + image->Color(params->as_int(1, r)));// dest color +} + +static void _polyline(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.self)->image; + if(!image) PTHROW(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; 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) + PTHROW(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, r)), + false/*not closed*/); } static void _polygon(Request& r, const String& method_name, MethodParams *params) { @@ -495,20 +529,17 @@ static void _polygon(Request& r, const S &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) + PTHROW(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, r))); } static void _polybar(Request& r, const String& method_name, MethodParams *params) { @@ -520,20 +551,17 @@ static void _polybar(Request& r, const S &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) + PTHROW(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->FilledPolygon(all_p, table->size(), + image->Color(params->as_int(0, r))); } // font @@ -544,16 +572,18 @@ static void _polybar(Request& r, const S class Font : public Pooled { public: - int height; //< Font heigth - int space; //< Default char width + const static int letter_spacing; + int height; ///< Font heigth + int monospace; ///< Default char width + int spacebarspace; ///< spacebar width gdImage& ifont; const String& alphabet; Font(Pool& pool, const String& aalphabet, - gdImage& aifont, int aheight, int aspace) : Pooled(pool), + gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), alphabet(aalphabet), - height(aheight), space(aspace), + height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), ifont(aifont) { } @@ -566,14 +596,12 @@ public: int index_width(int index) { if(index<0) - index=index_of('.'); - if(index<0) - return 0; + return spacebarspace; int tr=ifont.GetTransparent(); - for(int x=ifont.SX()-1; x>0; x--) { + for(int x=ifont.SX()-1; x>=0; x--) { for(int y=0; yas_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 width=params->size()>3?r.process(params->get(3)).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, r); + int monospace_width; + if(params->size()>3) { + monospace_width=params->as_int(3, r); + if(!monospace_width) + monospace_width=image.SX(); + } else + monospace_width=0; + if(!alphabet.size()) + PTHROW(0, 0, + &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, 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, r); + int y=params->as_int(1, r); + const String& s=params->as_string(2, "text must not be code"); VImage& vimage=*static_cast(r.self); if(vimage.image) @@ -674,17 +714,20 @@ 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.polyline(color)[table x:y] + add_native_method("polyline", Method::CT_DYNAMIC, _polyline, 2, 2); - // ^image.polygon(color)(x;y)... point coord pairs - add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 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)(x;y)... point coord pairs - add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*2); + // ^image.polybar(color)[table x:y] + add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 2, 2); - // ^image.font[alPHAbet;font-file-name.gif](height) - // ^image.font[alPHAbet;font-file-name.gif](height;width) + // ^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]