@@ -54,7 +54,7 @@ static const char *ftypes_int[] = {

     "0:0:466f723a20:Eserv mail:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:46726f6d20:MBox:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:46726f6d3a20:Exim mail:CL_TYPE_ANY:CL_TYPE_MAIL",

-    "0:0:474946:GIF:CL_TYPE_ANY:CL_TYPE_GIF",

+    "0:0:474946:GIF:CL_TYPE_ANY:CL_TYPE_GIF:122",

     "0:0:48692e20546869732069732074686520716d61696c2d73656e64:Qmail bounce:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:494433:MP3:CL_TYPE_ANY:CL_TYPE_IGNORED",

     "0:0:49545346:MS CHM:CL_TYPE_ANY:CL_TYPE_MSCHM",

@@ -87,10 +87,10 @@ static const char *ftypes_int[] = {

     "0:0:763a0d0a52656365697665643a20:VPOP3 Mail (DOS):CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:789f3e22:TNEF:CL_TYPE_ANY:CL_TYPE_TNEF",

     "0:0:7f454c46:ELF:CL_TYPE_ANY:CL_TYPE_ELF",

-    "0:0:89504e47:PNG:CL_TYPE_ANY:CL_TYPE_PNG",

+    "0:0:89504e47:PNG:CL_TYPE_ANY:CL_TYPE_PNG:122",

     "0:0:b6b9acaefeffffff:CryptFF:CL_TYPE_ANY:CL_TYPE_CRYPTFF",

     "0:0:d0cf11e0a1b11ae1:OLE2 container:CL_TYPE_ANY:CL_TYPE_MSOLE2",

-    "0:0:ffd8ff:JPEG:CL_TYPE_ANY:CL_TYPE_JPEG",

+    "0:0:ffd8ff:JPEG:CL_TYPE_ANY:CL_TYPE_JPEG:122",

     "0:0:fffb90:MP3:CL_TYPE_ANY:CL_TYPE_IGNORED",

     "1:*:3c4120*(68|48)(72|52)4546:HTML data:CL_TYPE_ANY:CL_TYPE_HTML",

     "1:*:3c4120*(68|48)(72|52)6566:HTML data:CL_TYPE_ANY:CL_TYPE_HTML",

@@ -189,8 +189,8 @@ static const char *ftypes_int[] = {

     "1:0:3c3f786d6c2076657273696f6e3d22312e3022*70726f6769643d22576f72642e446f63756d656e74223f3e:Microsoft Word 2003 XML Document:CL_TYPE_ANY:CL_TYPE_XML_WORD:80",

     "1:0:3c3f786d6c2076657273696f6e3d22312e3022*3c576f726b626f6f6b:Microsoft Excel 2003 XML Document:CL_TYPE_ANY:CL_TYPE_XML_XL:80",

     "1:0:3c3f786d6c2076657273696f6e3d22312e3022*3c??3a576f726b626f6f6b:Microsoft Excel 2003 XML Document:CL_TYPE_ANY:CL_TYPE_XML_XL:80",

-    "0:0:49492a00:TIFF Little Endian:CL_TYPE_ANY:CL_TYPE_TIFF:81",

-    "0:0:4d4d:TIFF Big Endian:CL_TYPE_ANY:CL_TYPE_TIFF:81",

+    "0:0:49492a00:TIFF Little Endian:CL_TYPE_ANY:CL_TYPE_TIFF:122",

+    "0:0:4d4d:TIFF Big Endian:CL_TYPE_ANY:CL_TYPE_TIFF:122",

     "0:4:d0cf11e0a1b11ae1:HWP embedded OLE2:CL_TYPE_ANY:CL_TYPE_HWPOLE2",

     "0:0:48575020446f63756d656e742046696c652056332e3030201a0102030405:HWP 3.x Document:CL_TYPE_ANY:CL_TYPE_HWP3:82",

     "1:0:efbbbf3c3f786d6c2076657273696f6e3d22312e3022*3c4857504d4c:HWPML Document:CL_TYPE_ANY:CL_TYPE_XML_HWP:82",

@@ -523,7 +523,7 @@ cl_error_t cli_parsejpeg(cli_ctx *ctx)

                  * ICC Profile

                  */

                 if ((fmap_readn(map, buff, offset - len + sizeof(len_u16), strlen("ICC_PROFILE") + 2) == strlen("ICC_PROFILE") + 2) &&

-                    (0 == memcmp(buff, "ICC_PROFILE\0", strlen("ICC_PROFILE" + 1)))) {

+                    (0 == memcmp(buff, "ICC_PROFILE\0", strlen("ICC_PROFILE") + 1))) {

                     /* Found ICC Profile Chunk. Let's print out the chunk #, which follows "ICC_PROFILE\0"... */

                     uint8_t chunk_no = buff[strlen("ICC_PROFILE") + 1];

                     cli_dbgmsg(" ICC Profile, chunk # %d\n", chunk_no);

@@ -243,7 +243,7 @@ cl_error_t cli_parsepng(cli_ctx *ctx)

              | PLTE |

              *------*/

             if (have_PLTE) {

-                cli_dbgmsg("PNG: More than one PTLE chunk found in a PNG file, which is not valid\n", color_type);

+                cli_dbgmsg("PNG: More than one PTLE chunk found in a PNG file, which is not valid\n");

             }

             if (!(chunk_data_length > sizeof(png_palette_entry) * 256 || chunk_data_length % 3 != 0)) {

@@ -341,8 +341,8 @@ cl_error_t cli_parsepng(cli_ctx *ctx)

                     }

                     /* inflate! */

-                    err = inflate(&zstrm, Z_NO_FLUSH);

-                    decompressed_data_len += (decompressed_data_buffer_size - decompressed_data_len - zstrm.avail_out);

+                    err                   = inflate(&zstrm, Z_NO_FLUSH);

+                    decompressed_data_len = decompressed_data_buffer_size - zstrm.avail_out;

                     if (err != Z_OK && err != Z_STREAM_END) {

                         cli_dbgmsg("PNG: zlib: inflate error: %d, Image decompression failed!\n", err);

                         inflateEnd(&zstrm);