--- parser3/src/classes/image.C 2001/04/28 08:43:47 1.22 +++ parser3/src/classes/image.C 2001/06/28 07:41:59 1.28 @@ -5,8 +5,9 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.22 2001/04/28 08:43:47 paf Exp $ + $Id: image.C,v 1.28 2001/06/28 07:41:59 parser Exp $ */ +static char *RCSId="$Id: image.C,v 1.28 2001/06/28 07:41:59 parser Exp $"; #include "pa_config_includes.h" @@ -25,11 +26,12 @@ class MImage : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VImage(pool); } public: MImage(Pool& pool); + +public: // Methoded bool used_directly() { return true; } }; @@ -86,23 +88,23 @@ struct GIF_Header { /// 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 + 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 frame header struct JPG_Frame { - char length[2]; // length of image marker - char data; // data precision of bits/sample - char height[2]; // image height - char width[2]; // image width - char numComponents; // number of color components + char length[2]; //< length of image marker + char data; //< data precision of bits/sample + char height[2]; //< image height + char width[2]; //< image width + char numComponents; //< number of color components }; // @@ -253,7 +255,6 @@ static size_t read_disk(void*& buf, size // methods -/// ^image:measure[DATA] static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -297,12 +298,9 @@ static void append_attrib_pair(const Has Value& value=*static_cast(val); // src="a.gif" width=123 ismap[=-1] *ai.tag << " " << key; - if(value.is_string() || value.as_double()>=0) + if(value.is_string() || value.as_int()>=0) *ai.tag << "=\"" << value.as_string() << "\""; } -/** ^image.html[] - ^image.html[hash] -*/ static void _html(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -334,8 +332,12 @@ static gdImage *load(Request& r, const S const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_NAME); if(FILE *f=fopen(file_name_cstr, "rb")) { gdImage& image=*new(pool) gdImage(pool); - image.CreateFromGif(f); + bool ok=image.CreateFromGif(f); fclose(f); + if(!ok) + PTHROW(0, 0, + &file_name, + "is not in GIF format"); return ℑ } else { PTHROW(0, 0, @@ -346,7 +348,6 @@ static gdImage *load(Request& r, const S } -/// ^image.load[background.gif] static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -359,24 +360,20 @@ static void _load(Request& r, const Stri static_cast(r.self)->set(&file_name, width, height, &image); } -/** ^image.create[width;height] bgcolor=white - ^image.create[width;height;bgcolor] -*/ static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - int width=(int)r.process(params->get(0)).as_double(); - int height=(int)r.process(params->get(1)).as_double(); + int width=r.process(params->get(0)).as_int(); + int height=r.process(params->get(1)).as_int(); int bgcolor_value=0xffFFff; if(params->size()>2) - bgcolor_value=(int)r.process(params->get(2)).as_double(); + bgcolor_value=r.process(params->get(2)).as_int(); 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); } -/// ^image.gif[] static void _gif(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -398,7 +395,6 @@ static void _gif(Request& r, const Strin r.write_no_lang(vfile); } -/// ^image.line(x0;y0;x1;y1;color) static void _line(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -409,14 +405,13 @@ static void _line(Request& r, const Stri "does not contain an image"); image->Line( - (int)r.process(params->get(0)).as_double(), - (int)r.process(params->get(1)).as_double(), - (int)r.process(params->get(2)).as_double(), - (int)r.process(params->get(3)).as_double(), - image->Color((int)r.process(params->get(4)).as_double())); + 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())); } -/// ^image.fill(x;y;color) static void _fill(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -427,12 +422,11 @@ static void _fill(Request& r, const Stri "does not contain an image"); image->Fill( - (int)r.process(params->get(0)).as_double(), - (int)r.process(params->get(1)).as_double(), - image->Color((int)r.process(params->get(2)).as_double())); + r.process(params->get(0)).as_int(), + r.process(params->get(1)).as_int(), + image->Color(r.process(params->get(2)).as_int())); } -/// ^image.rectangle(x0;y0;x1;y1;color) static void _rectangle(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -443,14 +437,13 @@ static void _rectangle(Request& r, const "does not contain an image"); image->Rectangle( - (int)r.process(params->get(0)).as_double(), - (int)r.process(params->get(1)).as_double(), - (int)r.process(params->get(2)).as_double(), - (int)r.process(params->get(3)).as_double(), - image->Color((int)r.process(params->get(4)).as_double())); + 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())); } -/// ^image.bar(x0;y0;x1;y1;color) static void _bar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -461,14 +454,13 @@ static void _bar(Request& r, const Strin "does not contain an image"); image->FilledRectangle( - (int)r.process(params->get(0)).as_double(), - (int)r.process(params->get(1)).as_double(), - (int)r.process(params->get(2)).as_double(), - (int)r.process(params->get(3)).as_double(), - image->Color((int)r.process(params->get(4)).as_double())); + 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())); } -/// ^image.replace(color-source;color-dest)(x;y)... point coord pairs static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -487,15 +479,14 @@ 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_double(); - p[i].y=(int)r.process(params->get(2+i*2+1)).as_double(); + p[i].x=r.process(params->get(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((int)r.process(params->get(0)).as_double()), // src color - image->Color((int)r.process(params->get(1)).as_double()));// dest color + image->Color(r.process(params->get(0)).as_int()), // src color + image->Color(r.process(params->get(1)).as_int()));// dest color } -/// ^image.polygon(color)(x;y)... point coord pairs static void _polygon(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -514,14 +505,13 @@ 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_double(); - p[i].y=(int)r.process(params->get(1+i*2+1)).as_double(); + p[i].x=r.process(params->get(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((int)r.process(params->get(0)).as_double())); + image->Color(r.process(params->get(0)).as_int())); } -/// ^image.polybar(color)(x;y)... point coord pairs static void _polybar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -540,11 +530,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_double(); - p[i].y=(int)r.process(params->get(1+i*2+1)).as_double(); + p[i].x=r.process(params->get(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((int)r.process(params->get(0)).as_double())); + image->Color(r.process(params->get(0)).as_int())); } // font @@ -555,8 +545,8 @@ static void _polybar(Request& r, const S class Font : public Pooled { public: - int height; /* Font heigth */ - int space; /* Default char width */ + int height; //< Font heigth + int space; //< Default char width gdImage& ifont; const String& alphabet; @@ -614,18 +604,14 @@ public: } }; -/** - ^image.font[alPHAbet;font-file-name.gif](height) - ^image.font[alPHAbet;font-file-name.gif](height;width) -*/ static void _font(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& valphabet=params->get_no_junction(0, "alphabet must not be code"); Value& file_name=params->get_no_junction(1, "file_name must not be code"); - int height=(int)r.process(params->get(2)).as_double(); + int height=r.process(params->get(2)).as_int(); - int width=params->size()>3?(int)r.process(params->get(3)).as_double():0; + 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(), @@ -633,12 +619,11 @@ static void _font(Request& r, const Stri height, width); } -/// ^image.text(x;y)[text] static void _text(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - int x=(int)r.process(params->get(0)).as_double(); - int y=(int)r.process(params->get(1)).as_double(); + 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(); VImage& vimage=*static_cast(r.self); @@ -664,46 +649,46 @@ MImage::MImage(Pool& apool) : Methoded(a // ^image:measure[DATA] add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); - /// ^image.html[] - /// ^image.html[hash] + // ^image.html[] + // ^image.html[hash] add_native_method("html", Method::CT_DYNAMIC, _html, 0, 1); - /// ^image.load[background.gif] + // ^image.load[background.gif] add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1); - /// ^image.create[width;height] bgcolor=white - /// ^image.create[width;height;bgcolor] + // ^image.create[width;height] bgcolor=white + // ^image.create[width;height;bgcolor] add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3); - /// ^image.gif[] + // ^image.gif[] add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0); - /// ^image.line(x0;y0;x1;y1;color) + // ^image.line(x0;y0;x1;y1;color) add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5); - /// ^image.fill(x;y;color) + // ^image.fill(x;y;color) add_native_method("fill", Method::CT_DYNAMIC, _fill, 3, 3); - /// ^image.rectangle(x0;y0;x1;y1;color) + // ^image.rectangle(x0;y0;x1;y1;color) add_native_method("rectangle", Method::CT_DYNAMIC, _rectangle, 5, 5); - /// ^image.bar(x0;y0;x1;y1;color) + // ^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 + // ^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.polygon(color)(x;y)... point coord pairs + // ^image.polygon(color)(x;y)... point coord pairs add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 1+3*2, 1+100*2); - /// ^image.polybar(color)(x;y)... point coord pairs + // ^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](height) + // ^image.font[alPHAbet;font-file-name.gif](height;width) add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); - /// ^image.text(x;y)[text] + // ^image.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); }