From 22eed1fd8d942b7dc45ab3146de41023f3ca2c53 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 13 Nov 2021 11:21:35 +1100 Subject: [PATCH] Let example/convert-to-nia decode NIE --- example/convert-to-nia/convert-to-nia.c | 12 ++++++++++++ test/nia-checksums-of-data.txt | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/example/convert-to-nia/convert-to-nia.c b/example/convert-to-nia/convert-to-nia.c index cb39b543..eb1b3d07 100644 --- a/example/convert-to-nia/convert-to-nia.c +++ b/example/convert-to-nia/convert-to-nia.c @@ -64,6 +64,7 @@ https://skia-review.googlesource.com/c/skia/+/290618 #define WUFFS_CONFIG__MODULE__DEFLATE #define WUFFS_CONFIG__MODULE__GIF #define WUFFS_CONFIG__MODULE__LZW +#define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__WBMP #define WUFFS_CONFIG__MODULE__ZLIB @@ -133,6 +134,7 @@ wuffs_base__image_decoder* g_image_decoder = NULL; union { wuffs_bmp__decoder bmp; wuffs_gif__decoder gif; + wuffs_nie__decoder nie; wuffs_png__decoder png; wuffs_wbmp__decoder wbmp; } g_potential_decoders; @@ -276,6 +278,16 @@ initialize_image_decoder() { &g_potential_decoders.gif); return NULL; + case WUFFS_BASE__FOURCC__NIE: + status = wuffs_nie__decoder__initialize( + &g_potential_decoders.nie, sizeof g_potential_decoders.nie, + WUFFS_VERSION, WUFFS_INITIALIZE__DEFAULT_OPTIONS); + TRY(wuffs_base__status__message(&status)); + g_image_decoder = + wuffs_nie__decoder__upcast_as__wuffs_base__image_decoder( + &g_potential_decoders.nie); + return NULL; + case WUFFS_BASE__FOURCC__PNG: status = wuffs_png__decoder__initialize( &g_potential_decoders.png, sizeof g_potential_decoders.png, diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 5500e274..d6b29a31 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -1,5 +1,9 @@ # Generated by script/print-nia-checksums.sh d3bb0beb test/data/DCI-P3-D65.icc +646e081a test/data/animated-red-blue.000000.nie +181c6916 test/data/animated-red-blue.000001.nie +e651a889 test/data/animated-red-blue.000002.nie +14a5b4b0 test/data/animated-red-blue.000003.nie 646e081a test/data/animated-red-blue.apng 76e40058 test/data/animated-red-blue.gif f9a10dac test/data/artificial/gif-background-color.gif @@ -32,6 +36,7 @@ b641fef2 test/data/bricks-nodither.gif ae2e547d test/data/bricks-nodither.wbmp b47730a2 test/data/checkerboard.gamma1dot0.png b47730a2 test/data/checkerboard.gamma2dot2.png +aa3e6c7c test/data/crude-flag.nie 3014b4c0 test/data/gifplayer-muybridge.gif 030f5a48 test/data/harvesters.bmp 0d213dc4 test/data/harvesters.gif @@ -51,6 +56,7 @@ dcbb225a test/data/hippopotamus.interlaced.png a80781a1 test/data/hippopotamus.interlaced.truncated.gif 1f11edb9 test/data/hippopotamus.masked-with-muybridge.gif 7e6acf01 test/data/hippopotamus.masked-with-muybridge.png +dcbb225a test/data/hippopotamus.nie 21e17862 test/data/hippopotamus.regular.gif dcbb225a test/data/hippopotamus.regular.png 2dccfe56 test/data/muybridge-frame-000.wbmp