--- parser3/src/classes/image.C 2002/02/08 07:27:40 1.65 +++ parser3/src/classes/image.C 2002/09/18 08:52:48 1.76 @@ -1,12 +1,12 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001, 2002 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: image.C,v 1.65 2002/02/08 07:27:40 paf Exp $ + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +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]; @@ -128,13 +134,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, + if(strncmp(head->signature, "GIF", 3)!=0) + throw Exception("image.format", origin_string, "not GIF file - wrong signature"); @@ -153,13 +159,13 @@ void measure_jpeg(Pool& pool, const Stri void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_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,12 +235,14 @@ 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(0, 0, + throw Exception("image.format", &file_name, "unhandled image file name extension '%s'", cext); } else - throw Exception(0, 0, + throw Exception("image.format", &file_name, "can not determine image type - no file name extension"); } @@ -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,19 +338,20 @@ 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()) { - Value &vattribs=r.process(params->get(0), - 0/*no name*/, + // 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' if(attribs=vattribs.get_hash(&method_name)) { 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 +362,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 +373,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; @@ -364,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) { @@ -378,15 +408,15 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -405,9 +435,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -422,9 +452,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -437,9 +467,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -454,9 +484,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -481,15 +511,15 @@ 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, 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"); @@ -504,15 +534,15 @@ 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, 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"); @@ -527,15 +557,15 @@ 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, 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"); @@ -549,15 +579,15 @@ 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, 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"); @@ -652,11 +682,11 @@ 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"); - 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); @@ -669,16 +699,16 @@ 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); 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"); } @@ -688,18 +718,16 @@ 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(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"); } @@ -707,9 +735,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -726,9 +754,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -745,9 +773,9 @@ 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, 0, + throw Exception(0, &method_name, "does not contain an image"); @@ -764,16 +792,18 @@ 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(0, 0, - &method_name, - msg); + Value& value=params->as_no_junction(index, msg); - gdImage *src=static_cast(&value)->image; - if(!src) - throw Exception(0, 0, + 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); @@ -783,9 +813,9 @@ 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, 0, + throw Exception(0, &method_name, "self does not contain an image"); @@ -812,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);