--- parser3/src/classes/image.C 2005/07/28 11:23:01 1.112 +++ parser3/src/classes/image.C 2009/06/14 00:33:36 1.124 @@ -1,11 +1,11 @@ /** @file Parser: @b image parser class. - Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_IMAGE_C="$Date: 2005/07/28 11:23:01 $"; +static const char * const IDENT_IMAGE_C="$Date: 2009/06/14 00:33:36 $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -33,7 +33,7 @@ static const char * const IDENT_IMAGE_C= class MImage: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue&) { return new VImage(); } + Value* create_new_value(Pool&, HashStringValue*) { return new VImage(); } public: MImage(); @@ -49,13 +49,13 @@ 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 - #define EXIF_TAG(tag, name) \ - put(tag, #name); // Tags used by IFD0 (main image) EXIF_TAG(0x010e, ImageDescription); EXIF_TAG(0x010f, Make); @@ -130,7 +130,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,10 +147,79 @@ 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); } } 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 { @@ -186,7 +255,7 @@ public: override void seek(long value, int whence) { if(lseek(f, value, whence)<0) - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &file_name, "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", value, whence, strerror(errno), errno, fname); @@ -228,7 +297,7 @@ public: } if((ssize_t)new_offset<0 || new_offset>size) - throw Exception("image.format", + 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); @@ -303,6 +372,8 @@ struct JPG_Exif_IFD_entry { #define JPG_IFD_TAG_EXIF_OFFSET 0x8769 +#define JPG_IFD_TAG_EXIF_GPS_OFFSET 0x8825 + #define JPEG_EXIF_DATE_CHARS 20 // @@ -331,13 +402,13 @@ static void measure_gif(const String& or 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", + throw Exception(IMAGE_FORMAT, &origin_string, "not GIF file - wrong signature"); @@ -382,9 +453,9 @@ static Value* parse_IFD_entry_formatted_ } /* case 11: // single float - todo + @todo case 12: // double float - todo + @todo */ }; @@ -413,9 +484,7 @@ static Value* parse_IFD_entry_formatted_ 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) @@ -464,7 +533,7 @@ 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; @@ -492,24 +561,25 @@ static Value* parse_IFD_entry_value( } static void parse_IFD(HashStringValue& hash, - bool is_big, Measure_reader& reader, long tiff_base); + bool is_big, Measure_reader& reader, long tiff_base, bool gps=false); static void parse_IFD_entry(HashStringValue& hash, bool is_big, Measure_reader& reader, long tiff_base, - JPG_Exif_IFD_entry& entry) { + JPG_Exif_IFD_entry& entry, bool gps=false) { ushort tag=endian_to_ushort(is_big, entry.tag); - if(tag==JPG_IFD_TAG_EXIF_OFFSET) { + + if(tag==JPG_IFD_TAG_EXIF_OFFSET || tag==JPG_IFD_TAG_EXIF_GPS_OFFSET){ long remembered=reader.tell(); { reader.seek(tiff_base+endian_to_uint(is_big, entry.value_or_offset_to_it), SEEK_SET); - parse_IFD(hash, is_big, reader, tiff_base); + parse_IFD(hash, is_big, reader, tiff_base, (tag==JPG_IFD_TAG_EXIF_GPS_OFFSET)?true:gps); } reader.seek(remembered, SEEK_SET); return; } - + if(Value* value=parse_IFD_entry_value(is_big, reader, tiff_base, entry)) { - if(const char* name=exif_tag_value2name.get(tag)) + if(const char* name=(gps)?exif_gps_tag_value2name.get(tag):exif_tag_value2name.get(tag)) hash.put(String::Body(name), value); else hash.put(String::Body::Format(tag), value); @@ -518,7 +588,7 @@ static void parse_IFD_entry(HashStringVa static void parse_IFD( HashStringValue& hash, - bool is_big, Measure_reader& reader, long tiff_base) { + bool is_big, Measure_reader& reader, long tiff_base, bool gps) { const char* buf; if(reader.read(buf, sizeof(JPG_Exif_IFD_begin))marker!=MARKER) - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &origin_string, "not JPEG file - marker not found"); switch(head->code) { - // http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html + // 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); @@ -612,7 +682,7 @@ static void measure_jpeg(const String& o { // Segments that contain size info if(reader.read(buf, sizeof(JPG_Size_segment_body))length), SEEK_SET); } - throw Exception("image.format", + throw Exception(IMAGE_FORMAT, &origin_string, "broken JPEG file - size frame not found"); } @@ -637,13 +707,13 @@ static void measure_png(const String& or 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", + throw Exception(IMAGE_FORMAT, &origin_string, "not PNG file - wrong signature"); @@ -665,11 +735,11 @@ static void measure(const String& file_n else if(strcasecmp(cext, "PNG")==0) 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"); } @@ -757,16 +827,16 @@ static void _html(Request& r, MethodPara if(!vattribs.is_string()) // allow empty if((attribs=vattribs.get_hash())) { Attrib_info info={&tag, 0}; - attribs->for_each(append_attrib_pair, &info); + attribs->for_each(append_attrib_pair, &info); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "attributes must be hash"); } { Attrib_info info={&tag, attribs}; - fields.for_each(append_attrib_pair, &info); + fields.for_each(append_attrib_pair, &info); } tag << " />"; r.write_pass_lang(tag); @@ -781,7 +851,7 @@ static gdImage* load(Request& r, 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 image; @@ -794,7 +864,7 @@ static gdImage* load(Request& r, 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); @@ -817,7 +887,7 @@ static void _gif(Request& r, MethodParam const String *file_name=0; if(params.count()>0) - file_name=¶ms.as_string(0, "file name must be string"); + file_name=¶ms.as_string(0, FILE_NAME_MUST_BE_STRING); gdBuf buf=image.Gif(); @@ -888,9 +958,9 @@ static void add_point(Table::element_typ static void _replace(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_no_junction(2, "coordinates must not be code").get_table(); + Table* table=params.as_no_junction(2, COORDINATES_MUST_NOT_BE_CODE).get_table(); if(!table) - throw Exception(0, + throw Exception(PARSER_RUNTIME, 0, "coordinates must be table"); @@ -905,9 +975,9 @@ static void _replace(Request& r, MethodP 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(); + Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); if(!table) - throw Exception(0, + throw Exception(PARSER_RUNTIME, 0, "coordinates must be table"); @@ -922,9 +992,9 @@ static void _polyline(Request& r, Method static void _polygon(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(); + Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); if(!table) - throw Exception(0, + throw Exception(PARSER_RUNTIME, 0, "coordinates must be table"); @@ -938,9 +1008,9 @@ static void _polygon(Request& r, MethodP static void _polybar(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(); + Table* table=params.as_no_junction(1, COORDINATES_MUST_NOT_BE_CODE).get_table(); if(!table) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "coordinates must be table"); @@ -1020,7 +1090,7 @@ 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")); + 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) { @@ -1031,12 +1101,12 @@ static void _font(Request& r, MethodPara monospace_width=0; if(!alphabet.length()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "alphabet must not be empty"); if(int remainder=image->SY() % alphabet.length()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "font-file height(%d) not divisable by alphabet size(%d), remainder=%d", image->SY(), alphabet.length(), remainder); @@ -1109,7 +1179,7 @@ gdImage& as_image(MethodParams& params, if(Value* vimage=value.as(VIMAGE_TYPE, false)) { return static_cast(vimage)->image(); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, msg); }