--- parser3/src/classes/image.C 2001/08/27 15:47:13 1.32 +++ parser3/src/classes/image.C 2001/09/13 14:10:54 1.41 @@ -5,9 +5,9 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.32 2001/08/27 15:47:13 parser Exp $ + $Id: image.C,v 1.41 2001/09/13 14:10:54 parser Exp $ */ -static const char *RCSId="$Id: image.C,v 1.32 2001/08/27 15:47:13 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 @@ -111,8 +111,16 @@ struct JPG_Size_segment_body { // -inline short big_endian_to_int(unsigned char chars[2]) { - return(short)((chars[0]<<8) + chars[1]); +inline short x_endian_to_int(unsigned char L, unsigned char H) { + return(short)((H<<8) + L); +} + +inline short big_endian_to_int(unsigned char b[2]) { + return x_endian_to_int(b[1], b[0]); +} + +inline short little_endian_to_int(unsigned char b[2]) { + return x_endian_to_int(b[0], b[1]); } void measure_gif(Pool& pool, const String *origin_string, @@ -123,37 +131,37 @@ void measure_gif(Pool& pool, const Strin if(reader.read(buf, head_size)type, "GIF", 3)!=0) PTHROW(0, 0, origin_string, - "bad image file - GIF signature not found"); + "not GIF file - signature not found"); - width=big_endian_to_int(head->width); - height=big_endian_to_int(head->height); + width=little_endian_to_int(head->width); + height=little_endian_to_int(head->height); } void measure_jpeg(Pool& pool, const String *origin_string, Measure_reader& reader, int& width, int& height) { // JFIF format markers const unsigned char MARKER=0xFF; - const unsigned char SIZE_FIRST=0xC0; - const unsigned char SIZE_LAST=0xC3; + const unsigned char CODE_SIZE_FIRST=0xC0; + const unsigned char CODE_SIZE_LAST=0xC3; void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)marker!=MARKER) break; - if(head->code >= SIZE_FIRST && head->code <= SIZE_LAST) { + if(head->code >= CODE_SIZE_FIRST && head->code <= CODE_SIZE_LAST) { // Segments that contain size info if(reader.read(buf, sizeof(JPG_Size_segment_body))(info); buf=rmi.ptr; @@ -224,11 +233,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(); @@ -275,11 +285,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); @@ -301,14 +312,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); @@ -354,11 +368,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)); @@ -379,9 +393,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); } @@ -396,11 +410,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) { @@ -413,9 +427,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) { @@ -428,11 +442,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) { @@ -445,11 +459,11 @@ 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))); } static void _replace(Request& r, const String& method_name, MethodParams *params) { @@ -470,12 +484,12 @@ static void _replace(Request& r, const S 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(); + p[i].x=params->as_int(2+i*2+0, r); + p[i].y=params->as_int(2+i*2+1, r); } 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 + 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) { @@ -496,11 +510,11 @@ static void _polygon(Request& r, const S 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(); + p[i].x=params->as_int(2+i*2+0, r); + p[i].y=params->as_int(2+i*2+1, r); } image->Polygon(p, n, - image->Color(r.process(params->get(0)).as_int())); + image->Color(params->as_int(0, r))); } static void _polybar(Request& r, const String& method_name, MethodParams *params) { @@ -521,11 +535,11 @@ static void _polybar(Request& r, const S 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(); + p[i].x=params->as_int(2+i*2+0, r); + p[i].y=params->as_int(2+i*2+1, r); } image->FilledPolygon(p, n, - image->Color(r.process(params->get(0)).as_int())); + image->Color(params->as_int(0, r))); } // font @@ -536,16 +550,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) { } @@ -558,14 +574,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) @@ -675,8 +701,8 @@ MImage::MImage(Pool& apool) : Methoded(a // ^image.polybar(color)(x;y)... point coord pairs add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*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]