--- parser3/src/classes/image.C 2001/05/11 17:45:10 1.26 +++ parser3/src/classes/image.C 2001/08/31 10:18:08 1.35 @@ -5,7 +5,17 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.26 2001/05/11 17:45:10 parser Exp $ + $Id: image.C,v 1.35 2001/08/31 10:18:08 parser Exp $ +*/ +static const char *RCSId="$Id: image.C,v 1.35 2001/08/31 10:18:08 parser Exp $"; + +/* + jpegsize: gets the width and height (in pixels) of a jpeg file + Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 + modified slightly by alex@ed.ac.uk + and further still by rjray@uswest.com + optimization and general re-write from tmetro@vl.com + from perl by paf@design.ru */ #include "pa_config_includes.h" @@ -40,7 +50,7 @@ public: // Methoded /// simple buffered reader[from memory/file], used in _measure class Measure_reader { public: - enum { READ_CHUNK_SIZE=0x400 };// 1K + enum { READ_CHUNK_SIZE=0x400*10 };// 10K typedef size_t(*Func)(void *& buf, size_t limit, void *info); Measure_reader(Func afunc, void *ainfo) : @@ -48,7 +58,7 @@ public: chunk(0), offset(0), size(0) { } - size_t read(unsigned char *& buf, size_t limit) { + size_t read(void *&buf, size_t limit) { if(offset+limit>size) // nothing left if(offset==0 || limit==1) { // only one-byte continuations allowed size=(*func)(chunk, READ_CHUNK_SIZE, info); @@ -85,118 +95,108 @@ struct GIF_Header { char nulls; }; -/// 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 +/// JPEG record head +struct JPG_Segment_head { + unsigned char marker; + unsigned char code; + unsigned char length[2]; }; /// 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 +struct JPG_Size_segment_body { + char data; //< data precision of bits/sample + unsigned char height[2]; //< image height + unsigned char width[2]; //< image width + char numComponents; //< number of color components }; // -inline short bytes_to_int(unsigned char HI, unsigned char LO) { - return(short)((HI<<8) + LO); +inline short x_endian_to_int(unsigned char L, unsigned char H) { + return(short)((H<<8) + L); +} + +inline short big_endian_to_int(unsigned char b[2]) { + return x_endian_to_int(b[1], b[0]); +} + +inline short little_endian_to_int(unsigned char b[2]) { + return x_endian_to_int(b[0], b[1]); } void measure_gif(Pool& pool, const String *origin_string, Measure_reader& reader, int& width, int& height) { - unsigned char *buf; + void *buf; const int head_size=sizeof(GIF_Header); if(reader.read(buf, head_size)(buf); - if(strncmp(screenD.type, "GIF", 3)!=0) + if(strncmp(head->type, "GIF", 3)!=0) PTHROW(0, 0, origin_string, - "bad image file - GIF signature not found"); + "not GIF file - signature not found"); - width=bytes_to_int(screenD.width[1], screenD.width[0]); - height=bytes_to_int(screenD.height[1], screenD.height[0]); + width=little_endian_to_int(head->width); + height=little_endian_to_int(head->height); } void measure_jpeg(Pool& pool, const String *origin_string, Measure_reader& reader, int& width, int& height) { // JFIF format markers - const unsigned char SOI=0xD8; - const unsigned char EOI=0xD9; - const unsigned char APP0=0xE0; - const unsigned char SOF0=0xC0; - const unsigned char SOF2=0xC2; - const unsigned char COM=0xFE; + const unsigned char MARKER=0xFF; + const unsigned char CODE_SIZE_FIRST=0xC0; + const unsigned char CODE_SIZE_LAST=0xC3; - unsigned char *screenD_buf; - unsigned char *h_buf=0; - - bool flag=false; - - unsigned char *prefix; + void *buf; const size_t prefix_size=2; - if(reader.read(prefix, prefix_size)(screenD_buf); - if((bytes_to_int(screenD.length[0], screenD.length[1]) < 16) || - strcasecmp(screenD.identifier, "JFIF")) flag=false; - } + "not JPEG file - signature not found"); + + bool found=false; + while(true) { + void *buf; + // Extract the segment header. + if(reader.read(buf, sizeof(JPG_Segment_head))marker!=MARKER) break; - case SOF0: - case SOF2: - if(reader.read(h_buf, sizeof(JPG_Frame))code >= CODE_SIZE_FIRST && head->code <= CODE_SIZE_LAST) { + // Segments that contain size info + if(reader.read(buf, sizeof(JPG_Size_segment_body))width); + height=big_endian_to_int(body->height); + found=true; break; - default: break; - } - } while(*marker!=EOI); - - if(flag && h_buf) { - JPG_Frame& h=*reinterpret_cast(h_buf); - width=bytes_to_int(h.width[0], h.width[1]); - height=bytes_to_int(h.height[0], h.height[1]); - } else + } else { + // Dummy read to skip over data + size_t limit=big_endian_to_int(head->length) - 2; + if(reader.read(buf, limit)get_no_junction(0, "data must not be code"); + Value& data=params->as_no_junction(0, "data must not be code"); void *info;Measure_reader::Func read_func; Read_mem_info read_mem_info; @@ -350,7 +350,7 @@ static gdImage *load(Request& r, const S static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& file_name=vfile_name.as_string(); gdImage& image=*load(r, method_name, file_name); @@ -544,16 +544,18 @@ static void _polybar(Request& r, const S class Font : public Pooled { public: - int height; /* Font heigth */ - int space; /* Default char width */ + const static int kerning; + int height; ///< Font heigth + int monospace; ///< Default char width + int spacebarspace; ///< spacebar width gdImage& ifont; const String& alphabet; Font(Pool& pool, const String& aalphabet, - gdImage& aifont, int aheight, int aspace) : Pooled(pool), + gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), alphabet(aalphabet), - height(aheight), space(aspace), + height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), ifont(aifont) { } @@ -566,14 +568,12 @@ public: int index_width(int index) { if(index<0) - index=index_of('.'); - if(index<0) - return 0; + return spacebarspace; int tr=ifont.GetTransparent(); - for(int x=ifont.SX()-1; x>0; x--) { + for(int x=ifont.SX()-1; x>=0; x--) { for(int y=0; yget_no_junction(0, "alphabet must not be code"); - Value& file_name=params->get_no_junction(1, "file_name must not be code"); + Value& valphabet=params->as_no_junction(0, "alphabet must not be code"); + Value& file_name=params->as_no_junction(1, "file_name must not be code"); int height=r.process(params->get(2)).as_int(); + int spacebar_width=r.process(params->get(3)).as_int(); - int width=params->size()>3?r.process(params->get(3)).as_int():0; + int monospace_width=params->size()>4?r.process(params->get(4)).as_int():0; static_cast(r.self)->font=new(pool) Font(pool, valphabet.as_string(), *load(r, method_name, file_name.as_string()), - height, width); + height, monospace_width, spacebar_width); } static void _text(Request& r, const String& method_name, MethodParams *params) { @@ -683,9 +686,9 @@ MImage::MImage(Pool& apool) : Methoded(a // ^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) - add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); + // ^image.font[alPHAbet;font-file-name.gif](height;spacebar_width) + // ^image.font[alPHAbet;font-file-name.gif](height;spacebar_width;width) + add_native_method("font", Method::CT_DYNAMIC, _font, 4, 5); // ^image.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3);