--- parser3/src/classes/image.C 2020/11/10 22:42:24 1.167 +++ parser3/src/classes/image.C 2020/11/30 19:50:47 1.169 @@ -26,7 +26,7 @@ #include "pa_table.h" #include "pa_charsets.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.167 2020/11/10 22:42:24 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.169 2020/11/30 19:50:47 moko Exp $"; // defines @@ -228,9 +228,8 @@ public: } } exif_gps_tag_value2name; -#undef EXIF_TAG +///*********************************************** support functions -#ifndef DOXYGEN class Measure_reader { public: virtual size_t read(const char* &buf, size_t limit)=0; @@ -307,43 +306,33 @@ public: }; -#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; -}; -/// 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] -}; +inline ushort x_endian_to_ushort(uchar b0, uchar b1) { + return (ushort)((b1<<8) + b0); +} -/// JPEG record head +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; @@ -383,37 +372,6 @@ struct JPG_Exif_IFD_entry { #define JPEG_EXIF_DATE_CHARS 20 - -#ifndef DOXYGEN -struct Measure_info { - ushort width; - ushort height; - Value** exif; - Value** xmp; - Charset* xmp_charset; -}; -#endif - -// - -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 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 @@ -691,6 +649,8 @@ static void measure_jpeg(const String& o 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))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; @@ -771,6 +756,21 @@ static void measure_png(const String& or height=endian_to_ushort(true, head->height); } + +///*********************************************** 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; @@ -790,7 +790,81 @@ static void measure_bmp(const String& or height=endian_to_ushort(false, head->height); } -// measure center + +///*********************************************** 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"); +} + +///*********************************************** 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); @@ -804,6 +878,8 @@ static void measure(const String& file_n 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