--- parser3/src/classes/image.C 2001/05/17 10:12:28 1.27 +++ parser3/src/classes/image.C 2002/11/21 09:47:34 1.78 @@ -1,11 +1,19 @@ /** @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) +static const char* IDENT_IMAGE_C="$Date: 2002/11/21 09:47:34 $"; - $Id: image.C,v 1.27 2001/05/17 10:12:28 parser Exp $ +/* + jpegsize: gets the width and height (in pixels) of a jpeg file + Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 + modified slightly by alex@ed.ac.uk + and further still by rjray@uswest.com + optimization and general re-write from tmetro@vl.com + from perl by paf@design.ru */ #include "pa_config_includes.h" @@ -17,10 +25,6 @@ #include "pa_vfile.h" #include "pa_vimage.h" -// defines - -#define IMAGE_CLASS_NAME "image" - // class class MImage : public Methoded { @@ -37,46 +41,94 @@ public: // Methoded // helpers -/// simple buffered reader[from memory/file], used in _measure +#ifndef DOXYGEN class Measure_reader { public: - enum { READ_CHUNK_SIZE=0x400 };// 1K - typedef size_t(*Func)(void *& buf, size_t limit, void *info); + virtual size_t read(const void *&buf, size_t limit)=0; + virtual void seek(long delta)=0; +}; - Measure_reader(Func afunc, void *ainfo) : - func(afunc), info(ainfo), - chunk(0), offset(0), size(0) { +class Measure_file_reader: public Measure_reader { +public: + Measure_file_reader(Pool& apool, int af, const String& afile_name, const char *afname): + pool(apool), file_name(afile_name), fname(afname), f(af) { } - size_t read(unsigned char *& buf, size_t limit) { - if(offset+limit>size) // nothing left - if(offset==0 || limit==1) { // only one-byte continuations allowed - size=(*func)(chunk, READ_CHUNK_SIZE, info); - offset=0; - } else - return 0;// as if EOF - if(!size) // EOF + /*override*/size_t read(const void *&abuf, size_t limit) { + if(limit==0) return 0; - - // something left - size_t read_size=min(offset+limit, size)-offset; - buf=((unsigned char *)chunk)+offset; - offset+=read_size; + + void *lbuf=pool.malloc(limit); + size_t read_size=(size_t)::read(f, lbuf, limit); abuf=lbuf; + if(ssize_t(read_size)<0 || read_size>limit) + throw Exception(0, + &file_name, + "measure failed: actually read %lu bytes count not in [0..%lu] valid range", + read_size, limit); + return read_size; } + /*override*/void seek(long delta) { + if(lseek(f, delta, SEEK_CUR)<0) + throw Exception("file.seek", + &file_name, + "seek(delta=%ld) failed: %s (%d), actual filename '%s'", + delta, strerror(errno), errno, fname); + } + +private: + Pool& pool; + const String& file_name; const char *fname; + int f; +}; + +class Measure_buf_reader: public Measure_reader { +public: + Measure_buf_reader(const void *abuf, size_t asize, const String& afile_name): + buf(abuf), size(asize), file_name(afile_name), offset(0) { + } + + /*override*/size_t read(const void *&abuf, size_t limit) { + size_t to_read=min(limit, size-offset); + abuf=(const char*)buf+offset; + offset+=to_read; + return to_read; + } + + /*override*/void seek(long delta) { + size_t new_offset=offset+delta; + if((ssize_t)new_offset<0 || new_offset>size) + throw Exception("file.seek", + &file_name, + "seek(offset=%l) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", + delta, new_offset, size); + offset=new_offset; + } + private: - Func func; - void *info; - void *chunk; + const void *buf; size_t size; + const String& file_name; + size_t offset; - size_t size; +}; + +#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]; @@ -85,213 +137,208 @@ struct GIF_Header { char nulls; }; -/// JPEG file header -struct JFIF_Header { - char length[2]; //< length of JFIF segment marker - char identifier[5]; //< JFIF identifier - char version[2]; //< version - char units; //< units X of Y pixel density - char xdensity[2]; //< X pixel density - char ydensity[2]; //< X pixel density - char xthumbnails; //< width of thumbnails - char ythumbnails; //< height of thumbnails - char reserved; //< reserved +/// JPEG record head +struct JPG_Segment_head { + unsigned char marker; + unsigned char code; + unsigned char length[2]; }; /// JPEG frame header -struct JPG_Frame { - char length[2]; //< length of image marker +struct JPG_Size_segment_body { char data; //< data precision of bits/sample - char height[2]; //< image height - char width[2]; //< image width + unsigned char height[2]; //< image height + unsigned char width[2]; //< image width char numComponents; //< number of color components }; // -inline short bytes_to_int(unsigned char HI, unsigned char LO) { - return(short)((HI<<8) + LO); +inline ushort x_endian_to_ushort(unsigned char L, unsigned char H) { + return(short)((H<<8) + L); +} + +inline ushort big_endian_to_ushort(unsigned char b[2]) { + return x_endian_to_ushort(b[1], b[0]); +} + +inline ushort little_endian_to_ushort(unsigned char b[2]) { + return x_endian_to_ushort(b[0], b[1]); } void measure_gif(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { + Measure_reader& reader, ushort& width, ushort& height) { - unsigned char *buf; + void *buf; const int head_size=sizeof(GIF_Header); if(reader.read(buf, head_size)(buf); - if(strncmp(screenD.type, "GIF", 3)!=0) - PTHROW(0, 0, + if(strncmp(head->signature, "GIF", 3)!=0) + throw Exception("image.format", origin_string, - "bad image file - GIF signature not found"); + "not GIF file - wrong signature"); - width=bytes_to_int(screenD.width[1], screenD.width[0]); - height=bytes_to_int(screenD.height[1], screenD.height[0]); + width=little_endian_to_ushort(head->width); + height=little_endian_to_ushort(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) { + Measure_reader& reader, ushort& width, ushort& height) { // JFIF format markers - const unsigned char SOI=0xD8; - const unsigned char EOI=0xD9; - const unsigned char APP0=0xE0; - const unsigned char SOF0=0xC0; - const unsigned char SOF2=0xC2; - const unsigned char COM=0xFE; + const unsigned char MARKER=0xFF; + const unsigned char CODE_SIZE_FIRST=0xC0; + const unsigned char CODE_SIZE_LAST=0xC3; - unsigned char *screenD_buf; - unsigned char *h_buf=0; - - bool flag=false; - - unsigned char *prefix; + void *buf; const size_t prefix_size=2; - if(reader.read(prefix, prefix_size)(screenD_buf); - if((bytes_to_int(screenD.length[0], screenD.length[1]) < 16) || - strcasecmp(screenD.identifier, "JFIF")) flag=false; - } + "not JPEG file - wrong signature"); + + bool found=false; + while(true) { + void *buf; + // Extract the segment header. + if(reader.read(buf, sizeof(JPG_Segment_head))marker!=MARKER) break; - case SOF0: - case SOF2: - if(reader.read(h_buf, sizeof(JPG_Frame))code >= CODE_SIZE_FIRST && head->code <= CODE_SIZE_LAST) { + // Segments that contain size info + if(reader.read(buf, sizeof(JPG_Size_segment_body))width); + height=big_endian_to_ushort(body->height); + found=true; break; - default: break; - } - } while(*marker!=EOI); - - if(flag && h_buf) { - JPG_Frame& h=*reinterpret_cast(h_buf); - width=bytes_to_int(h.width[0], h.width[1]); - height=bytes_to_int(h.height[0], h.height[1]); - } else - PTHROW(0, 0, + } else { + // Dummy read to skip over data + long offset=big_endian_to_ushort(head->length) - 2; + reader.seek(offset); + } + } + + if(!found) + throw Exception("image.format", + origin_string, + "broken JPEG file - size frame not found"); +} + +void measure_png(Pool& pool, const String *origin_string, + Measure_reader& reader, ushort& width, ushort& height) { + + void *buf; + const int head_size=sizeof(PNG_Header); + if(reader.read(buf, head_size)signature, "IHDR", 4)!=0) + throw Exception("image.format", + origin_string, + "not PNG file - wrong signature"); + + width=big_endian_to_ushort(head->width); + height=big_endian_to_ushort(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(), '.')) { + Measure_reader& reader, ushort& width, ushort& height) { + 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"); } -/// used by image: _measure / read_mem -struct Read_mem_info { - unsigned char *ptr; - unsigned char *eof; -}; -static size_t read_mem(void*& buf, size_t limit, void *info) { - Read_mem_info& rmi=*static_cast(info); - buf=rmi.ptr; - size_t read_size=min(limit, (size_t)(rmi.eof-rmi.ptr)); - rmi.ptr+=read_size; - return read_size; -} - -/// used by image: _measure / read_disk -struct Read_disk_info { - const String *file_spec; - size_t offset; +// methods + +#ifndef DOXYGEN +struct File_measure_action_info { + ushort *width; + ushort *height; + const String *file_name; }; -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(); - - size_t read_size; - file_read(pool, *rdi.file_spec, - buf, read_size, - false/*as_text*/, - true/*fail_on_read_problem*/, - rdi.offset, limit); +#endif +static void file_measure_action(Pool& pool, + int f, + const String& file_spec, const char *fname, bool as_text, + void *context) { + File_measure_action_info& info=*static_cast(context); - rdi.offset+=read_size; - return read_size; + Measure_file_reader reader(pool, f, *info.file_name, fname); + measure(pool, *info.file_name, reader, *info.width, *info.height); } -// methods - static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& data=params->get_no_junction(0, "data must not be code"); + Value& data=params->as_no_junction(0, "data must not be code"); - void *info;Measure_reader::Func read_func; - Read_mem_info read_mem_info; - Read_disk_info read_disk_info; + ushort width=0; + ushort height=0; const String *file_name; - if(data.is_string()) { - file_name=data.get_string(); - read_disk_info.file_spec=&r.absolute(*file_name); - read_disk_info.offset=0; - info=&read_disk_info;read_func=read_disk; + if(file_name=data.get_string()) { + File_measure_action_info info={&width, &height, file_name}; + file_read_action_under_lock(pool, r.absolute(*file_name), + "measure", file_measure_action, &info); } else { const VFile& vfile=*data.as_vfile(); file_name=&static_cast(vfile.fields().get(*name_name))->as_string(); - read_mem_info.ptr=(unsigned char *)vfile.value_ptr(); - read_mem_info.eof=read_mem_info.ptr+vfile.value_size(); - info=&read_mem_info;read_func=read_mem; + Measure_buf_reader reader( + vfile.value_ptr(), + vfile.value_size(), + *file_name + ); + measure(pool, *file_name, reader, width, height); } - Measure_reader reader(read_func, info); - 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); } -/// 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); @@ -306,17 +353,23 @@ 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()) - 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 +377,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,35 +404,34 @@ 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->get_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(); 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=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)); - 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"); @@ -387,9 +440,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); } @@ -397,143 +450,167 @@ 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( - 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) { 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( - 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) { 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( - 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) { 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( - 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; + gdImage *image=static_cast(r.get_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, - &method_name, - "y coordinate missing"); + 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"); - 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 + 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 _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; + gdImage *image=static_cast(r.get_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, + 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) { + Pool& pool=r.pool(); + + gdImage *image=static_cast(r.get_self())->image; + if(!image) + throw Exception(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; 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) { 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"); - 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,16 +621,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 +645,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; yget_no_junction(0, "alphabet must not be code"); - Value& file_name=params->get_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; - - static_cast(r.self)->font=new(pool) Font(pool, - valphabet.as_string(), - *load(r, method_name, file_name.as_string()), - height, width); + 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.get_self())->font=new(pool) Font(pool, + 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); + 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"); } -// 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.get_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.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))); +} -MImage::MImage(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); +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"); + + 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); @@ -674,22 +887,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.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] 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