--- parser3/src/classes/image.C 2017/05/16 14:42:07 1.162 +++ parser3/src/classes/image.C 2019/12/03 15:09:49 1.166 @@ -24,8 +24,9 @@ #include "pa_vimage.h" #include "pa_vdate.h" #include "pa_table.h" +#include "pa_charsets.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.162 2017/05/16 14:42:07 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.166 2019/12/03 15:09:49 moko Exp $"; // defines @@ -290,6 +291,7 @@ public: switch(whence) { case SEEK_CUR: new_offset=offset+value; break; case SEEK_SET: new_offset=(size_t)value; break; + case SEEK_END: new_offset=size; break; default: throw Exception(0, 0, "whence #%d not supported", 0, whence); break; // never @@ -309,23 +311,36 @@ public: /// 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 + 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 }; /// 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; + char signature[3]; // 'GIF' + char version[3]; + uchar width[2]; + uchar height[2]; + char dif; + char fonColor; + char nulls; +}; + +/// BMP file header + DIB header part +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] }; /// JPEG record head @@ -336,16 +351,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 + 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'. }; @@ -375,6 +390,7 @@ struct Measure_info { ushort height; Value** exif; Value** xmp; + Charset* xmp_charset; }; #endif @@ -398,21 +414,6 @@ inline uint endian_to_uint(bool is_big, x_endian_to_uint(b[0], b[1], b[2], b[3]); } -static void measure_gif(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { - - const char* buf; - const size_t head_size=sizeof(GIF_Header); - if(reader.read(buf, head_size)signature, "GIF", 3)!=0) - throw Exception(IMAGE_FORMAT, &origin_string, "not GIF file - wrong signature"); - - width=endian_to_ushort(false, head->width); - height=endian_to_ushort(false, head->height); -} - static Value* parse_IFD_entry_formatted_one_value(bool is_big, ushort format, size_t component_size, const uchar *value) { switch(format) { case 1: // unsigned byte @@ -602,11 +603,13 @@ static Value* parse_exif(Measure_reader& return vhash; } -static Value* parse_xmp(Measure_reader& reader, ushort xmp_length) { +static Value* parse_xmp(Measure_reader& reader, ushort xmp_length, Measure_info &info) { const char* buf; if(reader.read(buf, xmp_length)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=value : info.height=value; + if(info.width && info.height) + return true; + } + } + + return false; + // then goes: LLLLLLLL Offset to next IFD [not going there] +} + +static void measure_tiff(const String& origin_string, Measure_reader& reader, Measure_info &info) { + const char* buf; + + if(reader.read(buf, sizeof(JPG_Exif_TIFF_header))byte_align_identifier, "II", 2)!=0 && strncmp(head->byte_align_identifier, "MM", 2)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + bool is_big=head->byte_align_identifier[0]=='M'; // [M]otorola vs [I]ntel + + if(endian_to_ushort(is_big, head->signature) != 42) + throw Exception(IMAGE_FORMAT, &origin_string, "not TIFF file - wrong signature"); + + reader.seek(endian_to_uint(is_big, head->first_IFD_offset), SEEK_SET); + if(!parse_tiff_IFD(is_big, reader, info)) + throw Exception(IMAGE_FORMAT, &origin_string, "broken TIFF file - size field entry not found"); +} + +static void measure_gif(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { + + const char* buf; + const size_t head_size=sizeof(GIF_Header); + if(reader.read(buf, head_size)signature, "GIF", 3)!=0) + throw Exception(IMAGE_FORMAT, &origin_string, "not GIF file - wrong signature"); + + width=endian_to_ushort(false, head->width); + height=endian_to_ushort(false, head->height); +} + static void measure_png(const String& origin_string, Measure_reader& reader, ushort& width, ushort& height) { const char* buf; @@ -703,6 +771,25 @@ static void measure_png(const String& or height=endian_to_ushort(true, head->height); } +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"); + + reader.seek(0, SEEK_END); + if((uint)reader.tell() != 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); +} + // measure center static void measure(const String& file_name, Measure_reader& reader, Measure_info &info) { @@ -711,10 +798,14 @@ static void measure(const String& file_n cext++; if(strcasecmp(cext, "GIF")==0) measure_gif(file_name, reader, info.width, info.height); - else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) + 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, info.width, info.height); + else if(strcasecmp(cext, "BMP")==0) + measure_bmp(file_name, reader, info.width, info.height); + else if(strcasecmp(cext, "TIF")==0 || strcasecmp(cext, "TIFF")==0) + measure_tiff(file_name, reader, info); else throw Exception(IMAGE_FORMAT, &file_name, "unhandled image file name extension '%s'", cext); } else @@ -733,7 +824,32 @@ static void _measure(Request& r, MethodP Value* exif=0; Value* xmp=0; - Measure_info info={ 0, 0, &exif, &xmp }; + 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; @@ -1219,7 +1335,8 @@ static void _pixel(Request& r, MethodPar MImage::MImage(): Methoded("image") { // ^image:measure[DATA] - add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); + // ^image:measure[DATA; $.exif(false) $.xmp(false) $.xmp-charset[UTF-8] ] + add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 2); // ^image.html[] // ^image.html[hash]