--- parser3/src/classes/image.C 2009/07/07 05:47:43 1.129 +++ parser3/src/classes/image.C 2012/06/15 11:54:18 1.142 @@ -1,12 +1,10 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_IMAGE_C="$Date: 2009/07/07 05:47:43 $"; - /* jpegsize: gets the width and height (in pixels) of a jpeg file Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 @@ -17,11 +15,9 @@ static const char * const IDENT_IMAGE_C= */ #include "pa_config_includes.h" - -#include "pa_vmethod_frame.h" - #include "gif.h" +#include "pa_vmethod_frame.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" @@ -29,6 +25,8 @@ static const char * const IDENT_IMAGE_C= #include "pa_vdate.h" #include "pa_table.h" +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.142 2012/06/15 11:54:18 moko Exp $"; + // defines static const String spacebar_width_name("space"); @@ -39,14 +37,10 @@ static const String letter_spacing_name( class MImage: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue*) { return new VImage(); } + Value* create_new_value(Pool&) { return new VImage(); } public: MImage(); - -public: // Methoded - bool used_directly() { return true; } - }; // globals @@ -806,14 +800,18 @@ struct Attrib_info { }; #endif static void append_attrib_pair( - HashStringValue::key_type key, - HashStringValue::value_type value, - Attrib_info* info) { - // skip user-specified and internal(starting with "line-") attributes - if(info->skip && info->skip->get(key) || key.pos("line-")==0) + HashStringValue::key_type key, + HashStringValue::value_type value, + Attrib_info* info) { + // skip user-specified, internal(starting with "line-") attributes and border attribute with empty value + if( + (info->skip && info->skip->get(key)) + || key.pos("line-")==0 + || (key=="border" && !value->is_defined()) + ) return; - // src="a.gif" width=123 ismap[=-1] + // src="a.gif" width="123" ismap[=-1] *info->tag << " " << key; if(value->is_string() || value->as_int()>=0) *info->tag << "=\"" << value->as_string() << "\""; @@ -828,8 +826,7 @@ static void _html(Request& r, MethodPara if(params.count()) { // for backward compatibility: someday was ^html{} - Value& vattribs=r.process_to_value(params[0], - false/*don't intercept string*/); + Value& vattribs=r.process_to_value(params[0], false/*don't intercept string*/); if(!vattribs.is_string()) // allow empty if((attribs=vattribs.get_hash())) { Attrib_info info={&tag, 0}; @@ -891,18 +888,13 @@ static void _create(Request& r, MethodPa static void _gif(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - const String *file_name=0; - if(params.count()>0) - file_name=¶ms.as_string(0, FILE_NAME_MUST_BE_STRING); + const String *file_name=params.count()>0?¶ms.as_string(0, FILE_NAME_MUST_BE_STRING):0; gdBuf buf=image.Gif(); VFile& vfile=*new VFile; - Value* content_type=new VString(*new String("image/gif")); - vfile.set(false/*not tainted*/, - (const char*)buf.ptr, buf.size, - file_name? file_name->taint_cstr(String::L_FILE_SPEC): 0, - content_type); + + vfile.set_binary(false/*not tainted*/, (const char *)buf.ptr, buf.size, file_name, new VString(*new String("image/gif"))); r.write_no_lang(vfile); } @@ -961,31 +953,50 @@ static void add_point(Table::element_typ (*p)++; } #endif +#ifndef DOXYGEN +static void add_point(int x, int y, + gdImage::Point **p) { + (**p).x=x; + (**p).y=y; + (*p)++; +} +#endif static void _replace(Request& r, MethodParams& params) { + int src_color=params.as_int(0, "src color must be int", r); + int dest_color=params.as_int(1, "dest color must be int", r); + gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_no_junction(2, COORDINATES_MUST_NOT_BE_CODE).get_table(); - if(!table) - throw Exception(PARSER_RUNTIME, - 0, - "coordinates must be table"); + gdImage::Point* all_p=0; + size_t count=0; + if(params.count() == 3){ + Table* table=params.as_table(2, "coordinates"); + count=table->count(); + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + table->for_each(add_point, &add_p); + } else { + int max_x=image.SX()-1; + int max_y=image.SY()-1; + if(max_x > 0 && max_y > 0){ + count=4; + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + add_point(0, 0, &add_p); + add_point(max_x, 0, &add_p); + add_point(max_x, max_y, &add_p); + add_point(0, max_y, &add_p); + } + } - gdImage::Point *all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.FilledPolygonReplaceColor(all_p, table->count(), - image.Color(params.as_int(0, "src color must be int", r)), - image.Color(params.as_int(1, "dest color must be int", r))); + if(count) + image.FilledPolygonReplaceColor(all_p, count, image.Color(src_color), image.Color(dest_color)); } static void _polyline(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); - if(!table) - throw Exception(PARSER_RUNTIME, - 0, - "coordinates must be table"); + Table* table=params.as_table(1, "coordinates"); gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; gdImage::Point *add_p=all_p; @@ -998,11 +1009,7 @@ static void _polyline(Request& r, Method static void _polygon(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); - if(!table) - throw Exception(PARSER_RUNTIME, - 0, - "coordinates must be table"); + Table* table=(Table*)params.as_table(1, "coordinates"); gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; gdImage::Point *add_p=all_p; @@ -1014,11 +1021,7 @@ static void _polygon(Request& r, MethodP static void _polybar(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); - if(!table) - throw Exception(PARSER_RUNTIME, - 0, - "coordinates must be table"); + Table* table=(Table*)params.as_table(1, "coordinates"); gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; gdImage::Point *add_p=all_p; @@ -1033,13 +1036,23 @@ static void _polybar(Request& r, MethodP // Font class -Font::Font(//, +Font::Font( + Charset& asource_charset, const String& aalphabet, gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing): - height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), + fsource_charset(asource_charset), + height(aheight), + monospace(amonospace), + spacebarspace(aspacebarspace), letterspacing(aletterspacing), ifont(aifont), alphabet(aalphabet) { + + if(fsource_charset.isUTF8()){ + size_t index=0; + for(UTF8_string_iterator i(alphabet); i.has_next(); ) + fletter2index.put_dont_replace(i.next(), index++); + } } /* ******************************** char ********************************** */ @@ -1049,6 +1062,11 @@ size_t Font::index_of(char ch) { return alphabet.pos(ch); } +size_t Font::index_of(XMLCh ch) { + if(ch==' ') return STRING_NOT_FOUND; + return fletter2index.get(ch); +} + int Font::index_width(size_t index) { if(index==STRING_NOT_FOUND) return spacebarspace; @@ -1076,17 +1094,33 @@ int Font::step_width(int index) { int Font::string_width(const String& s){ const char* cstr=s.cstr(); int result=0; - for(const char* current=cstr; *current; current++) - result+=step_width(index_of(*current)); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ) + result+=step_width(index_of(i.next())); + } else { + for(const char* current=cstr; *current; current++) + result+=step_width(index_of(*current)); + } + return result; } void Font::string_display(gdImage& image, int x, int y, const String& s){ const char* cstr=s.cstr(); - for(const char* current=cstr; *current; current++) { - size_t index=index_of(*current); - index_display(image, x, y, index); - x+=step_width(index); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ){ + size_t index=index_of(i.next()); + index_display(image, x, y, index); + x+=step_width(index); + } + } else { + for(const char* current=cstr; *current; current++) { + size_t index=index_of(*current); + index_display(image, x, y, index); + x+=step_width(index); + } } } @@ -1095,7 +1129,8 @@ void Font::string_display(gdImage& image static void _font(Request& r, MethodParams& params) { const String& alphabet=params.as_string(0, "alphabet must not be code"); - if(!alphabet.length()) + size_t alphabet_length=alphabet.length(r.charsets.source()); + if(!alphabet_length) throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); @@ -1128,9 +1163,7 @@ static void _font(Request& r, MethodPara letter_spacing=r.process_to_value(*vletter_spacing).as_int(); } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { // backward spacebar_width=params.as_int(2, "spacebar_width must be int", r); @@ -1142,16 +1175,17 @@ static void _font(Request& r, MethodPara } } - if(int remainder=image->SY() % alphabet.length()) + if(int remainder=image->SY() % alphabet_length) throw Exception(PARSER_RUNTIME, 0, "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", - image->SY(), alphabet.length(), remainder); + image->SY(), alphabet_length, remainder); GET_SELF(r, VImage).set_font(new Font( + r.charsets.source(), alphabet, image, - image->SY() / alphabet.length(), monospace_width, spacebar_width, letter_spacing)); + image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); } static void _text(Request& r, MethodParams& params) { @@ -1213,7 +1247,7 @@ static void _circle(Request& r, MethodPa gdImage& as_image(MethodParams& params, int index, const char* msg) { Value& value=params.as_no_junction(index, msg); - if(Value* vimage=value.as(VIMAGE_TYPE, false)) { + if(Value* vimage=value.as(VIMAGE_TYPE)) { return static_cast(vimage)->image(); } else throw Exception(PARSER_RUNTIME, @@ -1291,7 +1325,8 @@ MImage::MImage(): Methoded("image") { add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); // ^image.replace(color-source;color-dest)[table x:y] - add_native_method("replace", Method::CT_DYNAMIC, _replace, 3, 3); + // ^image.replace(color-source;color-dest) + add_native_method("replace", Method::CT_DYNAMIC, _replace, 2, 3); // ^image.polyline(color)[table x:y] add_native_method("polyline", Method::CT_DYNAMIC, _polyline, 2, 2);