--- parser3/src/classes/image.C 2012/06/15 11:54:18 1.142 +++ parser3/src/classes/image.C 2024/09/11 21:07:36 1.185 @@ -1,8 +1,8 @@ /** @file Parser: @b image parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ /* @@ -24,8 +24,9 @@ #include "pa_vimage.h" #include "pa_vdate.h" #include "pa_table.h" +#include "pa_charsets.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.142 2012/06/15 11:54:18 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.185 2024/09/11 21:07:36 moko Exp $"; // defines @@ -45,7 +46,7 @@ public: // globals -DECLARE_CLASS_VAR(image, new MImage, 0); +DECLARE_CLASS_VAR(image, new MImage); // helpers @@ -179,6 +180,14 @@ public: EXIF_TAG(0xa40b, DeviceSettingDescription); EXIF_TAG(0xa40c, SubjectDistanceRange); EXIF_TAG(0xa420, ImageUniqueID); + + // other tags + EXIF_TAG(0xa430, CameraOwnerName); + EXIF_TAG(0xa431, BodySerialNumber); + EXIF_TAG(0xa432, LensSpecification); + EXIF_TAG(0xa433, LensManufactor); + EXIF_TAG(0xa434, LensModel); + EXIF_TAG(0xa435, LensSerialNumber); } } exif_tag_value2name; @@ -219,23 +228,24 @@ public: } } exif_gps_tag_value2name; -#undef EXIF_TAG -#ifndef DOXYGEN +///*********************************************** support functions + class Measure_reader { public: virtual size_t read(const char* &buf, size_t limit)=0; - virtual void seek(long value, int whence)=0; - virtual long tell()=0; + virtual void seek(uint64_t value)=0; + virtual uint64_t tell()=0; + virtual uint64_t length()=0; }; class Measure_file_reader: public Measure_reader { - const String& file_name; const char* fname; + const String& file_name; int f; public: - Measure_file_reader(int af, const String& afile_name, const char* afname): - file_name(afile_name), fname(afname), f(af) { + Measure_file_reader(int af, const String& afile_name): + file_name(afile_name), f(af) { } override size_t read(const char* &abuf, size_t limit) { @@ -243,25 +253,20 @@ public: return 0; char* lbuf=new(PointerFreeGC) char[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 %u bytes count not in [0..%u] valid range", - read_size, limit); - + ssize_t read_size=::read(f, lbuf, limit); abuf=lbuf; + if(read_size<0) + throw Exception(0, &file_name, "measure read failed: %s (%d)", strerror(errno), errno); return read_size; } - override void seek(long value, int whence) { - if(lseek(f, value, whence)<0) - throw Exception(IMAGE_FORMAT, - &file_name, - "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", - value, whence, strerror(errno), errno, fname); + override void seek(uint64_t value) { + if(pa_lseek(f, value, SEEK_SET)<0) + throw Exception(IMAGE_FORMAT, &file_name, "seek to %.15g failed: %s (%d)", (double)value, strerror(errno), errno); } - override long tell() { return lseek(f, 0, SEEK_CUR); } + override uint64_t tell() { return pa_lseek(f, 0, SEEK_CUR); } + + override uint64_t length() { return pa_lseek(f, 0, SEEK_END); } }; @@ -284,54 +289,48 @@ public: 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(0, - 0, - "whence #%d not supported", 0, whence); - break; // never - } - - if((ssize_t)new_offset<0 || new_offset>size) - throw Exception(IMAGE_FORMAT, - &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 void seek(uint64_t value) { + if(value>(uint64_t)size) + throw Exception(IMAGE_FORMAT, &file_name, "seek to %.15g failed: out of buffer (%.15g)", value, size); + offset=(size_t)value; } - override long tell() { return offset; } + override uint64_t tell() { return offset; } + + override uint64_t length() { return size; } }; -#endif -/// PNG file header -struct PNG_Header { - char dummy[12]; - char signature[4]; //< must be "IHDR" - 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 +struct Measure_info { + ushort width; + ushort height; + Value** exif; + Value** xmp; + Charset* xmp_charset; + bool video; }; -/// GIF file header -struct GIF_Header { - char signature[3]; // 'GIF' - char version[3]; - uchar width[2]; - uchar height[2]; - char dif; - char fonColor; - char nulls; -}; -/// JPEG record head +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 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 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]); +} + + +///*********************************************** JPEG + struct JPG_Segment_head { uchar marker; uchar code; @@ -339,21 +338,16 @@ struct JPG_Segment_head { }; /// JPEG frame header struct JPG_Size_segment_body { - char data; //< data precision of bits/sample - uchar height[2]; //< image height - uchar width[2]; //< image width - char numComponents; //< number of color components -}; - -/// JPEG frame header -struct JPG_Exif_segment_begin { - char signature[6]; // Exif\0\0 + char data; //< data precision of bits/sample + uchar height[2]; //< image height + uchar width[2]; //< image width + char numComponents; //< number of color components }; /// JPEG Exif TIFF Header struct JPG_Exif_TIFF_header { - uchar byte_align_identifier[2]; - char dummy[2]; // always 000A [or 0A00] + char byte_align_identifier[2]; + uchar signature[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'. }; @@ -376,51 +370,7 @@ struct JPG_Exif_IFD_entry { #define JPEG_EXIF_DATE_CHARS 20 -// - -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 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 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]); -} - -static void measure_gif(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height) { - - const char* buf; - const size_t head_size=sizeof(GIF_Header); - if(reader.read(buf, head_size)signature, "GIF", 3)!=0) - throw Exception(IMAGE_FORMAT, - &origin_string, - "not GIF file - wrong signature"); - - width=endian_to_ushort(false, head->width); - height=endian_to_ushort(false, head->height); -} - -static Value* parse_IFD_entry_formatted_one_value( - bool is_big, - ushort format, - size_t component_size, - const uchar *value) { +static Value* parse_IFD_entry_formatted_one_value(bool is_big, ushort format, size_t component_size, const uchar *value) { switch(format) { case 1: // unsigned byte return new VInt((uchar)value[0]); @@ -463,23 +413,17 @@ static Value* parse_IFD_entry_formatted_ } // date.C -tm cstr_to_time_t(char *cstr); +tm cstr_to_time_t(char *, const char **); -static Value* parse_IFD_entry_formatted_value(bool is_big, ushort format, - size_t component_size, uint components_count, - const uchar *value) { +static Value* parse_IFD_entry_formatted_value(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 length=components_count; // Data format is "YYYY:MM:DD HH:MM:SS"+0x00, total 20bytes - if(length==JPEG_EXIF_DATE_CHARS - && isdigit((unsigned char)cstr[0]) - && cstr[length-1]==0) { - char cstr_writable[JPEG_EXIF_DATE_CHARS]; - strcpy(cstr_writable, cstr); - + if(length==JPEG_EXIF_DATE_CHARS && isdigit((unsigned char)cstr[0]) && cstr[length-1]==0) { try { - return new VDate(cstr_to_time_t(cstr_writable)); + tm tmIn=cstr_to_time_t(pa_strdup(cstr), 0); + return new VDate(tmIn); } catch(...) { /*ignore bad date times*/ } } @@ -494,16 +438,14 @@ static Value* parse_IFD_entry_formatted_ HashStringValue& hash=result->hash(); for(uint i=0; isignature, "Exif\0\0", 4+2)!=0) //signature invalid? - return 0; // ignore invalid block - uint tiff_base=reader.tell(); + uint64_t 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); + reader.seek(tiff_base+first_IFD_offset); VHash* vhash=new VHash; @@ -633,46 +556,70 @@ static Value* parse_exif(Measure_reader& return vhash; } -static void measure_jpeg(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height, Value** exif) { +static Value* parse_xmp(Measure_reader& reader, ushort xmp_length, Measure_info &info) { + const char* buf; + if(reader.read(buf, xmp_length)marker!=MARKER) - throw Exception(IMAGE_FORMAT, - &origin_string, - "not JPEG file - marker not found"); + throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - marker not found"); + + ushort segment_length=endian_to_ushort(true, head->length); switch(head->code) { - // http://park2.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(reader, origin_string); + // http://dev.exiv2.org/projects/exiv2/wiki/The_Metadata_in_JPEG_files + case CODE_APP1: + { + const size_t EXIF_SIG_LEN=6; // Exif\0\0 + const size_t XMP_SIG_LEN=29; // http://ns.adobe.com/xap/1.0/\0 + + if(segment_lengthwidth); - height=endian_to_ushort(true, body->height); - } + info.width=endian_to_ushort(true, body->width); + info.height=endian_to_ushort(true, body->height); + } return; }; - reader.seek(segment_base+endian_to_ushort(true, head->length), SEEK_SET); + reader.seek(segment_base + segment_length); } - throw Exception(IMAGE_FORMAT, - &origin_string, - "broken JPEG file - size frame not found"); + throw Exception(IMAGE_FORMAT, &origin_string, "broken JPEG file - size frame not found"); +} + +///*********************************************** TIFF + +static bool parse_tiff_IFD(bool is_big, Measure_reader& reader, Measure_info &info) { + const char* buf; + if(reader.read(buf, sizeof(JPG_Exif_IFD_begin))directory_entry_count); + for(int i=0; itag); + + if(entry_tag == 256 || entry_tag == 257){ + ushort entry_format=endian_to_ushort(is_big, entry->format); + if(entry_format != 3 && entry_format != 4 || endian_to_uint(is_big, entry->components_count) != 1) + return false; + uint value = (entry_format == 3) ? endian_to_ushort(is_big, entry->value_or_offset_to_it) : endian_to_uint(is_big, entry->value_or_offset_to_it); + (entry_tag == 256) ? info.width=(short)value : info.height=(short)value; + if(info.width && info.height) + return true; + } + } + + return false; + // then goes: LLLLLLLL Offset to next IFD [not going there] +} + +static void measure_tiff(const String& origin_string, Measure_reader& reader, Measure_info &info) { + const char* buf; + + if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))byte_align_identifier, "II", 2)!=0 && strncmp(head->byte_align_identifier, "MM", 2)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + bool is_big=head->byte_align_identifier[0]=='M'; // [M]otorola vs [I]ntel + + if(endian_to_ushort(is_big, head->signature) != 42) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + reader.seek(endian_to_uint(is_big, head->first_IFD_offset)); + if(!parse_tiff_IFD(is_big, reader, info)) + throw Exception(IMAGE_FORMAT, &origin_string, "broken TIFF file - size field entry not found"); +} + + +///*********************************************** GIF + +struct GIF_Header { + char signature[3]; // 'GIF' + char version[3]; + uchar width[2]; + uchar height[2]; + char dif; + char fonColor; + char nulls; +}; + +static void measure_gif(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + + const char* buf; + const size_t head_size=sizeof(GIF_Header); + if(reader.read(buf, head_size)signature, "GIF", 3)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not GIF file - wrong signature"); + + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); } -static void measure_png(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height) { + +///*********************************************** PNG + +struct PNG_Header { + char dummy[12]; + char signature[4]; //< must be "IHDR" + 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 +}; + +static void measure_png(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { const char* buf; const size_t 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"); + throw Exception(IMAGE_FORMAT, &origin_string, "not PNG file - wrong signature"); width=endian_to_ushort(true, head->width); height=endian_to_ushort(true, head->height); } -// measure center -static void measure(const String& file_name, - Measure_reader& reader, ushort& width, ushort& height, Value** exif) { +///*********************************************** BMP + +struct BMP_Header { + char signature[2]; // 'BM' + uchar file_size[4]; + uchar reserved[4]; + uchar bitmap_offset[4]; + uchar header_size[4]; + uchar width[2]; + uchar high_width[2]; //< image width high bytes [we ignore for now] + uchar height[2]; + uchar high_height[2]; //< image height high bytes [we ignore for now] +}; + +static void measure_bmp(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + + const char* buf; + const size_t head_size=sizeof(BMP_Header); + if(reader.read(buf, head_size)signature, "BM", 2)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not BMP file - wrong signature"); + + if((uint)reader.length() != endian_to_uint(false, head->file_size)) + throw Exception(IMAGE_FORMAT, &origin_string, "not BMP file - length header and file size do not match"); + + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); +} + + +///*********************************************** WEBP + +struct WEBP_Header { + char signature_riff[4]; // 'RIFF' + uchar file_size[4]; + char signature[4]; // 'WEBP' + char format[4]; // 'VP8 ' or 'VP8L' or 'VP8X' +}; + +struct WEBP_VP8_Chunk { + uchar size[4]; + char tag[3]; + uchar signature[3]; // 0x9D 0x01 0x2A + uchar width[2]; // 14 bits each + uchar height[2]; // 14 bits each +}; + +struct WEBP_VP8L_Chunk { + uchar size[4]; + char signature; // 0x2F + uchar width_height[4]; // 14 bits each +}; + +struct WEBP_X_Chunk { + uchar size[4]; + char reserved[4]; + uchar width[3]; + uchar height[3]; +}; + +static void measure_webp(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + const char* buf; + + if(reader.read(buf, sizeof(WEBP_Header))signature_riff, "RIFF", 4)!=0 || strncmp(head->signature, "WEBP", 4)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not WEBP file - wrong signature"); + + if(strncmp(head->format, "VP8 ", 4)==0){ + if(reader.read(buf, sizeof(WEBP_VP8_Chunk))signature[0] != 0x9D || chunk->signature[1] != 0x01 || chunk->signature[2] != 0x2A) + throw Exception(IMAGE_FORMAT, &origin_string, "broken WEBP file - wrong VP8 chunk signature"); + + width=endian_to_ushort(false, chunk->width) & 0x3FFF; + height=endian_to_ushort(false, chunk->height) & 0x3FFF; + } else if(strncmp(head->format, "VP8L", 4)==0){ + if(reader.read(buf, sizeof(WEBP_VP8L_Chunk))signature != 0x2F) + throw Exception(IMAGE_FORMAT, &origin_string, "broken WEBP file - wrong VP8L chunk signature"); + + uint wh=endian_to_uint(false, chunk->width_height); + width=(wh & 0x3FFF) + 1; + height=((wh >> 14) & 0x3FFF) + 1; + } else if (strncmp(head->format, "VP8X", 4)==0){ + if(reader.read(buf, sizeof(WEBP_X_Chunk))width) + 1; // we ignore third byte to simplify code + height=endian_to_ushort(false, chunk->height) + 1; // we ignore third byte to simplify code + } else throw Exception(IMAGE_FORMAT, &origin_string, "broken WEBP file - invalid chunk signature"); +} + + +///*********************************************** MP4 + +struct MP4_Header { + uchar size[4]; + char signature[4]; // 'ftyp' in first chunk +}; + +struct MP4_ExtSize { + uchar high[4]; + uchar low[4]; +}; + +struct MP4_Tkhd { + uchar width[4]; + uchar height[4]; +}; + +static bool measure_mp4(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height, uint64_t anext, const char* lastTkhd=NULL) { + for(bool first=anext==0;;){ + const char* buf; + uint64_t next=reader.tell(); + + if(reader.read(buf, sizeof(MP4_Header))size); + + if(size==1){ + if(reader.read(buf, sizeof(MP4_ExtSize))high) << 32) + endian_to_uint(true, ext_size->low); + } + next+=size; + + if(first){ + if(strncmp(head->signature, "ftyp", 4)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not MP4 file - wrong signature"); + first=false; + anext=reader.length(); // to avoid reading beyond EOF + } else if(strncmp(head->signature, "moov", 4)==0 || strncmp(head->signature, "mdia", 4)==0 || strncmp(head->signature, "trak", 4)==0) { + if(measure_mp4(origin_string, reader, width, height, next, lastTkhd)) + return true; + } else if(strncmp(head->signature, "tkhd", 4)==0) { + if(size>8){ + reader.seek(next-8); + if(reader.read(lastTkhd, sizeof(MP4_Tkhd))signature, "hdlr", 4)==0) { + if(size>12){ + const char* hdlr; + if(reader.read(hdlr, 12)<12) + throw Exception(IMAGE_FORMAT, &origin_string, "broken MP4 file - bad hdlr chunk"); + if(lastTkhd && strncmp(hdlr+8, "vide", 4)==0) { + MP4_Tkhd *tkhd=(MP4_Tkhd *)lastTkhd; + width=endian_to_ushort(true, tkhd->width); + height=endian_to_ushort(true, tkhd->height); + return true; + } + } + } + if(anext && next>=anext) + break; + reader.seek(next); + } + return false; +} + +static void measure_mp4(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + if(!measure_mp4(origin_string, reader, width, height, 0)) + throw Exception(IMAGE_FORMAT, &origin_string, "unsupported MP4 file - size not found"); +} + +///*********************************************** measure center + +static void measure(const String& file_name, Measure_reader& reader, Measure_info &info) { const char* file_name_cstr=file_name.taint_cstr(String::L_FILE_SPEC); if(const char* cext=strrchr(file_name_cstr, '.')) { cext++; if(strcasecmp(cext, "GIF")==0) - measure_gif(file_name, reader, width, height); - else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) - measure_jpeg(file_name, reader, width, height, exif); + measure_gif(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) + measure_jpeg(file_name, reader, info); else if(strcasecmp(cext, "PNG")==0) - measure_png(file_name, reader, width, height); + measure_png(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "BMP")==0) + measure_bmp(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "WEBP")==0) + measure_webp(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "TIF")==0 || strcasecmp(cext, "TIFF")==0) + measure_tiff(file_name, reader, info); + else if(strcasecmp(cext, "MP4")==0 || strcasecmp(cext, "MOV")==0) + if(info.video) + measure_mp4(file_name, reader, info.width, info.height); + else + throw Exception(IMAGE_FORMAT, &file_name, "handling disabled for file name extension '%s'", cext); else - throw Exception(IMAGE_FORMAT, - &file_name, - "unhandled image file name extension '%s'", cext); + throw Exception(IMAGE_FORMAT, &file_name, "unhandled file name extension '%s'", cext); } else - throw Exception(IMAGE_FORMAT, - &file_name, - "can not determine image type - no file name extension"); + throw Exception(IMAGE_FORMAT, &file_name, "can not determine file type - no file name extension"); } // methods -#ifndef DOXYGEN -struct File_measure_action_info { - ushort* width; - ushort* height; - Value** exif; - const String* file_name; -}; -#endif -static void file_measure_action( - 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); - - Measure_file_reader reader(f, *info.file_name, fname); - measure(*info.file_name, reader, *info.width, *info.height, info.exif); +static void file_measure_action(struct stat& /*finfo*/, int f, const String& file_spec, void *context) { + Measure_file_reader reader(f, file_spec); + measure(file_spec, reader, *static_cast(context)); } static void _measure(Request& r, MethodParams& params) { Value& data=params.as_no_junction(0, "data must not be code"); - ushort width=0; - ushort height=0; Value* exif=0; + Value* xmp=0; + Measure_info info={ 0, 0, 0, 0, &pa_UTF8_charset, false }; + + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1, "methods options")) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next() ){ + String::Body key=i.key(); + Value* value=i.value(); + if(key == "exif") { + if(r.process(*value).as_bool()) + info.exif=&exif; + valid_options++; + } + if(key == "xmp") { + if(r.process(*value).as_bool()) + info.xmp=&xmp; + valid_options++; + } + if(key == "xmp-charset") { + info.xmp_charset=&pa_charsets.get(value->as_string()); + valid_options++; + } + if(key == "video") { + info.video=r.process(*value).as_bool(); + valid_options++; + } + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + const String* file_name; - if((file_name=data.get_string())) { - File_measure_action_info info={ - &width, &height, - &exif, - file_name - }; - file_read_action_under_lock(r.absolute(*file_name), - "measure", file_measure_action, &info); + + if(file_name=data.get_string()) { + file_read_action_under_lock(r.full_disk_path(*file_name), "measure", file_measure_action, &info); } else { - VFile* vfile=data.as_vfile(String::L_AS_IS); + VFile* vfile=data.as_vfile(); file_name=&vfile->fields().get(name_name)->as_string(); - Measure_buf_reader reader( - vfile->value_ptr(), - vfile->value_size(), - *file_name - ); - measure(*file_name, reader, width, height, &exif); + Measure_buf_reader reader(vfile->value_ptr(), vfile->value_size(), *file_name); + measure(*file_name, reader, info); } - GET_SELF(r, VImage).set(file_name, width, height, 0, exif); + GET_SELF(r, VImage).set(file_name, info.width, info.height, 0, exif, xmp); } -#ifndef DOXYGEN -struct Attrib_info { - String* tag; ///< html tag being constructed - HashStringValue* skip; ///< tag attributes not to append to tag string [to skip] -}; -#endif -static void append_attrib_pair( - HashStringValue::key_type key, - HashStringValue::value_type value, - Attrib_info* info) { - // skip user-specified, internal(starting with "line-") attributes and border attribute with empty value - if( - (info->skip && info->skip->get(key)) - || key.pos("line-")==0 - || (key=="border" && !value->is_defined()) - ) +static void append_attrib_pair(String &tag, String::Body key, Value* value){ + // skip border attribute with empty value + if(key=="border" && !value->is_defined()) return; // src="a.gif" width="123" ismap[=-1] - *info->tag << " " << key; + tag << " " << key; if(value->is_string() || value->as_int()>=0) - *info->tag << "=\"" << value->as_string() << "\""; + tag << "=\"" << value->as_string() << "\""; } -static void _html(Request& r, MethodParams& params) { +static void _html(Request& r, MethodParams& params) { String tag; tag << "for_each(append_attrib_pair, &info); + for(HashStringValue::Iterator i(*attribs); i; i.next() ) + append_attrib_pair(tag, i.key(), i.value()); } else - throw Exception(PARSER_RUNTIME, - 0, - "attributes must be hash"); + throw Exception(PARSER_RUNTIME, 0, "attributes must be hash"); + } } - { - Attrib_info info={&tag, attribs}; - fields.for_each(append_attrib_pair, &info); + for(HashStringValue::Iterator i(fields); i; i.next() ){ + String::Body key=i.key(); + // skip user-specified attributes + if(attribs && attribs->get(key)) + continue; + // allow only html attributes (to exclude exif, line-*) + if(key=="src" || key=="width" || key=="height" || key=="border") + append_attrib_pair(tag, key, i.value()); } + tag << " />"; - r.write_pass_lang(tag); + r.write(tag); } /// @test wrap FILE to auto-object -static gdImage* load(Request& r, - const String& file_name){ - const char* file_name_cstr=r.absolute(file_name).taint_cstr(String::L_FILE_SPEC); - if(FILE *f=fopen(file_name_cstr, "rb")) { +static gdImage* load(Request& r, const String& file_name){ + const char* file_name_cstr=r.full_disk_path(file_name).taint_cstr(String::L_FILE_SPEC); + if(FILE *f=pa_fopen(file_name_cstr, "rb")) { gdImage* image=new gdImage; bool ok=image->CreateFromGif(f); fclose(f); if(!ok) - throw Exception(IMAGE_FORMAT, - &file_name, - "is not in GIF format"); + throw Exception(IMAGE_FORMAT, &file_name, "is not in GIF format"); return image; } else { - throw Exception("file.missing", - 0, - "can not open '%s'", file_name_cstr); + throw Exception("file.missing", 0, "can not open '%s'", file_name_cstr); } } @@ -896,7 +1110,7 @@ static void _gif(Request& r, MethodParam vfile.set_binary(false/*not tainted*/, (const char *)buf.ptr, buf.size, file_name, new VString(*new String("image/gif"))); - r.write_no_lang(vfile); + r.write(vfile); } static void _line(Request& r, MethodParams& params) { @@ -942,20 +1156,16 @@ static void _bar(Request& r, MethodParam } #ifndef DOXYGEN -static void add_point(Table::element_type row, - gdImage::Point **p) { +static void add_point(Table::element_type row, gdImage::Point **p) { if(row->count()!=2) - throw Exception(0, - 0, - "coordinates table must contain two columns: x and y values"); + throw Exception(0, 0, "coordinates table must contain two columns: x and y values"); (**p).x=row->get(0)->as_int(); (**p).y=row->get(1)->as_int(); (*p)++; } #endif #ifndef DOXYGEN -static void add_point(int x, int y, - gdImage::Point **p) { +static void add_point(int x, int y, gdImage::Point **p) { (**p).x=x; (**p).y=y; (*p)++; @@ -970,11 +1180,12 @@ static void _replace(Request& r, MethodP gdImage::Point* all_p=0; size_t count=0; if(params.count() == 3){ - Table* table=params.as_table(2, "coordinates"); - count=table->count(); - all_p=new(PointerFreeGC) gdImage::Point[count]; - gdImage::Point* add_p=all_p; - table->for_each(add_point, &add_p); + if(Table* table=params.as_table(2, "coordinates")){ + count=table->count(); + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + table->for_each(add_point, &add_p); + } } else { int max_x=image.SX()-1; int max_y=image.SY()-1; @@ -996,38 +1207,34 @@ static void _replace(Request& r, MethodP static void _polyline(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.Polygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r)), - false/*not closed*/); + if(Table* table=params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r)), false/*not closed*/); + } } static void _polygon(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=(Table*)params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.Polygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r))); + if(Table* table=(Table*)params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r))); + } } static void _polybar(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=(Table*)params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.FilledPolygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r))); + if(Table* table=(Table*)params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.FilledPolygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r))); + } } // font @@ -1036,17 +1243,14 @@ static void _polybar(Request& r, MethodP // Font class -Font::Font( - Charset& asource_charset, - const String& aalphabet, - gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing): - fsource_charset(asource_charset), +Font::Font(Charset& asource_charset, const String& aalphabet, gdImage* aifont, int aheight, int amonospace, int aspacebarspace, int aletterspacing): + letterspacing(aletterspacing), height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), - letterspacing(aletterspacing), ifont(aifont), - alphabet(aalphabet) { + alphabet(aalphabet), + fsource_charset(asource_charset){ if(fsource_charset.isUTF8()){ size_t index=0; @@ -1131,9 +1335,7 @@ static void _font(Request& r, MethodPara const String& alphabet=params.as_string(0, "alphabet must not be code"); size_t alphabet_length=alphabet.length(r.charsets.source()); if(!alphabet_length) - throw Exception(PARSER_RUNTIME, - 0, - "alphabet must not be empty"); + throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE)); @@ -1141,32 +1343,30 @@ static void _font(Request& r, MethodPara int monospace_width=0; // proportional int letter_spacing=1; if(params.count()>2){ - if(HashStringValue* options=params.as_no_junction(2, "param must be int or hash").get_hash()){ + if(HashStringValue* options=params[2].get_hash()){ // third option is hash if(params.count()>3) - throw Exception(PARSER_RUNTIME, - 0, - "too many options were specified"); + throw Exception(PARSER_RUNTIME, 0, "too many params were specified"); int valid_options=0; if(Value* vspacebar_width=options->get(spacebar_width_name)){ valid_options++; - spacebar_width=r.process_to_value(*vspacebar_width).as_int(); + spacebar_width=r.process(*vspacebar_width).as_int(); } if(Value* vmonospace_width=options->get(monospace_width_name)){ valid_options++; - monospace_width=r.process_to_value(*vmonospace_width).as_int(); + monospace_width=r.process(*vmonospace_width).as_int(); if(!monospace_width) monospace_width=image->SX(); } if(Value* vletter_spacing=options->get(letter_spacing_name)){ valid_options++; - letter_spacing=r.process_to_value(*vletter_spacing).as_int(); + letter_spacing=r.process(*vletter_spacing).as_int(); } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { // backward - spacebar_width=params.as_int(2, "spacebar_width must be int", r); + spacebar_width=params.as_int(2, "param must be int or hash", r); if(params.count()>3) { monospace_width=params.as_int(3, "monospace_width must be int", r); if(!monospace_width) @@ -1176,16 +1376,9 @@ static void _font(Request& r, MethodPara } if(int remainder=image->SY() % alphabet_length) - throw Exception(PARSER_RUNTIME, - 0, - "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", - image->SY(), alphabet_length, remainder); + throw Exception(PARSER_RUNTIME, 0, "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", image->SY(), alphabet_length, remainder); - GET_SELF(r, VImage).set_font(new Font( - r.charsets.source(), - alphabet, - image, - image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); + GET_SELF(r, VImage).set_font(new Font(r.charsets.source(), alphabet, image, image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); } static void _text(Request& r, MethodParams& params) { @@ -1201,7 +1394,7 @@ static void _length(Request& r, MethodPa const String& s=params.as_string(0, "text must not be code"); VImage& vimage=GET_SELF(r, VImage); - r.write_no_lang(*new VInt(vimage.font().string_width(s))); + r.write(*new VInt(vimage.font().string_width(s))); } static void _arc(Request& r, MethodParams& params) { @@ -1250,9 +1443,7 @@ gdImage& as_image(MethodParams& params, if(Value* vimage=value.as(VIMAGE_TYPE)) { return static_cast(vimage)->image(); } else - throw Exception(PARSER_RUNTIME, - 0, - msg); + throw Exception(PARSER_RUNTIME, 0, msg); } static void _copy(Request& r, MethodParams& params) { @@ -1288,7 +1479,7 @@ static void _pixel(Request& r, MethodPar image.SetPixel(x, y, image.Color(params.as_int(2, "color must be int", r))); } else - r.write_no_lang(*new VInt(image.DecodeColor(image.GetPixel(x, y)))); + r.write(*new VInt(image.DecodeColor(image.GetPixel(x, y)))); } @@ -1296,7 +1487,8 @@ static void _pixel(Request& r, MethodPar MImage::MImage(): Methoded("image") { // ^image:measure[DATA] - add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); + // ^image:measure[DATA; $.exif(false) $.xmp(false) $.xmp-charset[UTF-8] ] + add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 2); // ^image.html[] // ^image.html[hash]