--- parser3/src/classes/image.C 2003/11/20 16:34:23 1.99 +++ parser3/src/classes/image.C 2020/12/07 23:18:40 1.178 @@ -1,12 +1,10 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_IMAGE_C="$Date: 2003/11/20 16:34:23 $"; - /* jpegsize: gets the width and height (in pixels) of a jpeg file Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 @@ -17,17 +15,24 @@ static const char * const IDENT_IMAGE_C= */ #include "pa_config_includes.h" - -#include "pa_vmethod_frame.h" - #include "gif.h" +#include "pa_vmethod_frame.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" #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.178 2020/12/07 23:18:40 moko Exp $"; + +// defines + +static const String spacebar_width_name("space"); +static const String monospace_width_name("width"); +static const String letter_spacing_name("spacing"); // class @@ -37,25 +42,21 @@ public: // VStateless_class public: MImage(); - -public: // Methoded - bool used_directly() { return true; } - }; // globals -DECLARE_CLASS_VAR(image, new MImage, 0); +DECLARE_CLASS_VAR(image, new MImage); // helpers +#define EXIF_TAG(tag, name) put(tag, #name); + /// value of exif tag -> it's value class EXIF_tag_value2name: public Hash { public: EXIF_tag_value2name() { // image JPEG Exif - #define EXIF_TAG(tag, name) \ - put(tag, #name); // Tags used by IFD0 (main image) EXIF_TAG(0x010e, ImageDescription); EXIF_TAG(0x010f, Make); @@ -130,7 +131,7 @@ public: EXIF_TAG(0x83bb, IPTC/NAA); EXIF_TAG(0x8773, InterColorProfile); EXIF_TAG(0x8824, SpectralSensitivity); - EXIF_TAG(0x8825, GPSInfo); + //EXIF_TAG(0x8825, GPSInfo); EXIF_TAG(0x8828, OECF); EXIF_TAG(0x8829, Interlace); EXIF_TAG(0x882a, TimeZoneOffset); @@ -147,28 +148,104 @@ public: EXIF_TAG(0xa20b, FlashEnergy); EXIF_TAG(0xa20c, SpatialFrequencyResponse); EXIF_TAG(0xa214, SubjectLocation); - #undef EXIF_TAG + + // additional things added by misha@ + EXIF_TAG(0x0100, ImageWidth); + EXIF_TAG(0x0101, ImageLength); + EXIF_TAG(0x0102, BitsPerSample); + EXIF_TAG(0x0103, Compression); + EXIF_TAG(0x0106, PhotometricInterpretation); + EXIF_TAG(0x010a, FillOrder); + EXIF_TAG(0x010d, DocumentName); + EXIF_TAG(0x0111, StripOffsets); + EXIF_TAG(0x0115, SamplesPerPixel); + EXIF_TAG(0x0116, RowsPerStrip); + EXIF_TAG(0x0117, StripByteCounts); + EXIF_TAG(0x011c, PlanarConfiguration); + EXIF_TAG(0x0156, TransferRange); + EXIF_TAG(0x0200, JPEGProc); + EXIF_TAG(0x0201, JPEGInterchangeFormat); + EXIF_TAG(0x0202, JPEGInterchangeFormatLength); + EXIF_TAG(0x0212, YCbCrSubSampling); + EXIF_TAG(0xa401, CustomRendered); + EXIF_TAG(0xa402, ExposureMode); + EXIF_TAG(0xa403, WhiteBalance); + EXIF_TAG(0xa404, DigitalZoomRatio); + EXIF_TAG(0xa405, FocalLengthIn35mmFilm); + EXIF_TAG(0xa406, SceneCaptureType); + EXIF_TAG(0xa407, GainControl); + EXIF_TAG(0xa408, Contrast); + EXIF_TAG(0xa409, Saturation); + EXIF_TAG(0xa40a, Sharpness); + 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; +class EXIF_gps_tag_value2name: public Hash { +public: + EXIF_gps_tag_value2name() { + EXIF_TAG(0x0, GPSVersionID); + EXIF_TAG(0x1, GPSLatitudeRef); + EXIF_TAG(0x2, GPSLatitude); + EXIF_TAG(0x3, GPSLongitudeRef); + EXIF_TAG(0x4, GPSLongitude); + EXIF_TAG(0x5, GPSAltitudeRef); + EXIF_TAG(0x6, GPSAltitude); + EXIF_TAG(0x7, GPSTimeStamp); + EXIF_TAG(0x8, GPSSatellites); + EXIF_TAG(0x9, GPSStatus); + EXIF_TAG(0xA, GPSMeasureMode); + EXIF_TAG(0xB, GPSDOP); + EXIF_TAG(0xC, GPSSpeedRef); + EXIF_TAG(0xD, GPSSpeed); + EXIF_TAG(0xE, GPSTrackRef); + EXIF_TAG(0xF, GPSTrack); + EXIF_TAG(0x10, GPSImgDirectionRef); + EXIF_TAG(0x11, GPSImgDirection); + EXIF_TAG(0x12, GPSMapDatum); + EXIF_TAG(0x13, GPSDestLatitudeRef); + EXIF_TAG(0x14, GPSDestLatitude); + EXIF_TAG(0x15, GPSDestLongitudeRef); + EXIF_TAG(0x16, GPSDestLongitude); + EXIF_TAG(0x17, GPSDestBearingRef); + EXIF_TAG(0x18, GPSDestBearing); + EXIF_TAG(0x19, GPSDestDistanceRef); + EXIF_TAG(0x1A, GPSDestDistance); + EXIF_TAG(0x1B, GPSProcessingMethod); + EXIF_TAG(0x1C, GPSAreaInformation); + EXIF_TAG(0x1D, GPSDateStamp); + EXIF_TAG(0x1E, GPSDifferential); + } +} exif_gps_tag_value2name; + + +///*********************************************** support functions -#ifndef DOXYGEN 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) { @@ -176,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 %lu bytes count not in [0..%lu] 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); } }; @@ -217,54 +289,47 @@ 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; }; -/// 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; @@ -272,21 +337,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'. }; @@ -305,53 +365,11 @@ struct JPG_Exif_IFD_entry { #define JPG_IFD_TAG_EXIF_OFFSET 0x8769 -#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 int 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"); +#define JPG_IFD_TAG_EXIF_GPS_OFFSET 0x8825 - width=endian_to_ushort(false, head->width); - height=endian_to_ushort(false, head->height); -} +#define JPEG_EXIF_DATE_CHARS 20 -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]); @@ -384,9 +402,9 @@ static Value* parse_IFD_entry_formatted_ } /* case 11: // single float - todo + @todo case 12: // double float - todo + @todo */ }; @@ -394,30 +412,25 @@ static Value* parse_IFD_entry_formatted_ } // date.C -time_t cstr_to_time_t(char *cstr, bool fail_on_error); +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(cstr[0]) - && cstr[length-1]==0) { - char cstr_writable[JPEG_EXIF_DATE_CHARS]; + 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); - time_t t=cstr_to_time_t(cstr_writable, - false/* do not throw exception, just return bad result */); - if(t>=0) - return new VDate(t); + try { + tm tmIn=cstr_to_time_t(cstr_writable, 0); + return new VDate(tmIn); + } + catch(...) { /*ignore bad date times*/ } } - if(const char* premature_zero_pos=(const char* )memchr(cstr, 0, length)) - length=premature_zero_pos-cstr; - return new VString(*new String(cstr, length, true/*tainted*/)); + return new VString(*new String(cstr, String::L_TAINTED)); } if(components_count==1) @@ -434,9 +447,7 @@ static Value* parse_IFD_entry_formatted_ return result; } -static Value* parse_IFD_entry_value( - bool is_big, Measure_reader& reader, long tiff_base, - JPG_Exif_IFD_entry& entry) { +static Value* parse_IFD_entry_value(bool is_big, Measure_reader& reader, uint64_t tiff_base, JPG_Exif_IFD_entry& entry) { size_t format2component_size[]={ 0, // undefined 1, // unsigned byte @@ -466,61 +477,51 @@ static Value* parse_IFD_entry_value( // 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; + uint 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( - is_big, format, - component_size, components_count, - entry.value_or_offset_to_it); + result=parse_IFD_entry_formatted_value(is_big, format, component_size, components_count, entry.value_or_offset_to_it); else { - long remembered=reader.tell(); + uint64_t remembered=reader.tell(); { - reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it), SEEK_SET); + reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it)); const char* value; - if(reader.read(value, value_size)signature, "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; @@ -565,46 +558,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://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(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"); +} + +///*********************************************** 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; + } } - throw Exception("image.format", - &origin_string, - "broken JPEG file - size frame not found"); + return false; + // then goes: LLLLLLLL Offset to next IFD [not going there] } -static void measure_png(const String& origin_string, - Measure_reader& reader, ushort& width, ushort& height) { +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 int head_size=sizeof(PNG_Header); + 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); +} + + +///*********************************************** 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) { - const char* file_name_cstr=file_name.cstr(String::L_FILE_SPEC); +///*********************************************** 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) + measure_mp4(file_name, reader, info.width, info.height); else - throw Exception("image.format", - &file_name, - "unhandled image file name extension '%s'", cext); + throw Exception(IMAGE_FORMAT, &file_name, "unhandled image 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 image 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 }; + + 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(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={0}; - info.width=&width; - info.height=&height; - info.exif=&exif; - info.file_name=file_name; - file_read_action_under_lock(r.absolute(*file_name), - "measure", file_measure_action, &info); + file_read_action_under_lock(r.full_disk_path(*file_name), "measure", file_measure_action, &info); } else { - VFile* vfile=data.as_vfile(); + VFile* vfile=data.as_vfile(String::L_AS_IS); 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 and internal(starting with "line-") attributes - if(info->skip && info->skip->get(key) || key.pos("line-")==0) +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; + // src="a.gif" width="123" ismap[=-1] + 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); + Value& vattribs=r.process(params[0]); + if(!vattribs.is_string()) { // allow empty + if((attribs=vattribs.get_hash())) { + 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).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); } } static void _load(Request& r, MethodParams& params) { - const String& file_name=params.as_string(0, "file name must not be code"); + const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE); gdImage* image=load(r, file_name); GET_SELF(r, VImage).set(&file_name, image->SX(), image->SY(), image); @@ -816,174 +1095,144 @@ static void _create(Request& r, MethodPa } static void _gif(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); - - const String *file_name=0; - if(params.count()>0) - file_name=¶ms.as_string(0, "file name must be string"); + gdImage& image=GET_SELF(r, VImage).image(); - gdBuf buf=image->Gif(); + const String *file_name=params.count()>0?¶ms.as_string(0, FILE_NAME_MUST_BE_STRING):0; + + gdBuf buf=image.Gif(); VFile& vfile=*new VFile; - Value* content_type=new VString(*new String("image/gif")); - vfile.set(false/*not tainted*/, - (const char*)buf.ptr, buf.size, - file_name? file_name->cstr(String::L_FILE_SPEC): 0, - content_type); - r.write_no_lang(vfile); + vfile.set_binary(false/*not tainted*/, (const char *)buf.ptr, buf.size, file_name, new VString(*new String("image/gif"))); + + r.write(vfile); } static void _line(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->Line( + image.Line( params.as_int(0, "x0 must be int", r), params.as_int(1, "y0 must be int", r), params.as_int(2, "x1 must be int", r), params.as_int(3, "y1 must be int", r), - image->Color(params.as_int(4, "color must be int", r))); + image.Color(params.as_int(4, "color must be int", r))); } static void _fill(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->Fill( + image.Fill( params.as_int(0, "x must be int", r), params.as_int(1, "y must be int", r), - image->Color(params.as_int(2, "color must be int", r))); + image.Color(params.as_int(2, "color must be int", r))); } static void _rectangle(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->Rectangle( + image.Rectangle( params.as_int(0, "x0 must be int", r), params.as_int(1, "y0 must be int", r), params.as_int(2, "x1 must be int", r), params.as_int(3, "y1 must be int", r), - image->Color(params.as_int(4, "color must be int", r))); + image.Color(params.as_int(4, "color must be int", r))); } static void _bar(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->FilledRectangle( + image.FilledRectangle( params.as_int(0, "x0 must be int", r), params.as_int(1, "y0 must be int", r), params.as_int(2, "x1 must be int", r), params.as_int(3, "y1 must be int", r), - image->Color(params.as_int(4, "color must be int", r))); + image.Color(params.as_int(4, "color must be int", r))); } #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"); (**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) { + (**p).x=x; + (**p).y=y; + (*p)++; +} +#endif static void _replace(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "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, - "coordinates must be table"); + int src_color=params.as_int(0, "src color must be int", r); + int dest_color=params.as_int(1, "dest color must be int", r); - gdImage::Point *all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image->FilledPolygonReplaceColor(all_p, table->count(), - image->Color(params.as_int(0, "src color must be int", r)), - image->Color(params.as_int(1, "dest color must be int", r))); + gdImage& image=GET_SELF(r, VImage).image(); + + 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); + } else { + int max_x=image.SX()-1; + int max_y=image.SY()-1; + if(max_x > 0 && max_y > 0){ + count=4; + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + add_point(0, 0, &add_p); + add_point(max_x, 0, &add_p); + add_point(max_x, max_y, &add_p); + add_point(0, max_y, &add_p); + } + } + + if(count) + image.FilledPolygonReplaceColor(all_p, count, image.Color(src_color), image.Color(dest_color)); } static void _polyline(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "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, - "coordinates must be table"); + 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)), + 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; - if(!image) - throw Exception(0, - 0, - "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, - "coordinates must be table"); + 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))); + 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; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); - - Table* table=params.as_no_junction(1, "coordinates must not be code").get_table(); - if(!table) - throw Exception("parser.runtime", - 0, - "coordinates must be table"); + 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))); + image.FilledPolygon(all_p, table->count(), + image.Color(params.as_int(0, "color must be int", r))); } // font @@ -992,14 +1241,20 @@ static void _polybar(Request& r, MethodP // Font class -const int Font::letter_spacing=1; - -Font::Font(//, - const String& aalphabet, - gdImage* aifont, int aheight, int amonospace, int aspacebarspace): - alphabet(aalphabet), - height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), - ifont(aifont) { +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), + ifont(aifont), + alphabet(aalphabet), + fsource_charset(asource_charset){ + + if(fsource_charset.isUTF8()){ + size_t index=0; + for(UTF8_string_iterator i(alphabet); i.has_next(); ) + fletter2index.put_dont_replace(i.next(), index++); + } } /* ******************************** char ********************************** */ @@ -1009,6 +1264,11 @@ size_t Font::index_of(char ch) { return alphabet.pos(ch); } +size_t Font::index_of(XMLCh ch) { + if(ch==' ') return STRING_NOT_FOUND; + return fletter2index.get(ch); +} + int Font::index_width(size_t index) { if(index==STRING_NOT_FOUND) return spacebarspace; @@ -1021,32 +1281,48 @@ int Font::index_width(size_t index) { return 0; } -void Font::index_display(gdImage* image, int x, int y, size_t index){ +void Font::index_display(gdImage& image, int x, int y, size_t index){ if(index!=STRING_NOT_FOUND) - ifont->Copy(*image, x, y, 0, Y(0), index_width(index), height); + ifont->Copy(image, x, y, 0, Y(0), index_width(index), height); } /* ******************************** string ********************************** */ int Font::step_width(int index) { - return letter_spacing + (monospace ? monospace : index_width(index)); + return letterspacing + (monospace ? monospace : index_width(index)); } // counts trailing letter_spacing, consider this OK. useful for contiuations int Font::string_width(const String& s){ const char* cstr=s.cstr(); int result=0; - for(const char* current=cstr; *current; current++) - result+=step_width(index_of(*current)); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ) + result+=step_width(index_of(i.next())); + } else { + for(const char* current=cstr; *current; current++) + result+=step_width(index_of(*current)); + } + return result; } -void Font::string_display(gdImage* image, int x, int y, const String& s){ +void Font::string_display(gdImage& image, int x, int y, const String& s){ const char* cstr=s.cstr(); - for(const char* current=cstr; *current; current++) { - size_t index=index_of(*current); - index_display(image, x, y, index); - x+=step_width(index); + + if(fsource_charset.isUTF8()){ + for(UTF8_string_iterator i(s); i.has_next(); ){ + size_t index=index_of(i.next()); + index_display(image, x, y, index); + x+=step_width(index); + } + } else { + for(const char* current=cstr; *current; current++) { + size_t index=index_of(*current); + index_display(image, x, y, index); + x+=step_width(index); + } } } @@ -1055,31 +1331,52 @@ void Font::string_display(gdImage* image static void _font(Request& r, MethodParams& params) { const String& alphabet=params.as_string(0, "alphabet must not be code"); - gdImage* image=load(r, params.as_string(1, "file_name must not be code")); - int spacebar_width=params.as_int(2, "spacebar_width must be int", r); - int monospace_width; - if(params.count()>3) { - monospace_width=params.as_int(3, "monospace_width must be int", r); - if(!monospace_width) - monospace_width=image->SX(); - } else - monospace_width=0; + size_t alphabet_length=alphabet.length(r.charsets.source()); + if(!alphabet_length) + throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); + + gdImage* image=load(r, params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE)); + + int spacebar_width=image->SX(); + int monospace_width=0; // proportional + int letter_spacing=1; + if(params.count()>2){ + if(HashStringValue* options=params[2].get_hash()){ + // third option is hash + if(params.count()>3) + 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(*vspacebar_width).as_int(); + } + if(Value* vmonospace_width=options->get(monospace_width_name)){ + valid_options++; + 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(*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, "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) + monospace_width=image->SX(); + } + } + } - if(!alphabet.length()) - throw Exception("parser.runtime", - 0, - "alphabet must not be empty"); - - 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); + 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); - GET_SELF(r, VImage).font=new Font( - alphabet, - image, - image->SY() / alphabet.length(), monospace_width, spacebar_width); + 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) { @@ -1088,115 +1385,69 @@ static void _text(Request& r, MethodPara const String& s=params.as_string(2, "text must not be code"); VImage& vimage=GET_SELF(r, VImage); - if(vimage.image) - if(vimage.font) - vimage.font->string_display(vimage.image, x, y, s); - else - throw Exception("parser.runtime", - 0, - "set the font first"); - else - throw Exception(0, - 0, - "does not contain an image"); + vimage.font().string_display(vimage.image(), x, y, s); } static void _length(Request& r, MethodParams& params) { const String& s=params.as_string(0, "text must not be code"); VImage& vimage=GET_SELF(r, VImage); - if(vimage.image) - if(vimage.font) { - r.write_no_lang(*new VInt(vimage.font->string_width(s))); - } else - throw Exception("parser.runtime", - 0, - "set the font first"); - else - throw Exception(0, - 0, - "does not contain an image"); + r.write(*new VInt(vimage.font().string_width(s))); } static void _arc(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->Arc( + image.Arc( params.as_int(0, "center_x must be int", r), params.as_int(1, "center_y must be int", r), params.as_int(2, "width must be int", r), params.as_int(3, "height must be int", r), params.as_int(4, "start degrees must be int", r), params.as_int(5, "end degrees must be int", r), - image->Color(params.as_int(6, "cx must be int", r))); + image.Color(params.as_int(6, "cx must be int", r))); } static void _sector(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); - image->Sector( + image.Sector( params.as_int(0, "center_x must be int", r), params.as_int(1, "center_y must be int", r), params.as_int(2, "width must be int", r), params.as_int(3, "height must be int", r), params.as_int(4, "start degrees must be int", r), params.as_int(5, "end degrees must be int", r), - image->Color(params.as_int(6, "color must be int", r))); + image.Color(params.as_int(6, "color must be int", r))); } static void _circle(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; - if(!image) - throw Exception(0, - 0, - "does not contain an image"); + gdImage& image=GET_SELF(r, VImage).image(); int size=params.as_int(2, "radius must be int", r)*2; - image->Arc( + image.Arc( params.as_int(0, "center_x must be int", r), params.as_int(1, "center_y must be int", r), size, //w size, //h 0, //s 360, //e - image->Color(params.as_int(3, "color must be int", r))); + image.Color(params.as_int(3, "color must be int", r))); } -gdImage* as_image(MethodParams& params, int index, const char* msg) { - gdImage* src=0; - +gdImage& as_image(MethodParams& params, int index, const char* msg) { Value& value=params.as_no_junction(index, msg); - if(Value* vimage=value.as(VIMAGE_TYPE, false)) { - src=static_cast(vimage)->image; - if(!src) - throw Exception("parser.runtime", - 0, - msg); + if(Value* vimage=value.as(VIMAGE_TYPE)) { + return static_cast(vimage)->image(); } else - throw Exception("parser.runtime", - 0, - msg); - - return src; + throw Exception(PARSER_RUNTIME, 0, msg); } static void _copy(Request& r, MethodParams& params) { - gdImage* dest=GET_SELF(r, VImage).image; - if(!dest) - throw Exception(0, - 0, - "self does not contain an image"); + gdImage& dest=GET_SELF(r, VImage).image(); - gdImage* src=as_image(params, 0, "src must be image"); + gdImage& src=as_image(params, 0, "src must be image"); int sx=params.as_int(1, "src_x must be int", r); int sy=params.as_int(2, "src_y must be int", r); @@ -1211,9 +1462,22 @@ static void _copy(Request& r, MethodPara int tolerance=params.count()>1+2+2+2+2? params.as_int(1+2+2+2+2, "tolerance must be int", r):150; - src->CopyResampled(*dest, dx, dy, sx, sy, dw, dh, sw, sh, tolerance); + src.CopyResampled(dest, dx, dy, sx, sy, dw, dh, sw, sh, tolerance); } else - src->Copy(*dest, dx, dy, sx, sy, sw, sh); + src.Copy(dest, dx, dy, sx, sy, sw, sh); +} + +static void _pixel(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + int x=params.as_int(0, "x must be int", r); + int y=params.as_int(1, "y must be int", r); + + if(params.count()>2) { + image.SetPixel(x, y, + image.Color(params.as_int(2, "color must be int", r))); + } else + r.write(*new VInt(image.DecodeColor(image.GetPixel(x, y)))); } @@ -1221,7 +1485,8 @@ static void _copy(Request& r, MethodPara 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] @@ -1250,7 +1515,8 @@ MImage::MImage(): Methoded("image") { add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); // ^image.replace(color-source;color-dest)[table x:y] - add_native_method("replace", Method::CT_DYNAMIC, _replace, 3, 3); + // ^image.replace(color-source;color-dest) + add_native_method("replace", Method::CT_DYNAMIC, _replace, 2, 3); // ^image.polyline(color)[table x:y] add_native_method("polyline", Method::CT_DYNAMIC, _polyline, 2, 2); @@ -1261,14 +1527,16 @@ MImage::MImage(): Methoded("image") { // ^image.polybar(color)[table x:y] add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 2, 2); - // ^image.font[alPHAbet;font-file-name.gif](spacebar_width) - // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;width) - add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); + // ^image.font[alPHAbet;font-file-name.gif] + // ^image.font[alPHAbet;font-file-name.gif](spacebar_width) + // ^image.font[alPHAbet;font-file-name.gif](spacebar_width;letter_width) + // ^image.font[alPHAbet;font-file-name.gif][$.space-width(.) $.letter-width(.) $.letter-space(.)] + add_native_method("font", Method::CT_DYNAMIC, _font, 2, 4); - // ^image.text(x;y)[text] + // ^image.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); - // ^image.ngth[text] + // ^image.length[text] add_native_method("length", Method::CT_DYNAMIC, _length, 1, 1); // ^image.arc(center x;center y;width;height;start in degrees;end in degrees;color) @@ -1282,4 +1550,7 @@ MImage::MImage(): Methoded("image") { // ^image.copy[source](src x;src y;src w;src h;dst x;dst y[;dest w[;dest h[;tolerance]]]) add_native_method("copy", Method::CT_DYNAMIC, _copy, 1+2+2+2, (1+2+2+2)+2+1); + + // ^image.pixel(x;y)[(color)] + add_native_method("pixel", Method::CT_DYNAMIC, _pixel, 2, 3); }