--- parser3/src/classes/image.C 2002/04/10 09:53:14 1.69 +++ parser3/src/classes/image.C 2002/09/18 08:52:48 1.76 @@ -3,10 +3,10 @@ Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: image.C,v 1.69 2002/04/10 09:53:14 paf Exp $ */ +static const char* IDENT_IMAGE_C="$Date: 2002/09/18 08:52:48 $"; + /* jpegsize: gets the width and height (in pixels) of a jpeg file Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 @@ -25,10 +25,6 @@ #include "pa_vfile.h" #include "pa_vimage.h" -// defines - -#define IMAGE_CLASS_NAME "image" - // class class MImage : public Methoded { @@ -83,9 +79,19 @@ private: }; #endif +/// PNG file header +struct PNG_Header { + char dummy[12]; + char signature[4]; //< must be "IHDR" + unsigned char high_width[2]; //< image width high bytes [we ignore for now] + unsigned char width[2]; //< image width low bytes + unsigned char high_height[2]; //< image height high bytes [we ignore for now] + unsigned char height[4]; //< image height +}; + /// GIF file header struct GIF_Header { - char type[3]; // 'GIF' + char signature[3]; // 'GIF' char version[3]; unsigned char width[2]; unsigned char height[2]; @@ -133,7 +139,7 @@ void measure_gif(Pool& pool, const Strin "not GIF file - too small"); GIF_Header *head=(GIF_Header *)buf; - if(strncmp(head->type, "GIF", 3)!=0) + if(strncmp(head->signature, "GIF", 3)!=0) throw Exception("image.format", origin_string, "not GIF file - wrong signature"); @@ -199,6 +205,26 @@ void measure_jpeg(Pool& pool, const Stri "broken JPEG file - size frame not found"); } +void measure_png(Pool& pool, const String *origin_string, + Measure_reader& reader, int& width, int& height) { + + void *buf; + const int head_size=sizeof(PNG_Header); + if(reader.read(buf, head_size)signature, "IHDR", 4)!=0) + throw Exception("image.format", + origin_string, + "not PNG file - wrong signature"); + + width=big_endian_to_int(head->width); + height=big_endian_to_int(head->height); +} + // measure center void measure(Pool& pool, const String& file_name, @@ -209,6 +235,8 @@ void measure(Pool& pool, const String& f measure_gif(pool, &file_name, reader, width, height); else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) measure_jpeg(pool, &file_name, reader, width, height); + else if(strcasecmp(cext, "PNG")==0) + measure_png(pool, &file_name, reader, width, height); else throw Exception("image.format", &file_name, @@ -282,7 +310,7 @@ static void _measure(Request& r, const S int width, height; measure(pool, *file_name, reader, width, height); - static_cast(r.self)->set(file_name, width, height); + static_cast(r.get_self())->set(file_name, width, height); } #ifndef DOXYGEN @@ -310,13 +338,13 @@ static void _html(Request& r, const Stri String tag(pool); tag << "(r.self)->fields(); + const Hash& fields=static_cast(r.get_self())->fields(); Hash *attribs=0; if(params->size()) { // for backward compatibility: someday was ^html{} Value &vattribs=r.process_to_value(params->get(0), - 0/*no name*/, + /*0/*no name* /,*/ false/*don't intercept string*/); if(vattribs.is_defined()) // allow 'void' if(attribs=vattribs.get_hash(&method_name)) { @@ -366,7 +394,7 @@ static void _load(Request& r, const Stri gdImage& image=*load(r, method_name, file_name); int width=image.SX(); int height=image.SY(); - static_cast(r.self)->set(&file_name, width, height, &image); + static_cast(r.get_self())->set(&file_name, width, height, &image); } static void _create(Request& r, const String& method_name, MethodParams *params) { @@ -380,13 +408,13 @@ static void _create(Request& r, const St 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); + static_cast(r.get_self())->set(0, width, height, &image); } static void _gif(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -407,7 +435,7 @@ static void _gif(Request& r, const Strin static void _line(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -424,7 +452,7 @@ static void _line(Request& r, const Stri static void _fill(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -439,7 +467,7 @@ static void _fill(Request& r, const Stri static void _rectangle(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -456,7 +484,7 @@ static void _rectangle(Request& r, const static void _bar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -483,7 +511,7 @@ static void add_point(Array::Item *value static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -506,7 +534,7 @@ static void _replace(Request& r, const S static void _polyline(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -529,7 +557,7 @@ static void _polyline(Request& r, const static void _polygon(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -551,7 +579,7 @@ static void _polygon(Request& r, const S static void _polybar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -658,7 +686,7 @@ static void _font(Request& r, const Stri &method_name, "alphabet must not be empty"); - static_cast(r.self)->font=new(pool) Font(pool, + static_cast(r.get_self())->font=new(pool) Font(pool, alphabet, image, image.SY() / alphabet.size(), monospace_width, spacebar_width); @@ -671,7 +699,7 @@ static void _text(Request& r, const Stri int y=params->as_int(1, "y must be int", r); const String& s=params->as_string(2, "text must not be code"); - VImage& vimage=*static_cast(r.self); + VImage& vimage=*static_cast(r.get_self()); if(vimage.image) if(vimage.font) vimage.font->string_display(*vimage.image, x, y, s); @@ -690,12 +718,10 @@ static void _length(Request& r, const St const String& s=params->as_string(0, "text must not be code"); - VImage& vimage=*static_cast(r.self); + VImage& vimage=*static_cast(r.get_self()); if(vimage.image) if(vimage.font) { - VInt& result=*new(pool) VInt(pool, vimage.font->string_width(s)); - result.set_name(method_name); - r.write_assign_lang(result); + r.write_no_lang(*new(pool) VInt(pool, vimage.font->string_width(s))); } else throw Exception("parser.runtime", &method_name, @@ -709,7 +735,7 @@ static void _length(Request& r, const St static void _arc(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -728,7 +754,7 @@ static void _arc(Request& r, const Strin static void _sector(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -747,7 +773,7 @@ static void _sector(Request& r, const St static void _circle(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *image=static_cast(r.self)->image; + gdImage *image=static_cast(r.get_self())->image; if(!image) throw Exception(0, &method_name, @@ -766,15 +792,17 @@ static void _circle(Request& r, const St gdImage& as_image(Pool& pool, const String& method_name, MethodParams *params, int index, const char *msg) { - Value& value=params->as_no_junction(index, msg); + gdImage *src=0; - if(strcmp(value.type(), VIMAGE_TYPE)!=0) - throw Exception("parser.runtime", - &method_name, - msg); + Value& value=params->as_no_junction(index, msg); - gdImage *src=static_cast(&value)->image; - if(!src) + if(Value *vimage=value.as(VIMAGE_TYPE, false)) { + src=static_cast(vimage)->image; + if(!src) + throw Exception("parser.runtime", + &method_name, + msg); + } else throw Exception("parser.runtime", &method_name, msg); @@ -785,7 +813,7 @@ gdImage& as_image(Pool& pool, const Stri static void _copy(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - gdImage *dest=static_cast(r.self)->image; + gdImage *dest=static_cast(r.get_self())->image; if(!dest) throw Exception(0, &method_name, @@ -814,10 +842,7 @@ static void _copy(Request& r, const Stri // constructor -MImage::MImage(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); - - +MImage::MImage(Pool& apool) : Methoded(apool, "image") { // ^image:measure[DATA] add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1);