--- parser3/src/classes/image.C 2001/10/29 13:04:45 1.60 +++ parser3/src/classes/image.C 2002/04/10 09:53:14 1.69 @@ -1,10 +1,10 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: image.C,v 1.60 2001/10/29 13:04:45 paf Exp $ + $Id: image.C,v 1.69 2002/04/10 09:53:14 paf Exp $ */ /* @@ -128,13 +128,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) - throw Exception(0, 0, + throw Exception("image.format", origin_string, "not GIF file - wrong signature"); @@ -153,13 +153,13 @@ void measure_jpeg(Pool& pool, const Stri void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)size()) { - Value &vattribs=r.process(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' @@ -322,7 +323,7 @@ static void _html(Request& r, const Stri Attrib_info attrib_info={&tag, 0}; attribs->for_each(append_attrib_pair, &attrib_info); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "attributes must be hash"); } @@ -333,6 +334,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(); @@ -343,12 +345,12 @@ static gdImage *load(Request& r, const S bool ok=image.CreateFromGif(f); fclose(f); if(!ok) - throw Exception(0, 0, + throw Exception("image.format", &file_name, "is not in GIF format"); return ℑ } else { - throw Exception(0, 0, + throw Exception("file.missing", &method_name, "can not open '%s'", file_name_cstr); return 0; @@ -386,7 +388,7 @@ static void _gif(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -397,7 +399,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); } @@ -407,7 +409,7 @@ static void _line(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -424,7 +426,7 @@ static void _fill(Request& r, const Stri gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -439,7 +441,7 @@ static void _rectangle(Request& r, const gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -456,7 +458,7 @@ static void _bar(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -483,13 +485,13 @@ static void _replace(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(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) - throw Exception(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -506,13 +508,13 @@ static void _polyline(Request& r, const gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(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) - throw Exception(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -529,13 +531,13 @@ static void _polygon(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(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) - throw Exception(0, 0, + throw Exception(0, &method_name, "coordinates must be table"); @@ -551,13 +553,13 @@ static void _polybar(Request& r, const S gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(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) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "coordinates must be table"); @@ -618,7 +620,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)); @@ -626,7 +628,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); @@ -652,7 +654,7 @@ static void _font(Request& r, const Stri monospace_width=0; if(!alphabet.size()) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "alphabet must not be empty"); @@ -674,11 +676,11 @@ static void _text(Request& r, const Stri if(vimage.font) vimage.font->string_display(*vimage.image, x, y, s); else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "set the font first"); else - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); } @@ -695,11 +697,11 @@ static void _length(Request& r, const St result.set_name(method_name); r.write_assign_lang(result); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "set the font first"); else - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); } @@ -709,7 +711,7 @@ static void _arc(Request& r, const Strin gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -728,7 +730,7 @@ static void _sector(Request& r, const St gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -747,7 +749,7 @@ static void _circle(Request& r, const St gdImage *image=static_cast(r.self)->image; if(!image) - throw Exception(0, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -767,13 +769,13 @@ gdImage& as_image(Pool& pool, const Stri Value& value=params->as_no_junction(index, msg); if(strcmp(value.type(), VIMAGE_TYPE)!=0) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, msg); gdImage *src=static_cast(&value)->image; if(!src) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, msg); @@ -785,7 +787,7 @@ static void _copy(Request& r, const Stri gdImage *dest=static_cast(r.self)->image; if(!dest) - throw Exception(0, 0, + throw Exception(0, &method_name, "self does not contain an image");