From 05f0172b939e7a54959c38b9c6e4f3fc79187381 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 7 Apr 2023 16:06:09 +1000 Subject: [PATCH] script/manual-test-truncated-input: re-enable WBMP --- script/manual-test-truncated-input.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/manual-test-truncated-input.cc b/script/manual-test-truncated-input.cc index 2fc25d27..741e4c58 100644 --- a/script/manual-test-truncated-input.cc +++ b/script/manual-test-truncated-input.cc @@ -69,6 +69,7 @@ #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__WBMP #define WUFFS_CONFIG__MODULE__ZLIB // If building this program in an environment that doesn't easily accommodate @@ -123,10 +124,8 @@ handle_image_decoder(wuffs_base__io_buffer src, dec = wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder(); break; case WUFFS_BASE__FOURCC__WBMP: - // Unsupported. wuffs_base__magic_number_guess_fourcc can sometimes - // return false positives for WBMP. The WBMP file format doesn't - // start with a "magic" identifier. - return unsupported_file_format; + dec = wuffs_wbmp__decoder::alloc_as__wuffs_base__image_decoder(); + break; default: return unsupported_file_format; } @@ -169,6 +168,9 @@ handle_image_decoder(wuffs_base__io_buffer src, return df_status.message(); } } + if (src.meta.ri != src.meta.wi) { + return skipped; + } return nullptr; }