--- parser3/src/classes/image.C 2001/09/13 14:10:54 1.41 +++ parser3/src/classes/image.C 2001/09/26 10:32:25 1.46 @@ -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.46 2001/09/26 10:32:25 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 { @@ -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) { @@ -334,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); @@ -356,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(); @@ -466,6 +464,16 @@ static void _bar(Request& r, const Strin 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(); @@ -475,24 +483,21 @@ 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 - PTHROW(0, 0, - &method_name, - "y coordinate missing"); + 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"); - 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, + 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 _polygon(Request& r, const String& method_name, MethodParams *params) { +static void _polyline(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); gdImage *image=static_cast(r.self)->image; @@ -501,19 +506,39 @@ static void _polygon(Request& r, const S &method_name, "does not contain an image"); - if((params->size()-1)%2) // [I see..] see now? + 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) { + 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()-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, + 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))); } @@ -526,19 +551,16 @@ 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"); + 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"); - 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, + 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))); } @@ -692,14 +714,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.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](spacebar_width) // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;width)