--- parser3/src/classes/image.C 2001/04/17 19:31:06 1.19 +++ parser3/src/classes/image.C 2001/05/07 15:31:36 1.25 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.19 2001/04/17 19:31:06 paf Exp $ + $Id: image.C,v 1.25 2001/05/07 15:31:36 paf Exp $ */ #include "pa_config_includes.h" @@ -17,12 +17,27 @@ #include "pa_vfile.h" #include "pa_vimage.h" -// global var +// defines -VStateless_class *image_class; +#define IMAGE_CLASS_NAME "image" + +// class + +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; } + +}; // helpers +/// simple buffered reader[from memory/file], used in _measure class Measure_reader { public: enum { READ_CHUNK_SIZE=0x400 };// 1K @@ -59,7 +74,7 @@ private: size_t size; }; -// GIF +/// GIF file header struct GIF_Header { char type[3]; // 'GIF' char version[3]; @@ -70,7 +85,7 @@ struct GIF_Header { char nulls; }; -// JPEG +/// JPEG file header struct JFIF_Header { char length[2]; // length of JFIF segment marker char identifier[5]; // JFIF identifier @@ -82,6 +97,7 @@ struct JFIF_Header { 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 @@ -203,8 +219,7 @@ void measure(Pool& pool, const String& f "can not determine image type - no file name extension"); } -// read from somewhere - +/// used by image: _measure / read_mem struct Read_mem_info { unsigned char *ptr; unsigned char *eof; @@ -217,6 +232,7 @@ static size_t read_mem(void*& buf, size_ return read_size; } +/// used by image: _measure / read_disk struct Read_disk_info { const String *file_spec; size_t offset; @@ -238,7 +254,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(); @@ -268,9 +283,10 @@ static void _measure(Request& r, const S static_cast(r.self)->set(file_name, width, height); } +/// used by image: _html / append_attrib_pair struct Attrib_info { - String *tag; - Hash *skip; + String *tag; ///< html tag being constructed + Hash *skip; ///< tag attributes not to append to tag string [to skip] }; static void append_attrib_pair(const Hash::Key& key, Hash::Val *val, void *info) { Attrib_info& ai=*static_cast(info); @@ -284,8 +300,6 @@ static void append_attrib_pair(const Has if(value.is_string() || value.as_double()>=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(); @@ -317,8 +331,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, @@ -329,7 +347,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(); @@ -342,8 +359,6 @@ 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(); @@ -358,7 +373,6 @@ static void _create(Request& r, const St 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(); @@ -374,12 +388,12 @@ static void _gif(Request& r, const Strin VFile& vfile=*new(pool) VFile(pool); String& image_gif=*new(pool) String(pool, "image/gif"); - vfile.set(false/*not tainted*/, out.cstr(), out.size(), 0, &image_gif); + vfile.set(false/*not tainted*/, + out.cstr(String::UL_AS_IS), out.size(), 0, &image_gif); 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(); @@ -397,7 +411,6 @@ static void _line(Request& r, const Stri image->Color((int)r.process(params->get(4)).as_double())); } -/// ^image.fill(x;y;color) static void _fill(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -413,7 +426,6 @@ static void _fill(Request& r, const Stri image->Color((int)r.process(params->get(2)).as_double())); } -/// ^image.rectangle(x0;y0;x1;y1;color) static void _rectangle(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -431,7 +443,6 @@ static void _rectangle(Request& r, const image->Color((int)r.process(params->get(4)).as_double())); } -/// ^image.bar(x0;y0;x1;y1;color) static void _bar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -449,7 +460,6 @@ static void _bar(Request& r, const Strin image->Color((int)r.process(params->get(4)).as_double())); } -/// ^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(); @@ -476,7 +486,6 @@ static void _replace(Request& r, const S image->Color((int)r.process(params->get(1)).as_double()));// 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(); @@ -502,7 +511,6 @@ static void _polygon(Request& r, const S image->Color((int)r.process(params->get(0)).as_double())); } -/// ^image.polybar(color)(x;y)... point coord pairs static void _polybar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -531,6 +539,8 @@ static void _polybar(Request& r, const S // font #define Y(y)(y+index*height+1) + +/// simple gdImage-based font storage & text output class Font : public Pooled { public: @@ -593,10 +603,6 @@ 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(); @@ -612,7 +618,6 @@ 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(); @@ -634,51 +639,65 @@ static void _text(Request& r, const Stri "does not contain an image"); } -// initialize -void initialize_image_class(Pool& pool, VStateless_class& vclass) { +// constructor + +MImage::MImage(Pool& apool) : Methoded(apool) { + set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); + + // ^image:measure[DATA] - vclass.add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); + add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); - /// ^image.html[] - /// ^image.html[hash] - vclass.add_native_method("html", Method::CT_DYNAMIC, _html, 0, 1); + // ^image.html[] + // ^image.html[hash] + add_native_method("html", Method::CT_DYNAMIC, _html, 0, 1); - /// ^image.load[background.gif] - vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1); + // ^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] - vclass.add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3); + // ^image.create[width;height] bgcolor=white + // ^image.create[width;height;bgcolor] + add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3); - /// ^image.gif[] - vclass.add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0); + // ^image.gif[] + add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0); - /// ^image.line(x0;y0;x1;y1;color) - vclass.add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5); + // ^image.line(x0;y0;x1;y1;color) + add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5); - /// ^image.fill(x;y;color) - vclass.add_native_method("fill", Method::CT_DYNAMIC, _fill, 3, 3); + // ^image.fill(x;y;color) + add_native_method("fill", Method::CT_DYNAMIC, _fill, 3, 3); - /// ^image.rectangle(x0;y0;x1;y1;color) - vclass.add_native_method("rectangle", Method::CT_DYNAMIC, _rectangle, 5, 5); + // ^image.rectangle(x0;y0;x1;y1;color) + add_native_method("rectangle", Method::CT_DYNAMIC, _rectangle, 5, 5); - /// ^image.bar(x0;y0;x1;y1;color) - vclass.add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); + // ^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 - vclass.add_native_method("replace", Method::CT_DYNAMIC, _replace, 2+3*2, 2+100*2); + // ^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 - vclass.add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 1+3*2, 1+100*2); + // ^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 - vclass.add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*2); + // ^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) - vclass.add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); + // ^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] - vclass.add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); + // ^image.text(x;y)[text] + add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); } + +// global variable + +Methoded *image_class; + +// creator + +Methoded *MImage_create(Pool& pool) { + return image_class=new(pool) MImage(pool); +}