--- parser3/src/classes/image.C 2002/09/18 08:52:48 1.76 +++ parser3/src/classes/image.C 2002/11/28 12:23:39 1.87 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_IMAGE_C="$Date: 2002/09/18 08:52:48 $"; +static const char* IDENT_IMAGE_C="$Date: 2002/11/28 12:23:39 $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -44,57 +44,105 @@ public: // Methoded #ifndef DOXYGEN class Measure_reader { public: - enum { READ_CHUNK_SIZE=0x400*20 };// 20K - typedef size_t(*Func)(void *& buf, size_t limit, void *info); + virtual size_t read(const void *&buf, size_t limit)=0; + virtual void seek(long value, int whence)=0; + virtual long tell()=0; +}; - Measure_reader(Func afunc, void *ainfo) : - func(afunc), info(ainfo), - chunk(0), offset(0), size(0) { +class Measure_file_reader: public Measure_reader { +public: + Measure_file_reader(Pool& apool, int af, const String& afile_name, const char *afname): + pool(apool), file_name(afile_name), fname(afname), f(af) { } - 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); - offset=0; - } else - return 0;// as if EOF - if(!size) // EOF + /*override*/size_t read(const void *&abuf, size_t limit) { + if(limit==0) return 0; - - // something left - size_t read_size=min(offset+limit, size)-offset; - buf=((unsigned char *)chunk)+offset; - offset+=read_size; + + void *lbuf=pool.malloc(limit); + size_t read_size=(size_t)::read(f, lbuf, limit); abuf=lbuf; + if(ssize_t(read_size)<0 || read_size>limit) + throw Exception(0, + &file_name, + "measure failed: actually read %lu bytes count not in [0..%lu] valid range", + read_size, limit); + return read_size; } + /*override*/void seek(long value, int whence) { + if(lseek(f, value, whence)<0) + throw Exception("file.seek", + &file_name, + "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", + value, whence, strerror(errno), errno, fname); + } + + /*override*/long tell() { return lseek(f, 0, SEEK_CUR); } + private: - Func func; - void *info; + Pool& pool; + const String& file_name; const char *fname; + int f; +}; + +class Measure_buf_reader: public Measure_reader { +public: + Measure_buf_reader(const void *abuf, size_t asize, const String& afile_name): + buf(abuf), size(asize), file_name(afile_name), offset(0) { + } + + /*override*/size_t read(const void *&abuf, size_t limit) { + size_t to_read=min(limit, size-offset); + abuf=(const char*)buf+offset; + offset+=to_read; + return to_read; + } + + /*override*/void seek(long value, int whence) { + size_t new_offset; + switch(whence) { + case SEEK_CUR: new_offset=offset+value; break; + case SEEK_SET: new_offset=(size_t)value; break; + default: throw Exception("file.seek", 0, "whence #%d not supported", 0, whence); break; + } + + if((ssize_t)new_offset<0 || new_offset>size) + throw Exception("file.seek", + &file_name, + "seek(value=%l, whence=%d) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", + value, whence, new_offset, size); + offset=new_offset; + } + + /*override*/long tell() { return offset; } + +private: + + const void *buf; size_t size; + const String& file_name; - void *chunk; size_t offset; - size_t size; }; + #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 + uchar high_width[2]; //< image width high bytes [we ignore for now] + uchar width[2]; //< image width low bytes + uchar high_height[2]; //< image height high bytes [we ignore for now] + uchar height[4]; //< image height }; /// GIF file header struct GIF_Header { char signature[3]; // 'GIF' char version[3]; - unsigned char width[2]; - unsigned char height[2]; + uchar width[2]; + uchar height[2]; char dif; char fonColor; char nulls; @@ -102,36 +150,69 @@ struct GIF_Header { /// JPEG record head struct JPG_Segment_head { - unsigned char marker; - unsigned char code; - unsigned char length[2]; + uchar marker; + uchar code; + uchar length[2]; }; /// JPEG frame header struct JPG_Size_segment_body { char data; //< data precision of bits/sample - unsigned char height[2]; //< image height - unsigned char width[2]; //< image width + uchar height[2]; //< image height + uchar width[2]; //< image width char numComponents; //< number of color components }; +/// JPEG frame header +struct JPG_Exif_segment_start { + char signature[6]; // Exif\0\0 +}; + +/// JPEG Exif TIFF Header +struct JPG_Exif_TIFF_header { + uchar byte_align_identifier[2]; + char dummy[2]; // always 000A [or 0A00] + uchar first_IFD_offset[4]; // Usually the first IFD starts immediately next to TIFF header, so this offset has value '0x00000008'. +}; + +// JPEG Exif IFD start +struct JPG_Exif_IFD_start { + uchar directory_entry_count[2]; // the number of directory entry contains in this IFD +}; + +// TTTT ffff NNNNNNNN DDDDDDDD +struct JPG_Exif_IFD_entry { + uchar tag[2]; // Tag number, this shows a kind of data + uchar format[2]; // data format + uchar components_count[4]; // number of components + uchar value_or_offset_to_it[4]; // data value or offset to data value +}; + +#define JPG_IFD_TAG_EXIF_OFFSET 0x8769 + // -inline short x_endian_to_int(unsigned char L, unsigned char H) { - return(short)((H<<8) + L); +inline ushort x_endian_to_ushort(uchar b0, uchar b1) { + return (ushort)((b1<<8) + b0); +} + +inline uint x_endian_to_uint(uchar b0, uchar b1, uchar b2, uchar b3) { + return (uint)(((((b3<<8) + b2)<<8)+b1)<<8)+b0; } -inline short big_endian_to_int(unsigned char b[2]) { - return x_endian_to_int(b[1], b[0]); +inline ushort endian_to_ushort(bool is_big, const uchar *b/* [2] */) { + return is_big?x_endian_to_ushort(b[1], b[0]): + x_endian_to_ushort(b[0], b[1]); } -inline short little_endian_to_int(unsigned char b[2]) { - return x_endian_to_int(b[0], b[1]); +inline uint endian_to_uint(bool is_big, const uchar *b /* [4] */) { + return is_big?x_endian_to_uint(b[3], b[2], b[1], b[0]): + x_endian_to_uint(b[0], b[1], b[2], b[3]); } -void measure_gif(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { +static void measure_gif(Pool& pool, const String *origin_string, + Measure_reader& reader, ushort& width, ushort& height) { - void *buf; + const void *buf; const int head_size=sizeof(GIF_Header); if(reader.read(buf, head_size)width); - height=little_endian_to_int(head->height); + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); +} + +static Value *parse_IFD_entry_formatted_one_value(Pool& pool, + bool is_big, + ushort format, + size_t component_size, + const uchar *value) { + switch(format) { + case 1: // unsigned byte + return new(pool) VInt(pool, (uchar)value[0]); + case 3: // unsigned short + return new(pool) VInt(pool, endian_to_ushort(is_big, value)); + case 4: // unsigned long + // 'double' because parser's Int is signed + return new(pool) VDouble(pool, endian_to_uint(is_big, value)); + case 5: // unsigned rational + { + uint numerator=endian_to_uint(is_big, value); value+=component_size/2; + uint denominator=endian_to_uint(is_big, value); + if(!denominator) + return 0; + return new(pool) VDouble(pool, ((double)numerator)/denominator); + } + case 6: // signed byte + return new(pool) VInt(pool, (signed char)value[0]); + case 8: // signed short + return new(pool) VInt(pool, (signed short)endian_to_ushort(is_big, value)); + case 9: // signed long + return new(pool) VInt(pool, (signed int)endian_to_uint(is_big, value)); + case 10: // signed rational + { + signed int numerator=(signed int)endian_to_uint(is_big, value); value+=component_size/2; + uint denominator=endian_to_uint(is_big, value); + if(!denominator) + return 0; + return new(pool) VDouble(pool, numerator/denominator); + } + /* + case 11: // single float + todo + case 12: // double float + todo + */ + }; + + return 0; +} + +static Value *parse_IFD_entry_formatted_value(Pool& pool, + bool is_big, ushort format, + size_t component_size, uint components_count, + const uchar *value) { + if(format==2) { // ascii string, exception: the only type with varying size + const char *cstr=(const char *)value; + size_t size=components_count; + if(const char *premature_zero_pos=(const char *)memchr(cstr, 0, size)) + size=premature_zero_pos-cstr; + return new(pool) VString(*new(pool) String(pool, cstr, size, true/*tainted*/)); + } + + if(components_count==1) + return parse_IFD_entry_formatted_one_value(pool, is_big, format, component_size, value); + + VHash& result=*new(pool) VHash(pool); + Hash& hash=result.hash(0); + for(uint i=0; i=sizeof(format2component_size)/sizeof(format2component_size[0])) + return 0; // format out of range, ignoring + + size_t component_size=format2component_size[format]; + if(component_size==0) + return 0; // undefined format + + // You can get the total data byte length by multiplies + // a 'bytes/components' value (see above chart) by number of components stored 'NNNNNNNN' area + uint components_count=endian_to_uint(is_big, entry.components_count); + size_t value_size=component_size*components_count; + // If its size is over 4bytes, 'DDDDDDDD' contains the offset to data stored address + Value *result; + + if(value_size<=4) + result=parse_IFD_entry_formatted_value(pool, + is_big, format, + component_size, components_count, + entry.value_or_offset_to_it); + else { + long remembered=reader.tell(); + { + reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it), SEEK_SET); + const void *value; + if(reader.read(value, value_size)get(skey)) + hash.put(*new(pool) String(pool, name), value); + else + hash.put(skey, value); + } +} + +static void parse_IFD(Pool& pool, + Hash& hash, + bool is_big, Measure_reader& reader, long tiff_base) { + const void *buf; + if(reader.read(buf, sizeof(JPG_Exif_IFD_start))directory_entry_count); + for(int i=0; isignature, "Exif\0\0", 4+2)!=0) //signature invalid? + return 0; // ignore invalid block + + uint tiff_base=reader.tell(); + if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))byte_align_identifier[0]=='M'; // [M]otorola vs [I]ntel + + uint first_IFD_offset=endian_to_uint(is_big, head->first_IFD_offset); + reader.seek(tiff_base+first_IFD_offset, SEEK_SET); + + VHash& vhash=*new(pool) VHash(pool); + + // IFD + parse_IFD(pool, vhash.hash(0), is_big, reader, tiff_base); + + return &vhash; +} + +static void measure_jpeg(Pool& pool, const String *origin_string, + Measure_reader& reader, ushort& width, ushort& height, Value ** exif) { // JFIF format markers - const unsigned char MARKER=0xFF; - const unsigned char CODE_SIZE_FIRST=0xC0; - const unsigned char CODE_SIZE_LAST=0xC3; + const uchar MARKER=0xFF; + const uchar CODE_SIZE_A=0xC0; + const uchar CODE_SIZE_B=0xC1; + const uchar CODE_SIZE_C=0xC2; + const uchar CODE_SIZE_D=0xC3; + const uchar CODE_EXIF=0xE1; - void *buf; + const void *buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)marker!=MARKER) - break; + throw Exception("image.format", + origin_string, + "not JPEG file - marker not found"); - if(head->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; + switch(head->code) { + // http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html + case CODE_EXIF: + if(exif && !*exif) // seen .jpg with some xml under EXIF tag, after real exif block :) + *exif=parse_exif(pool, reader, origin_string); break; - } else { - // Dummy read to skip over data - size_t limit=big_endian_to_int(head->length) - 2; - if(reader.read(buf, limit)width); + height=endian_to_ushort(true, body->height); + } + return; + }; + + reader.seek(segment_base+endian_to_ushort(true, head->length), SEEK_SET); + } + + throw Exception("image.format", + origin_string, + "broken JPEG file - size frame not found"); } -void measure_png(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { +static void measure_png(Pool& pool, const String *origin_string, + Measure_reader& reader, ushort& width, ushort& height) { - void *buf; + const void *buf; const int head_size=sizeof(PNG_Header); if(reader.read(buf, head_size)width); - height=big_endian_to_int(head->height); + width=endian_to_ushort(true, head->width); + height=endian_to_ushort(true, head->height); } // measure center -void measure(Pool& pool, const String& file_name, - Measure_reader& reader, int& width, int& height) { +static void measure(Pool& pool, const String& file_name, + Measure_reader& reader, ushort& width, ushort& height, Value ** exif) { if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) { cext++; if(strcasecmp(cext, "GIF")==0) 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); + measure_jpeg(pool, &file_name, reader, width, height, exif); else if(strcasecmp(cext, "PNG")==0) measure_png(pool, &file_name, reader, width, height); else @@ -247,70 +556,52 @@ void measure(Pool& pool, const String& f "can not determine image type - no file name extension"); } -#ifndef DOXYGEN -struct Read_mem_info { - unsigned char *ptr; - unsigned char *eof; -}; -#endif -static size_t read_mem(void*& buf, size_t limit, void *info) { - Read_mem_info& rmi=*static_cast(info); - buf=rmi.ptr; - size_t read_size=min(limit, (size_t)(rmi.eof-rmi.ptr)); - rmi.ptr+=read_size; - return read_size; -} +// methods #ifndef DOXYGEN -struct Read_disk_info { - const String *file_spec; - size_t offset; +struct File_measure_action_info { + ushort *width; + ushort *height; + Value ** exif; + const String *file_name; }; #endif -static size_t read_disk(void*& buf, size_t limit, void *info) { - Read_disk_info& rdi=*static_cast(info); - Pool& pool=rdi.file_spec->pool(); - - size_t read_size; - file_read(pool, *rdi.file_spec, - buf, read_size, - false/*as_text*/, - true/*fail_on_read_problem*/, - rdi.offset, limit); +static void file_measure_action(Pool& pool, + struct stat& finfo, int f, + const String& file_spec, const char *fname, bool as_text, + void *context) { + File_measure_action_info& info=*static_cast(context); - rdi.offset+=read_size; - return read_size; + Measure_file_reader reader(pool, f, *info.file_name, fname); + measure(pool, *info.file_name, reader, *info.width, *info.height, info.exif); } -// methods - static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); 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; - Read_disk_info read_disk_info; + ushort width=0; + ushort height=0; + Value *exif=0; const String *file_name; - if(data.is_string()) { - file_name=data.get_string(); - read_disk_info.file_spec=&r.absolute(*file_name); - read_disk_info.offset=0; - info=&read_disk_info;read_func=read_disk; + if(file_name=data.get_string()) { + File_measure_action_info info={&width, &height, &exif, file_name}; + file_read_action_under_lock(pool, r.absolute(*file_name), + "measure", file_measure_action, &info); } else { const VFile& vfile=*data.as_vfile(); file_name=&static_cast(vfile.fields().get(*name_name))->as_string(); - read_mem_info.ptr=(unsigned char *)vfile.value_ptr(); - read_mem_info.eof=read_mem_info.ptr+vfile.value_size(); - info=&read_mem_info;read_func=read_mem; + Measure_buf_reader reader( + vfile.value_ptr(), + vfile.value_size(), + *file_name + ); + measure(pool, *file_name, reader, width, height, &exif); } - Measure_reader reader(read_func, info); - int width, height; - measure(pool, *file_name, reader, width, height); - - static_cast(r.get_self())->set(file_name, width, height); + VImage &vimage=*static_cast(r.get_self()); + vimage.set(file_name, width, height, 0, exif); } #ifndef DOXYGEN @@ -346,7 +637,7 @@ static void _html(Request& r, const Stri Value &vattribs=r.process_to_value(params->get(0), /*0/*no name* /,*/ false/*don't intercept string*/); - if(vattribs.is_defined()) // allow 'void' + if(!vattribs.is_string()) // allow empty if(attribs=vattribs.get_hash(&method_name)) { Attrib_info attrib_info={&tag, 0}; attribs->for_each(append_attrib_pair, &attrib_info); @@ -600,10 +891,10 @@ static void _polybar(Request& r, const S // font -#define Y(y)(y+index*height+1) +#define Y(y)(y+index*height) /// simple gdImage-based font storage & text output -class Font : public Pooled { +class Font: public Pooled { public: const static int letter_spacing; @@ -615,7 +906,7 @@ public: Font(Pool& pool, const String& aalphabet, - gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), + gdImage& aifont, int aheight, int amonospace, int aspacebarspace): Pooled(pool), alphabet(aalphabet), height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), ifont(aifont) { @@ -633,7 +924,7 @@ public: return spacebarspace; int tr=ifont.GetTransparent(); for(int x=ifont.SX()-1; x>=0; x--) { - for(int y=0; y=0) - ifont.Copy(image, x, y, 0, Y(0), index_width(index), height-1); + ifont.Copy(image, x, y, 0, Y(0), index_width(index), height); } /* ******************************** string ********************************** */ + int step_width(int index) { + return letter_spacing + (monospace ? monospace : index_width(index)); + } + + // counts trailing letter_spacing, consider this OK. useful for contiuations int string_width(const String& s){ const char *cstr=s.cstr(); int result=0; for(; *cstr; cstr++) - result+=index_width(index_of(*cstr)); + result+=step_width(index_of(*cstr)); return result; } @@ -660,7 +956,7 @@ public: if(cstr) for(; *cstr; cstr++) { int index=index_of(*cstr); index_display(image, x, y, index); - x+=letter_spacing + (monospace ? monospace : index_width(index)); + x+=step_width(index); } } @@ -685,6 +981,12 @@ static void _font(Request& r, const Stri throw Exception("parser.runtime", &method_name, "alphabet must not be empty"); + + if(int remainder=image.SY() % alphabet.size()) + throw Exception("parser.runtime", + &method_name, + "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", + image.SY(), alphabet.size(), remainder); static_cast(r.get_self())->font=new(pool) Font(pool, alphabet,