--- parser3/src/classes/image.C 2002/11/21 09:47:34 1.78 +++ parser3/src/classes/image.C 2012/06/15 06:13:10 1.141 @@ -1,12 +1,10 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_IMAGE_C="$Date: 2002/11/21 09:47:34 $"; - /* jpegsize: gets the width and height (in pixels) of a jpeg file Andrew Tong, werdna@ugcs.caltech.edu February 14, 1995 @@ -17,101 +15,297 @@ static const char* IDENT_IMAGE_C="$Date: */ #include "pa_config_includes.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" + +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.141 2012/06/15 06:13:10 misha Exp $"; + +// defines + +static const String spacebar_width_name("space"); +static const String monospace_width_name("width"); +static const String letter_spacing_name("spacing"); // class -class MImage : public Methoded { +class MImage: public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VImage(pool); } + Value* create_new_value(Pool&) { return new VImage(); } public: - MImage(Pool& pool); + MImage(); +}; -public: // Methoded - bool used_directly() { return true; } +// globals -}; +DECLARE_CLASS_VAR(image, new MImage, 0); // 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 + // Tags used by IFD0 (main image) + EXIF_TAG(0x010e, ImageDescription); + EXIF_TAG(0x010f, Make); + EXIF_TAG(0x0110, Model); + EXIF_TAG(0x0112, Orientation); + EXIF_TAG(0x011a, XResolution); + EXIF_TAG(0x011b, YResolution); + EXIF_TAG(0x0128, ResolutionUnit); + EXIF_TAG(0x0131, Software); + EXIF_TAG(0x0132, DateTime); + EXIF_TAG(0x013e, WhitePoint); + EXIF_TAG(0x013f, PrimaryChromaticities); + EXIF_TAG(0x0211, YCbCrCoefficients); + EXIF_TAG(0x0213, YCbCrPositioning); + EXIF_TAG(0x0214, ReferenceBlackWhite); + EXIF_TAG(0x8298, Copyright); + EXIF_TAG(0x8769, ExifOffset); + // Tags used by Exif SubIFD + EXIF_TAG(0x829a, ExposureTime); + EXIF_TAG(0x829d, FNumber); + EXIF_TAG(0x8822, ExposureProgram); + EXIF_TAG(0x8827, ISOSpeedRatings); + EXIF_TAG(0x9000, ExifVersion); + EXIF_TAG(0x9003, DateTimeOriginal); + EXIF_TAG(0x9004, DateTimeDigitized); + EXIF_TAG(0x9101, ComponentsConfiguration); + EXIF_TAG(0x9102, CompressedBitsPerPixel); + EXIF_TAG(0x9201, ShutterSpeedValue); + EXIF_TAG(0x9202, ApertureValue); + EXIF_TAG(0x9203, BrightnessValue); + EXIF_TAG(0x9204, ExposureBiasValue); + EXIF_TAG(0x9205, MaxApertureValue); + EXIF_TAG(0x9206, SubjectDistance); + EXIF_TAG(0x9207, MeteringMode); + EXIF_TAG(0x9208, LightSource); + EXIF_TAG(0x9209, Flash); + EXIF_TAG(0x920a, FocalLength); + EXIF_TAG(0x927c, MakerNote); + EXIF_TAG(0x9286, UserComment); + EXIF_TAG(0x9290, SubsecTime); + EXIF_TAG(0x9291, SubsecTimeOriginal); + EXIF_TAG(0x9292, SubsecTimeDigitized); + EXIF_TAG(0xa000, FlashPixVersion); + EXIF_TAG(0xa001, ColorSpace); + EXIF_TAG(0xa002, ExifImageWidth); + EXIF_TAG(0xa003, ExifImageHeight); + EXIF_TAG(0xa004, RelatedSoundFile); + EXIF_TAG(0xa005, ExifInteroperabilityOffset); + EXIF_TAG(0xa20e, FocalPlaneXResolution); + EXIF_TAG(0xa20f, FocalPlaneYResolution); + EXIF_TAG(0xa210, FocalPlaneResolutionUnit); + EXIF_TAG(0xa215, ExposureIndex); + EXIF_TAG(0xa217, SensingMethod); + EXIF_TAG(0xa300, FileSource); + EXIF_TAG(0xa301, SceneType); + EXIF_TAG(0xa302, CFAPattern); + // Misc Tags + EXIF_TAG(0x00fe, NewSubfileType); + EXIF_TAG(0x00ff, SubfileType); + EXIF_TAG(0x012d, TransferFunction); + EXIF_TAG(0x013b, Artist); + EXIF_TAG(0x013d, Predictor); + EXIF_TAG(0x0142, TileWidth); + EXIF_TAG(0x0143, TileLength); + EXIF_TAG(0x0144, TileOffsets); + EXIF_TAG(0x0145, TileByteCounts); + EXIF_TAG(0x014a, SubIFDs); + EXIF_TAG(0x015b, JPEGTables); + EXIF_TAG(0x828d, CFARepeatPatternDim); + EXIF_TAG(0x828e, CFAPattern); + EXIF_TAG(0x828f, BatteryLevel); + EXIF_TAG(0x83bb, IPTC/NAA); + EXIF_TAG(0x8773, InterColorProfile); + EXIF_TAG(0x8824, SpectralSensitivity); + //EXIF_TAG(0x8825, GPSInfo); + EXIF_TAG(0x8828, OECF); + EXIF_TAG(0x8829, Interlace); + EXIF_TAG(0x882a, TimeZoneOffset); + EXIF_TAG(0x882b, SelfTimerMode); + EXIF_TAG(0x920b, FlashEnergy); + EXIF_TAG(0x920c, SpatialFrequencyResponse); + EXIF_TAG(0x920d, Noise); + EXIF_TAG(0x9211, ImageNumber); + EXIF_TAG(0x9212, SecurityClassification); + EXIF_TAG(0x9213, ImageHistory); + EXIF_TAG(0x9214, SubjectLocation); + EXIF_TAG(0x9215, ExposureIndex); + EXIF_TAG(0x9216, TIFF/EPStandardID); + EXIF_TAG(0xa20b, FlashEnergy); + EXIF_TAG(0xa20c, SpatialFrequencyResponse); + EXIF_TAG(0xa214, SubjectLocation); + + // 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); + } +} 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; + +#undef EXIF_TAG + #ifndef DOXYGEN class Measure_reader { public: - virtual size_t read(const void *&buf, size_t limit)=0; - virtual void seek(long delta)=0; + virtual size_t read(const char* &buf, size_t limit)=0; + virtual void seek(long value, int whence)=0; + virtual long tell()=0; }; class Measure_file_reader: public Measure_reader { + const String& file_name; const char* fname; + int f; + 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) { + Measure_file_reader(int af, const String& afile_name, const char* afname): + file_name(afile_name), fname(afname), f(af) { } - /*override*/size_t read(const void *&abuf, size_t limit) { + override size_t read(const char* &abuf, size_t limit) { if(limit==0) return 0; - void *lbuf=pool.malloc(limit); + 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", + "measure failed: actually read %u bytes count not in [0..%u] valid range", read_size, limit); return read_size; } - /*override*/void seek(long delta) { - if(lseek(f, delta, SEEK_CUR)<0) - throw Exception("file.seek", + override void seek(long value, int whence) { + if(lseek(f, value, whence)<0) + throw Exception(IMAGE_FORMAT, &file_name, - "seek(delta=%ld) failed: %s (%d), actual filename '%s'", - delta, strerror(errno), errno, fname); + "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", + value, whence, strerror(errno), errno, fname); } -private: - Pool& pool; - const String& file_name; const char *fname; - int f; + override long tell() { return lseek(f, 0, SEEK_CUR); } + }; class Measure_buf_reader: public Measure_reader { + + const char* buf; size_t size; + const String& file_name; + + size_t offset; + public: - Measure_buf_reader(const void *abuf, size_t asize, const String& afile_name): + Measure_buf_reader(const char* 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) { + override size_t read(const char* &abuf, size_t limit) { size_t to_read=min(limit, size-offset); - abuf=(const char*)buf+offset; + abuf=buf+offset; offset+=to_read; return to_read; } - /*override*/void seek(long delta) { - size_t new_offset=offset+delta; + 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("file.seek", + throw Exception(IMAGE_FORMAT, &file_name, - "seek(offset=%l) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", - delta, new_offset, size); + "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; } -private: - - const void *buf; size_t size; - const String& file_name; + override long tell() { return offset; } - size_t offset; }; #endif @@ -120,18 +314,18 @@ private: 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; @@ -139,146 +333,413 @@ 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_begin { + 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_begin { + 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 + +#define JPG_IFD_TAG_EXIF_GPS_OFFSET 0x8825 + +#define JPEG_EXIF_DATE_CHARS 20 + // -inline ushort x_endian_to_ushort(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 ushort big_endian_to_ushort(unsigned char b[2]) { - return x_endian_to_ushort(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 ushort little_endian_to_ushort(unsigned char b[2]) { - return 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]); } -void measure_gif(Pool& pool, const String *origin_string, +static void measure_gif(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { - void *buf; - const int head_size=sizeof(GIF_Header); + 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, + throw Exception(IMAGE_FORMAT, + &origin_string, "not GIF file - wrong signature"); - width=little_endian_to_ushort(head->width); - height=little_endian_to_ushort(head->height); + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); } -/// @test remove ugly mech in reader - 20K limit -void measure_jpeg(Pool& pool, const String *origin_string, - Measure_reader& reader, ushort& width, ushort& height) { +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]); + case 3: // unsigned short + return new VInt(endian_to_ushort(is_big, value)); + case 4: // unsigned long + // 'double' because parser's Int is signed + return new VDouble(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 VDouble(((double)numerator)/denominator); + } + case 6: // signed byte + return new VInt((signed char)value[0]); + case 8: // signed short + return new VInt((signed short)endian_to_ushort(is_big, value)); + case 9: // signed long + return new VInt((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 VDouble(numerator/denominator); + } + /* + case 11: // single float + @todo + case 12: // double float + @todo + */ + }; + + return 0; +} + +// date.C +tm cstr_to_time_t(char *cstr); + +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); + + try { + return new VDate(cstr_to_time_t(cstr_writable)); + } + catch(...) { /*ignore bad date times*/ } + } + + return new VString(*new String(cstr, String::L_TAINTED)); + } + + if(components_count==1) + return parse_IFD_entry_formatted_one_value(is_big, format, component_size, value); + + VHash* result=new VHash; + HashStringValue& hash=result->hash(); + 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); + 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); + else { + long remembered=reader.tell(); + { + reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it), SEEK_SET); + const char* value; + if(reader.read(value, value_size)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 VHash; + + // IFD + parse_IFD(vhash->hash(), is_big, reader, tiff_base); + + return vhash; +} + +static void measure_jpeg(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 char* buf; const size_t prefix_size=2; if(reader.read(buf, prefix_size)marker!=MARKER) + throw Exception(IMAGE_FORMAT, + &origin_string, + "not JPEG file - marker not found"); + + 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); break; - 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_ushort(body->height); - found=true; - break; - } else { - // Dummy read to skip over data - long offset=big_endian_to_ushort(head->length) - 2; - reader.seek(offset); - } + case CODE_SIZE_A: + case CODE_SIZE_B: + case CODE_SIZE_C: + case CODE_SIZE_D: + { + // Segments that contain size info + if(reader.read(buf, sizeof(JPG_Size_segment_body))width); + height=endian_to_ushort(true, body->height); + } + return; + }; + + reader.seek(segment_base+endian_to_ushort(true, head->length), SEEK_SET); } - if(!found) - 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"); } -void measure_png(Pool& pool, const String *origin_string, +static void measure_png(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { - void *buf; - const int head_size=sizeof(PNG_Header); + 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, + throw Exception(IMAGE_FORMAT, + &origin_string, "not PNG file - wrong signature"); - width=big_endian_to_ushort(head->width); - height=big_endian_to_ushort(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, ushort& width, ushort& height) { - if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) { +static void measure(const String& file_name, + Measure_reader& reader, ushort& width, ushort& height, Value** exif) { + 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(pool, &file_name, reader, width, height); + measure_gif(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(file_name, reader, width, height, exif); else if(strcasecmp(cext, "PNG")==0) - measure_png(pool, &file_name, reader, width, height); + measure_png(file_name, reader, width, height); else - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &file_name, "unhandled image file name extension '%s'", cext); } else - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &file_name, "can not determine image type - no file name extension"); } @@ -287,577 +748,558 @@ void measure(Pool& pool, const String& f #ifndef DOXYGEN struct File_measure_action_info { - ushort *width; - ushort *height; - const String *file_name; + ushort* width; + ushort* height; + Value** exif; + const String* file_name; }; #endif -static void file_measure_action(Pool& pool, - int f, - const String& file_spec, const char *fname, bool as_text, +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(pool, f, *info.file_name, fname); - measure(pool, *info.file_name, reader, *info.width, *info.height); + Measure_file_reader reader(f, *info.file_name, fname); + measure(*info.file_name, reader, *info.width, *info.height, info.exif); } -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"); +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; - const String *file_name; - if(file_name=data.get_string()) { - File_measure_action_info info={&width, &height, file_name}; - file_read_action_under_lock(pool, r.absolute(*file_name), + Value* exif=0; + 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); } else { - const VFile& vfile=*data.as_vfile(); - file_name=&static_cast(vfile.fields().get(*name_name))->as_string(); + 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(), + vfile->value_ptr(), + vfile->value_size(), *file_name ); - measure(pool, *file_name, reader, width, height); + measure(*file_name, reader, width, height, &exif); } - static_cast(r.get_self())->set(file_name, width, height); + GET_SELF(r, VImage).set(file_name, width, height, 0, exif); } #ifndef DOXYGEN struct Attrib_info { - String *tag; ///< html tag being constructed - Hash *skip; ///< tag attributes not to append to tag string [to skip] + String* tag; ///< html tag being constructed + HashStringValue* skip; ///< tag attributes not to append to tag string [to skip] }; #endif -static void append_attrib_pair(const Hash::Key& key, Hash::Val *val, void *info) { - Attrib_info& ai=*static_cast(info); - - // skip user-specified and internal(starting with "line-") attributes - if(ai.skip && ai.skip->get(key) || key.pos("line-")==0) +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()) + ) return; - Value& value=*static_cast(val); - // src="a.gif" width=123 ismap[=-1] - *ai.tag << " " << key; - if(value.is_string() || value.as_int()>=0) - *ai.tag << "=\"" << value.as_string() << "\""; + // src="a.gif" width="123" ismap[=-1] + *info->tag << " " << key; + if(value->is_string() || value->as_int()>=0) + *info->tag << "=\"" << value->as_string() << "\""; } -static void _html(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _html(Request& r, MethodParams& params) { - String tag(pool); + String tag; tag << "(r.get_self())->fields(); - Hash *attribs=0; + const HashStringValue& fields=GET_SELF(r, VImage).fields(); + HashStringValue* attribs=0; - if(params->size()) { + if(params.count()) { // for backward compatibility: someday was ^html{} - Value &vattribs=r.process_to_value(params->get(0), - /*0/*no name* /,*/ - false/*don't intercept string*/); - if(vattribs.is_defined()) // allow 'void' - if(attribs=vattribs.get_hash(&method_name)) { - Attrib_info attrib_info={&tag, 0}; - attribs->for_each(append_attrib_pair, &attrib_info); + Value& vattribs=r.process_to_value(params[0], false/*don't intercept string*/); + if(!vattribs.is_string()) // allow empty + if((attribs=vattribs.get_hash())) { + Attrib_info info={&tag, 0}; + attribs->for_each(append_attrib_pair, &info); } else - throw Exception("parser.runtime", - &method_name, + throw Exception(PARSER_RUNTIME, + 0, "attributes must be hash"); } - Attrib_info attrib_info={&tag, attribs}; - fields.for_each(append_attrib_pair, &attrib_info); + { + Attrib_info info={&tag, attribs}; + fields.for_each(append_attrib_pair, &info); + } tag << " />"; r.write_pass_lang(tag); } /// @test wrap FILE to auto-object -static gdImage *load(Request& r, const String& method_name, +static gdImage* load(Request& r, const String& file_name){ - Pool& pool=r.pool(); - - const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_SPEC); + const char* file_name_cstr=r.absolute(file_name).taint_cstr(String::L_FILE_SPEC); if(FILE *f=fopen(file_name_cstr, "rb")) { - gdImage& image=*new(pool) gdImage(pool); - bool ok=image.CreateFromGif(f); + gdImage* image=new gdImage; + bool ok=image->CreateFromGif(f); fclose(f); if(!ok) - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &file_name, "is not in GIF format"); - return ℑ + return image; } else { throw Exception("file.missing", - &method_name, + 0, "can not open '%s'", file_name_cstr); - return 0; } } -static void _load(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +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, method_name, file_name); - int width=image.SX(); - int height=image.SY(); - static_cast(r.get_self())->set(&file_name, width, height, &image); + gdImage* image=load(r, file_name); + GET_SELF(r, VImage).set(&file_name, image->SX(), image->SY(), image); } -static void _create(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - int width=params->as_int(0, "width must be int", r); - int height=params->as_int(1, "height must be int", r); +static void _create(Request& r, MethodParams& params) { + int width=params.as_int(0, "width must be int", r); + int height=params.as_int(1, "height must be int", r); int bgcolor_value=0xffFFff; - if(params->size()>2) - bgcolor_value=params->as_int(2, "color must be int", r); - gdImage& image=*new(pool) gdImage(pool); - image.Create(width, height); - image.FilledRectangle(0, 0, width-1, height-1, image.Color(bgcolor_value)); - static_cast(r.get_self())->set(0, width, height, &image); -} - -static void _gif(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); + if(params.count()>2) + bgcolor_value=params.as_int(2, "color must be int", r); + gdImage* image=new gdImage; + image->Create(width, height); + image->FilledRectangle(0, 0, width-1, height-1, image->Color(bgcolor_value)); + GET_SELF(r, VImage).set(0, width, height, image); +} - // could _ but don't thing it's wise to use $image.src for vfile.name +static void _gif(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); - String out(pool); image->Gif(out); + const String *file_name=params.count()>0?¶ms.as_string(0, FILE_NAME_MUST_BE_STRING):0; + + gdBuf buf=image.Gif(); - VFile& vfile=*new(pool) VFile(pool); - Value *content_type=new(pool) VString(*new(pool) String(pool, "image/gif")); - vfile.set(false/*not tainted*/, - out.cstr(), out.size(), 0, content_type); + VFile& vfile=*new VFile; + + vfile.set(false/*not tainted*/, + false/*binary*/, + (char*)buf.ptr, + buf.size, + file_name, + new VString(*new String("image/gif"))); r.write_no_lang(vfile); } -static void _line(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _line(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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))); -} - -static void _fill(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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))); -} - -static void _rectangle(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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))); -} - -static void _bar(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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.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))); +} + +static void _fill(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + 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))); +} + +static void _rectangle(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + 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))); +} + +static void _bar(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + 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))); } #ifndef DOXYGEN -static void add_point(Array::Item *value, void *info) { - Array& row=*static_cast(value); - gdImage::Point **p=static_cast(info); - - (**p).x=row.get_string(0)->as_int(); - (**p).y=row.get_string(1)->as_int(); +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 -static void _replace(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); +#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) { + 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& 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); + } + } - Table *table=params->as_no_junction(2, "coordinates must not be code").get_table(); - if(!table) - throw Exception(0, - &method_name, - "coordinates must be table"); + if(count) + image.FilledPolygonReplaceColor(all_p, count, image.Color(src_color), image.Color(dest_color)); +} - gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image->FilledPolygonReplaceColor(all_p, table->size(), - image->Color(params->as_int(0, "src color must be int", r)), - image->Color(params->as_int(1, "dest color must be int", r))); -} - -static void _polyline(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); +static void _polyline(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); - Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); - if(!table) - throw Exception(0, - &method_name, - "coordinates must be table"); + Table* table=params.as_table(1, "coordinates"); - gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + 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->size(), - 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, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _polygon(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); + Table* table=(Table*)params.as_table(1, "coordinates"); - Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); - if(!table) - throw Exception(0, - &method_name, - "coordinates must be table"); - - gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + 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->size(), - 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, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _polybar(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - Table *table=params->as_no_junction(1, "coordinates must not be code").get_table(); - if(!table) - throw Exception("parser.runtime", - &method_name, - "coordinates must be table"); + Table* table=(Table*)params.as_table(1, "coordinates"); - gdImage::Point *all_p=(gdImage::Point *)pool.malloc(sizeof(gdImage::Point)*table->size()); + 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->size(), - 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 -#define Y(y)(y+index*height+1) +#define Y(y)(y+index*height) -/// simple gdImage-based font storage & text output -class Font : public Pooled { -public: - - const static int letter_spacing; - int height; ///< Font heigth - int monospace; ///< Default char width - int spacebarspace; ///< spacebar width - gdImage& ifont; - const String& alphabet; - - Font(Pool& pool, - const String& aalphabet, - gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), - alphabet(aalphabet), - height(aheight), monospace(amonospace), spacebarspace(aspacebarspace), - ifont(aifont) { - } - - /* ******************************** char ********************************** */ - - int index_of(char ch) { - if(ch==' ') return -1; - return alphabet.pos(&ch, 1); - } - - int index_width(int index) { - if(index<0) - 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); +} + +/* ******************************** char ********************************** */ + +size_t Font::index_of(char ch) { + if(ch==' ') return STRING_NOT_FOUND; + 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; + int tr=ifont->GetTransparent(); + for(int x=ifont->SX()-1; x>=0; x--) { + for(int y=0; yGetPixel(x, Y(y))!=tr) + return x+1; } - - /* ******************************** string ********************************** */ - - int string_width(const String& s){ - const char *cstr=s.cstr(); - int result=0; - for(; *cstr; cstr++) - result+=index_width(index_of(*cstr)); - return result; + return 0; +} + +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); +} + +/* ******************************** string ********************************** */ + +int Font::step_width(int 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; + + 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)); } - - void string_display(gdImage& image, int x, int y, const String& s){ - const char *cstr=s.cstr(); - if(cstr) for(; *cstr; cstr++) { - int index=index_of(*cstr); + + return result; +} + +void Font::string_display(gdImage& image, int x, int y, const String& s){ + const char* cstr=s.cstr(); + + 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+=letter_spacing + (monospace ? monospace : index_width(index)); + x+=step_width(index); } } - -}; -const int Font::letter_spacing=1; +} -static void _font(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +// - const String& alphabet=params->as_string(0, "alphabet must not be code"); - gdImage& image=*load(r, method_name, 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->size()>3) { - monospace_width=params->as_int(3, "monospace_width must be int", r); - if(!monospace_width) - monospace_width=image.SX(); - } else - monospace_width=0; - if(!alphabet.size()) - throw Exception("parser.runtime", - &method_name, +static void _font(Request& r, MethodParams& params) { + 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"); + + 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.as_no_junction(2, "param must be int or hash").get_hash()){ + // third option is hash + if(params.count()>3) + throw Exception(PARSER_RUNTIME, + 0, + "too many options 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(); + } + if(Value* vmonospace_width=options->get(monospace_width_name)){ + valid_options++; + monospace_width=r.process_to_value(*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(); + } + 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); + if(params.count()>3) { + monospace_width=params.as_int(3, "monospace_width must be int", r); + if(!monospace_width) + monospace_width=image->SX(); + } + } + } + + 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); - static_cast(r.get_self())->font=new(pool) Font(pool, + GET_SELF(r, VImage).set_font(new Font( + r.charsets.source(), alphabet, image, - image.SY() / alphabet.size(), monospace_width, spacebar_width); + image->SY() / alphabet_length, monospace_width, spacebar_width, letter_spacing)); } -static void _text(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _text(Request& r, MethodParams& params) { + int x=params.as_int(0, "x must be int", r); + int y=params.as_int(1, "y must be int", r); + const String& s=params.as_string(2, "text must not be code"); - int x=params->as_int(0, "x must be int", r); - int y=params->as_int(1, "y must be int", r); - const String& s=params->as_string(2, "text must not be code"); + VImage& vimage=GET_SELF(r, VImage); + vimage.font().string_display(vimage.image(), x, y, s); +} - VImage& vimage=*static_cast(r.get_self()); - if(vimage.image) - if(vimage.font) - vimage.font->string_display(*vimage.image, x, y, s); - else - throw Exception("parser.runtime", - &method_name, - "set the font first"); - else - throw Exception(0, - &method_name, - "does not contain an image"); -} - -static void _length(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - const String& s=params->as_string(0, "text must not be code"); - - VImage& vimage=*static_cast(r.get_self()); - if(vimage.image) - if(vimage.font) { - r.write_no_lang(*new(pool) VInt(pool, vimage.font->string_width(s))); - } else - throw Exception("parser.runtime", - &method_name, - "set the font first"); - else - throw Exception(0, - &method_name, - "does not contain an image"); -} - -static void _arc(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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))); -} - -static void _sector(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - 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))); -} - -static void _circle(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - gdImage *image=static_cast(r.get_self())->image; - if(!image) - throw Exception(0, - &method_name, - "does not contain an image"); - - int size=params->as_int(2, "radius must be int", r)*2; - image->Arc( - params->as_int(0, "center_x must be int", r), - params->as_int(1, "center_y must be int", r), +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); + r.write_no_lang(*new VInt(vimage.font().string_width(s))); +} + +static void _arc(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + 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))); +} + +static void _sector(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + 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))); +} + +static void _circle(Request& r, MethodParams& params) { + gdImage& image=GET_SELF(r, VImage).image(); + + int size=params.as_int(2, "radius must be int", r)*2; + 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(Pool& pool, const String& method_name, 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); - 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", - &method_name, - msg); + if(Value* vimage=value.as(VIMAGE_TYPE)) { + return static_cast(vimage)->image(); } else - throw Exception("parser.runtime", - &method_name, + throw Exception(PARSER_RUNTIME, + 0, msg); - - return *src; } -static void _copy(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _copy(Request& r, MethodParams& params) { + gdImage& dest=GET_SELF(r, VImage).image(); + + gdImage& src=as_image(params, 0, "src must be image"); - gdImage *dest=static_cast(r.get_self())->image; - if(!dest) - throw Exception(0, - &method_name, - "self does not contain an image"); - - gdImage& src=as_image(pool, method_name, 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); - int sw=params->as_int(3, "src_w must be int", r); - int sh=params->as_int(4, "src_h must be int", r); - int dx=params->as_int(5, "dest_x must be int", r); - int dy=params->as_int(6, "dest_y must be int", r); - if(params->size()>1+2+2+2) { - int dw=params->as_int(1+2+2+2, "dest_w must be int", r); - int dh=(int)(params->size()>1+2+2+2+1? - params->as_int(1+2+2+2+1, "dest_h must be int", r):sh*(((double)dw)/((double)sw))); - int tolerance=params->size()>1+2+2+2+2? - params->as_int(1+2+2+2+2, "tolerance must be int", r):150; + int sx=params.as_int(1, "src_x must be int", r); + int sy=params.as_int(2, "src_y must be int", r); + int sw=params.as_int(3, "src_w must be int", r); + int sh=params.as_int(4, "src_h must be int", r); + int dx=params.as_int(5, "dest_x must be int", r); + int dy=params.as_int(6, "dest_y must be int", r); + if(params.count()>1+2+2+2) { + int dw=params.as_int(1+2+2+2, "dest_w must be int", r); + int dh=(int)(params.count()>1+2+2+2+1? + params.as_int(1+2+2+2+1, "dest_h must be int", r):sh*(((double)dw)/((double)sw))); + 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_no_lang(*new VInt(image.DecodeColor(image.GetPixel(x, y)))); } // constructor -MImage::MImage(Pool& apool) : Methoded(apool, "image") { +MImage::MImage(): Methoded("image") { // ^image:measure[DATA] add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); @@ -873,7 +1315,7 @@ MImage::MImage(Pool& apool) : Methoded(a add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3); // ^image.gif[] - add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0); + add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 1); // ^image.line(x0;y0;x1;y1;color) add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5); @@ -888,7 +1330,8 @@ MImage::MImage(Pool& apool) : Methoded(a 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); @@ -899,14 +1342,16 @@ MImage::MImage(Pool& apool) : Methoded(a // ^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) @@ -920,14 +1365,7 @@ MImage::MImage(Pool& apool) : Methoded(a // ^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); -} - -// global variable - -Methoded *image_class; - -// creator -Methoded *MImage_create(Pool& pool) { - return image_class=new(pool) MImage(pool); + // ^image.pixel(x;y)[(color)] + add_native_method("pixel", Method::CT_DYNAMIC, _pixel, 2, 3); }