diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 8f87db31..6ea1bd60 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -78,6 +78,13 @@ func doGenrelease(args []string) error { } relFilename := filename[len(baseDirSlash):] + // std/tga was renamed to std/targa in September 2024 (Wuffs v0.4 + // alpha). Ignore the generated file from older versions. + if relFilename == "wuffs-std-tga.c" { + println(filename + " is obsolete, please delete it.") + continue + } + s, err := os.ReadFile(filename) if err != nil { return err diff --git a/doc/changelog.md b/doc/changelog.md index 123c1257..43e6a242 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -49,6 +49,7 @@ The LICENSE has changed from a single license (Apache 2) to a dual license - Removed the `std/gif -> std/lzw` dependency. - Removed `endwhile` keyword. - Removed `example/bzcat`. +- Renamed `std/tga` to `std/targa`. - Set image decoder pixel width and height inclusive maximum to `0xFF_FFFF`, down from `0x7FFF_FFFF`. diff --git a/example/convert-to-nia/convert-to-nia.c b/example/convert-to-nia/convert-to-nia.c index ca0e738c..831a405a 100644 --- a/example/convert-to-nia/convert-to-nia.c +++ b/example/convert-to-nia/convert-to-nia.c @@ -68,7 +68,7 @@ https://skia-review.googlesource.com/c/skia/+/290618 #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP @@ -169,7 +169,7 @@ union { wuffs_nie__decoder nie; wuffs_png__decoder png; wuffs_qoi__decoder qoi; - wuffs_tga__decoder tga; + wuffs_targa__decoder targa; wuffs_thumbhash__decoder thumbhash; wuffs_wbmp__decoder wbmp; wuffs_webp__decoder webp; @@ -424,13 +424,13 @@ initialize_image_decoder() { return NULL; case WUFFS_BASE__FOURCC__TGA: - status = wuffs_tga__decoder__initialize( - &g_potential_decoders.tga, sizeof g_potential_decoders.tga, + status = wuffs_targa__decoder__initialize( + &g_potential_decoders.targa, sizeof g_potential_decoders.targa, WUFFS_VERSION, WUFFS_INITIALIZE__DEFAULT_OPTIONS); TRY(wuffs_base__status__message(&status)); g_image_decoder = - wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder( - &g_potential_decoders.tga); + wuffs_targa__decoder__upcast_as__wuffs_base__image_decoder( + &g_potential_decoders.targa); return NULL; case WUFFS_BASE__FOURCC__TH: diff --git a/example/imageviewer/imageviewer.cc b/example/imageviewer/imageviewer.cc index afa42e92..65dc660f 100644 --- a/example/imageviewer/imageviewer.cc +++ b/example/imageviewer/imageviewer.cc @@ -81,7 +81,7 @@ The Escape key quits. #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP diff --git a/example/sdl-imageviewer/sdl-imageviewer.cc b/example/sdl-imageviewer/sdl-imageviewer.cc index cc543382..34d2bf95 100644 --- a/example/sdl-imageviewer/sdl-imageviewer.cc +++ b/example/sdl-imageviewer/sdl-imageviewer.cc @@ -79,7 +79,7 @@ isn't otherwise doing anything. #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP diff --git a/example/stb-imagedumper/stb-imagedumper.c b/example/stb-imagedumper/stb-imagedumper.c index 10a06836..05f64941 100644 --- a/example/stb-imagedumper/stb-imagedumper.c +++ b/example/stb-imagedumper/stb-imagedumper.c @@ -98,7 +98,7 @@ for a C compiler $CC, such as clang or gcc. #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP diff --git a/fuzz/c/std/seed_corpora.txt b/fuzz/c/std/seed_corpora.txt index a534aead..2df04052 100644 --- a/fuzz/c/std/seed_corpora.txt +++ b/fuzz/c/std/seed_corpora.txt @@ -22,7 +22,7 @@ gzip: test/data/*.gz jpeg: test/data/*.jpeg ../libjpeg_turbo_corpus/*.jpg json: test/data/*.json ../rapidjson_corpus/* ../simdjson_corpus/* ../JSONTestSuite/test_*/*.json png: test/data/*.png test/data/artificial-png/*.png ../pngsuite_corpus/*.png -tga: test/data/*.tga +targa: test/data/*.tga wbmp: test/data/*.wbmp xz: test/data/*.xz ../xz_corpus/*.xz zlib: test/data/*.zlib diff --git a/fuzz/c/std/tga_fuzzer.c b/fuzz/c/std/targa_fuzzer.c similarity index 92% rename from fuzz/c/std/tga_fuzzer.c rename to fuzz/c/std/targa_fuzzer.c index 6fbb0b55..19ca0d35 100644 --- a/fuzz/c/std/tga_fuzzer.c +++ b/fuzz/c/std/targa_fuzzer.c @@ -21,7 +21,7 @@ such as https://github.com/google/oss-fuzz calling LLVMFuzzerTestOneInput. When working on the fuzz implementation, or as a coherence check, defining WUFFS_CONFIG__FUZZLIB_MAIN will let you manually run fuzz over a set of files: -gcc -DWUFFS_CONFIG__FUZZLIB_MAIN tga_fuzzer.c +gcc -DWUFFS_CONFIG__FUZZLIB_MAIN targa_fuzzer.c ./a.out ../../../test/data/*.tga rm -f ./a.out @@ -59,7 +59,7 @@ It should print "PASS", amongst other information, and exit(0). // code simply isn't compiled. #define WUFFS_CONFIG__MODULES #define WUFFS_CONFIG__MODULE__BASE -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA // If building this program in an environment that doesn't easily accommodate // relative includes, you can use the script/inline-c-relative-includes.go @@ -70,8 +70,8 @@ It should print "PASS", amongst other information, and exit(0). const char* // fuzz(wuffs_base__io_buffer* src, uint64_t hash) { - wuffs_tga__decoder dec; - wuffs_base__status status = wuffs_tga__decoder__initialize( + wuffs_targa__decoder dec; + wuffs_base__status status = wuffs_targa__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, (hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED : 0); hash = wuffs_base__u64__rotate_right(hash, 1); @@ -80,5 +80,5 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) { } return fuzz_image_decoder( src, hash, - wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder(&dec)); + wuffs_targa__decoder__upcast_as__wuffs_base__image_decoder(&dec)); } diff --git a/internal/cgen/auxiliary/image.cc b/internal/cgen/auxiliary/image.cc index dc12b50d..cf41a817 100644 --- a/internal/cgen/auxiliary/image.cc +++ b/internal/cgen/auxiliary/image.cc @@ -101,9 +101,9 @@ DecodeImageCallbacks::SelectDecoder(uint32_t fourcc, return wuffs_qoi__decoder::alloc_as__wuffs_base__image_decoder(); #endif -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) case WUFFS_BASE__FOURCC__TGA: - return wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder(); + return wuffs_targa__decoder::alloc_as__wuffs_base__image_decoder(); #endif #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) diff --git a/internal/cgen/auxiliary/image.hh b/internal/cgen/auxiliary/image.hh index 975f643c..14b006d8 100644 --- a/internal/cgen/auxiliary/image.hh +++ b/internal/cgen/auxiliary/image.hh @@ -92,7 +92,7 @@ class DecodeImageCallbacks { // - WUFFS_BASE__FOURCC__NPBM // - WUFFS_BASE__FOURCC__PNG // - WUFFS_BASE__FOURCC__QOI - // - WUFFS_BASE__FOURCC__TGA + // - WUFFS_BASE__FOURCC__TARGA // - WUFFS_BASE__FOURCC__TH // - WUFFS_BASE__FOURCC__WBMP // - WUFFS_BASE__FOURCC__WEBP diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 7f75a1aa..0ad1ebcd 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -62,6 +62,20 @@ #endif +// ---------------- Obsolete Macros Check + +// std/tga was renamed to std/targa in September 2024 (Wuffs v0.4 alpha). +#if defined(WUFFS_CONFIG__MODULE__TGA) + +#if defined(__GNUC__) || defined(__clang__) +#warning "WUFFS_CONFIG__MODULE__TGA was renamed to WUFFS_CONFIG__MODULE__TARGA" +#elif defined(_MSC_VER) +#pragma message( \ + "WUFFS_CONFIG__MODULE__TGA was renamed to WUFFS_CONFIG__MODULE__TARGA") +#endif + +#endif + // ---------------- Configuration // Define WUFFS_CONFIG__AVOID_CPU_ARCH to avoid any code tied to a specific CPU diff --git a/internal/cgen/drop-in/stb.c b/internal/cgen/drop-in/stb.c index 8d968708..6a807bab 100644 --- a/internal/cgen/drop-in/stb.c +++ b/internal/cgen/drop-in/stb.c @@ -116,9 +116,9 @@ wuffs_drop_in__stb__make_decoder( // return wuffs_qoi__decoder__alloc_as__wuffs_base__image_decoder(); #endif -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) case WUFFS_BASE__FOURCC__TGA: - return wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder(); + return wuffs_targa__decoder__alloc_as__wuffs_base__image_decoder(); #endif #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index e74f734f..f6c8889e 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -118,6 +118,20 @@ extern "C" { #endif +// ---------------- Obsolete Macros Check + +// std/tga was renamed to std/targa in September 2024 (Wuffs v0.4 alpha). +#if defined(WUFFS_CONFIG__MODULE__TGA) + +#if defined(__GNUC__) || defined(__clang__) +#warning "WUFFS_CONFIG__MODULE__TGA was renamed to WUFFS_CONFIG__MODULE__TARGA" +#elif defined(_MSC_VER) +#pragma message( \ + "WUFFS_CONFIG__MODULE__TGA was renamed to WUFFS_CONFIG__MODULE__TARGA") +#endif + +#endif + // ---------------- Configuration // Define WUFFS_CONFIG__AVOID_CPU_ARCH to avoid any code tied to a specific CPU @@ -13721,22 +13735,22 @@ struct wuffs_sha256__hasher__struct { #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__SHA256) || defined(WUFFS_NONMONOLITHIC) -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) || defined(WUFFS_NONMONOLITHIC) // ---------------- Status Codes -extern const char wuffs_tga__error__bad_header[]; -extern const char wuffs_tga__error__bad_run_length_encoding[]; -extern const char wuffs_tga__error__truncated_input[]; -extern const char wuffs_tga__error__unsupported_tga_file[]; +extern const char wuffs_targa__error__bad_header[]; +extern const char wuffs_targa__error__bad_run_length_encoding[]; +extern const char wuffs_targa__error__truncated_input[]; +extern const char wuffs_targa__error__unsupported_targa_file[]; // ---------------- Public Consts -#define WUFFS_TGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u +#define WUFFS_TARGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations -typedef struct wuffs_tga__decoder__struct wuffs_tga__decoder; +typedef struct wuffs_targa__decoder__struct wuffs_targa__decoder; #ifdef __cplusplus extern "C" { @@ -13751,14 +13765,14 @@ extern "C" { // Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options. wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT -wuffs_tga__decoder__initialize( - wuffs_tga__decoder* self, +wuffs_targa__decoder__initialize( + wuffs_targa__decoder* self, size_t sizeof_star_self, uint64_t wuffs_version, uint32_t options); size_t -sizeof__wuffs_tga__decoder(void); +sizeof__wuffs_targa__decoder(void); // ---------------- Allocs @@ -13768,19 +13782,19 @@ sizeof__wuffs_tga__decoder(void); // calling free on the returned pointer. That pointer is effectively a C++ // std::unique_ptr. -wuffs_tga__decoder* -wuffs_tga__decoder__alloc(void); +wuffs_targa__decoder* +wuffs_targa__decoder__alloc(void); static inline wuffs_base__image_decoder* -wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder(void) { - return (wuffs_base__image_decoder*)(wuffs_tga__decoder__alloc()); +wuffs_targa__decoder__alloc_as__wuffs_base__image_decoder(void) { + return (wuffs_base__image_decoder*)(wuffs_targa__decoder__alloc()); } // ---------------- Upcasts static inline wuffs_base__image_decoder* -wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder( - wuffs_tga__decoder* p) { +wuffs_targa__decoder__upcast_as__wuffs_base__image_decoder( + wuffs_targa__decoder* p) { return (wuffs_base__image_decoder*)p; } @@ -13788,35 +13802,35 @@ wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__get_quirk( - const wuffs_tga__decoder* self, +wuffs_targa__decoder__get_quirk( + const wuffs_targa__decoder* self, uint32_t a_key); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__set_quirk( - wuffs_tga__decoder* self, +wuffs_targa__decoder__set_quirk( + wuffs_targa__decoder* self, uint32_t a_key, uint64_t a_value); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_image_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_image_config( + wuffs_targa__decoder* self, wuffs_base__image_config* a_dst, wuffs_base__io_buffer* a_src); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_frame_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_frame_config( + wuffs_targa__decoder* self, wuffs_base__frame_config* a_dst, wuffs_base__io_buffer* a_src); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_frame( + wuffs_targa__decoder* self, wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__pixel_blend a_blend, @@ -13825,50 +13839,50 @@ wuffs_tga__decoder__decode_frame( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 -wuffs_tga__decoder__frame_dirty_rect( - const wuffs_tga__decoder* self); +wuffs_targa__decoder__frame_dirty_rect( + const wuffs_targa__decoder* self); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint32_t -wuffs_tga__decoder__num_animation_loops( - const wuffs_tga__decoder* self); +wuffs_targa__decoder__num_animation_loops( + const wuffs_targa__decoder* self); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__num_decoded_frame_configs( - const wuffs_tga__decoder* self); +wuffs_targa__decoder__num_decoded_frame_configs( + const wuffs_targa__decoder* self); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__num_decoded_frames( - const wuffs_tga__decoder* self); +wuffs_targa__decoder__num_decoded_frames( + const wuffs_targa__decoder* self); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__restart_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__restart_frame( + wuffs_targa__decoder* self, uint64_t a_index, uint64_t a_io_position); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct -wuffs_tga__decoder__set_report_metadata( - wuffs_tga__decoder* self, +wuffs_targa__decoder__set_report_metadata( + wuffs_targa__decoder* self, uint32_t a_fourcc, bool a_report); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__tell_me_more( - wuffs_tga__decoder* self, +wuffs_targa__decoder__tell_me_more( + wuffs_targa__decoder* self, wuffs_base__io_buffer* a_dst, wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 -wuffs_tga__decoder__workbuf_len( - const wuffs_tga__decoder* self); +wuffs_targa__decoder__workbuf_len( + const wuffs_targa__decoder* self); #ifdef __cplusplus } // extern "C" @@ -13883,7 +13897,7 @@ wuffs_tga__decoder__workbuf_len( #if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) -struct wuffs_tga__decoder__struct { +struct wuffs_targa__decoder__struct { // Do not access the private_impl's or private_data's fields directly. There // is no API/ABI compatibility or safety guarantee if you do so. Instead, use // the wuffs_foo__bar__baz functions. @@ -13947,19 +13961,19 @@ struct wuffs_tga__decoder__struct { #ifdef __cplusplus #if defined(WUFFS_BASE__HAVE_UNIQUE_PTR) - using unique_ptr = std::unique_ptr; + using unique_ptr = std::unique_ptr; // On failure, the alloc_etc functions return nullptr. They don't throw. static inline unique_ptr alloc() { - return unique_ptr(wuffs_tga__decoder__alloc()); + return unique_ptr(wuffs_targa__decoder__alloc()); } static inline wuffs_base__image_decoder::unique_ptr alloc_as__wuffs_base__image_decoder() { return wuffs_base__image_decoder::unique_ptr( - wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder()); + wuffs_targa__decoder__alloc_as__wuffs_base__image_decoder()); } #endif // defined(WUFFS_BASE__HAVE_UNIQUE_PTR) @@ -13975,10 +13989,10 @@ struct wuffs_tga__decoder__struct { // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in // order to provide convenience methods. These forward on "this", so that you // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)". - wuffs_tga__decoder__struct() = delete; - wuffs_tga__decoder__struct(const wuffs_tga__decoder__struct&) = delete; - wuffs_tga__decoder__struct& operator=( - const wuffs_tga__decoder__struct&) = delete; + wuffs_targa__decoder__struct() = delete; + wuffs_targa__decoder__struct(const wuffs_targa__decoder__struct&) = delete; + wuffs_targa__decoder__struct& operator=( + const wuffs_targa__decoder__struct&) = delete; #endif // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION) #if !defined(WUFFS_IMPLEMENTATION) @@ -13998,7 +14012,7 @@ struct wuffs_tga__decoder__struct { size_t sizeof_star_self, uint64_t wuffs_version, uint32_t options) { - return wuffs_tga__decoder__initialize( + return wuffs_targa__decoder__initialize( this, sizeof_star_self, wuffs_version, options); } @@ -14010,28 +14024,28 @@ struct wuffs_tga__decoder__struct { inline uint64_t get_quirk( uint32_t a_key) const { - return wuffs_tga__decoder__get_quirk(this, a_key); + return wuffs_targa__decoder__get_quirk(this, a_key); } inline wuffs_base__status set_quirk( uint32_t a_key, uint64_t a_value) { - return wuffs_tga__decoder__set_quirk(this, a_key, a_value); + return wuffs_targa__decoder__set_quirk(this, a_key, a_value); } inline wuffs_base__status decode_image_config( wuffs_base__image_config* a_dst, wuffs_base__io_buffer* a_src) { - return wuffs_tga__decoder__decode_image_config(this, a_dst, a_src); + return wuffs_targa__decoder__decode_image_config(this, a_dst, a_src); } inline wuffs_base__status decode_frame_config( wuffs_base__frame_config* a_dst, wuffs_base__io_buffer* a_src) { - return wuffs_tga__decoder__decode_frame_config(this, a_dst, a_src); + return wuffs_targa__decoder__decode_frame_config(this, a_dst, a_src); } inline wuffs_base__status @@ -14041,41 +14055,41 @@ struct wuffs_tga__decoder__struct { wuffs_base__pixel_blend a_blend, wuffs_base__slice_u8 a_workbuf, wuffs_base__decode_frame_options* a_opts) { - return wuffs_tga__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts); + return wuffs_targa__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts); } inline wuffs_base__rect_ie_u32 frame_dirty_rect() const { - return wuffs_tga__decoder__frame_dirty_rect(this); + return wuffs_targa__decoder__frame_dirty_rect(this); } inline uint32_t num_animation_loops() const { - return wuffs_tga__decoder__num_animation_loops(this); + return wuffs_targa__decoder__num_animation_loops(this); } inline uint64_t num_decoded_frame_configs() const { - return wuffs_tga__decoder__num_decoded_frame_configs(this); + return wuffs_targa__decoder__num_decoded_frame_configs(this); } inline uint64_t num_decoded_frames() const { - return wuffs_tga__decoder__num_decoded_frames(this); + return wuffs_targa__decoder__num_decoded_frames(this); } inline wuffs_base__status restart_frame( uint64_t a_index, uint64_t a_io_position) { - return wuffs_tga__decoder__restart_frame(this, a_index, a_io_position); + return wuffs_targa__decoder__restart_frame(this, a_index, a_io_position); } inline wuffs_base__empty_struct set_report_metadata( uint32_t a_fourcc, bool a_report) { - return wuffs_tga__decoder__set_report_metadata(this, a_fourcc, a_report); + return wuffs_targa__decoder__set_report_metadata(this, a_fourcc, a_report); } inline wuffs_base__status @@ -14083,20 +14097,20 @@ struct wuffs_tga__decoder__struct { wuffs_base__io_buffer* a_dst, wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src) { - return wuffs_tga__decoder__tell_me_more(this, a_dst, a_minfo, a_src); + return wuffs_targa__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } inline wuffs_base__range_ii_u64 workbuf_len() const { - return wuffs_tga__decoder__workbuf_len(this); + return wuffs_targa__decoder__workbuf_len(this); } #endif // __cplusplus -}; // struct wuffs_tga__decoder__struct +}; // struct wuffs_targa__decoder__struct #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) -#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) || defined(WUFFS_NONMONOLITHIC) #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) || defined(WUFFS_NONMONOLITHIC) @@ -16490,7 +16504,7 @@ class DecodeImageCallbacks { // - WUFFS_BASE__FOURCC__NPBM // - WUFFS_BASE__FOURCC__PNG // - WUFFS_BASE__FOURCC__QOI - // - WUFFS_BASE__FOURCC__TGA + // - WUFFS_BASE__FOURCC__TARGA // - WUFFS_BASE__FOURCC__TH // - WUFFS_BASE__FOURCC__WBMP // - WUFFS_BASE__FOURCC__WEBP @@ -71994,14 +72008,14 @@ wuffs_sha256__hasher__checksum_bitvec256( #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__SHA256) -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) // ---------------- Status Codes Implementations -const char wuffs_tga__error__bad_header[] = "#tga: bad header"; -const char wuffs_tga__error__bad_run_length_encoding[] = "#tga: bad run length encoding"; -const char wuffs_tga__error__truncated_input[] = "#tga: truncated input"; -const char wuffs_tga__error__unsupported_tga_file[] = "#tga: unsupported TGA file"; +const char wuffs_targa__error__bad_header[] = "#targa: bad header"; +const char wuffs_targa__error__bad_run_length_encoding[] = "#targa: bad run length encoding"; +const char wuffs_targa__error__truncated_input[] = "#targa: truncated input"; +const char wuffs_targa__error__unsupported_targa_file[] = "#targa: unsupported TARGA file"; // ---------------- Private Consts @@ -72011,22 +72025,22 @@ const char wuffs_tga__error__unsupported_tga_file[] = "#tga: unsupported TGA fil WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_image_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_image_config( + wuffs_targa__decoder* self, wuffs_base__image_config* a_dst, wuffs_base__io_buffer* a_src); WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_frame_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_frame_config( + wuffs_targa__decoder* self, wuffs_base__frame_config* a_dst, wuffs_base__io_buffer* a_src); WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_frame( + wuffs_targa__decoder* self, wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__pixel_blend a_blend, @@ -72036,46 +72050,46 @@ wuffs_tga__decoder__do_decode_frame( // ---------------- VTables const wuffs_base__image_decoder__func_ptrs -wuffs_tga__decoder__func_ptrs_for__wuffs_base__image_decoder = { +wuffs_targa__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__status(*)(void*, wuffs_base__pixel_buffer*, wuffs_base__io_buffer*, wuffs_base__pixel_blend, wuffs_base__slice_u8, - wuffs_base__decode_frame_options*))(&wuffs_tga__decoder__decode_frame), + wuffs_base__decode_frame_options*))(&wuffs_targa__decoder__decode_frame), (wuffs_base__status(*)(void*, wuffs_base__frame_config*, - wuffs_base__io_buffer*))(&wuffs_tga__decoder__decode_frame_config), + wuffs_base__io_buffer*))(&wuffs_targa__decoder__decode_frame_config), (wuffs_base__status(*)(void*, wuffs_base__image_config*, - wuffs_base__io_buffer*))(&wuffs_tga__decoder__decode_image_config), - (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_tga__decoder__frame_dirty_rect), + wuffs_base__io_buffer*))(&wuffs_targa__decoder__decode_image_config), + (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_targa__decoder__frame_dirty_rect), (uint64_t(*)(const void*, - uint32_t))(&wuffs_tga__decoder__get_quirk), - (uint32_t(*)(const void*))(&wuffs_tga__decoder__num_animation_loops), - (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frame_configs), - (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frames), + uint32_t))(&wuffs_targa__decoder__get_quirk), + (uint32_t(*)(const void*))(&wuffs_targa__decoder__num_animation_loops), + (uint64_t(*)(const void*))(&wuffs_targa__decoder__num_decoded_frame_configs), + (uint64_t(*)(const void*))(&wuffs_targa__decoder__num_decoded_frames), (wuffs_base__status(*)(void*, uint64_t, - uint64_t))(&wuffs_tga__decoder__restart_frame), + uint64_t))(&wuffs_targa__decoder__restart_frame), (wuffs_base__status(*)(void*, uint32_t, - uint64_t))(&wuffs_tga__decoder__set_quirk), + uint64_t))(&wuffs_targa__decoder__set_quirk), (wuffs_base__empty_struct(*)(void*, uint32_t, - bool))(&wuffs_tga__decoder__set_report_metadata), + bool))(&wuffs_targa__decoder__set_report_metadata), (wuffs_base__status(*)(void*, wuffs_base__io_buffer*, wuffs_base__more_information*, - wuffs_base__io_buffer*))(&wuffs_tga__decoder__tell_me_more), - (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_tga__decoder__workbuf_len), + wuffs_base__io_buffer*))(&wuffs_targa__decoder__tell_me_more), + (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_targa__decoder__workbuf_len), }; // ---------------- Initializer Implementations wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT -wuffs_tga__decoder__initialize( - wuffs_tga__decoder* self, +wuffs_targa__decoder__initialize( + wuffs_targa__decoder* self, size_t sizeof_star_self, uint64_t wuffs_version, uint32_t options){ @@ -72116,19 +72130,19 @@ wuffs_tga__decoder__initialize( self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name = wuffs_base__image_decoder__vtable_name; self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers = - (const void*)(&wuffs_tga__decoder__func_ptrs_for__wuffs_base__image_decoder); + (const void*)(&wuffs_targa__decoder__func_ptrs_for__wuffs_base__image_decoder); return wuffs_base__make_status(NULL); } -wuffs_tga__decoder* -wuffs_tga__decoder__alloc(void) { - wuffs_tga__decoder* x = - (wuffs_tga__decoder*)(calloc(1, sizeof(wuffs_tga__decoder))); +wuffs_targa__decoder* +wuffs_targa__decoder__alloc(void) { + wuffs_targa__decoder* x = + (wuffs_targa__decoder*)(calloc(1, sizeof(wuffs_targa__decoder))); if (!x) { return NULL; } - if (wuffs_tga__decoder__initialize( - x, sizeof(wuffs_tga__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) { + if (wuffs_targa__decoder__initialize( + x, sizeof(wuffs_targa__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) { free(x); return NULL; } @@ -72136,18 +72150,18 @@ wuffs_tga__decoder__alloc(void) { } size_t -sizeof__wuffs_tga__decoder(void) { - return sizeof(wuffs_tga__decoder); +sizeof__wuffs_targa__decoder(void) { + return sizeof(wuffs_targa__decoder); } // ---------------- Function Implementations -// -------- func tga.decoder.get_quirk +// -------- func targa.decoder.get_quirk WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__get_quirk( - const wuffs_tga__decoder* self, +wuffs_targa__decoder__get_quirk( + const wuffs_targa__decoder* self, uint32_t a_key) { if (!self) { return 0; @@ -72160,12 +72174,12 @@ wuffs_tga__decoder__get_quirk( return 0u; } -// -------- func tga.decoder.set_quirk +// -------- func targa.decoder.set_quirk WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__set_quirk( - wuffs_tga__decoder* self, +wuffs_targa__decoder__set_quirk( + wuffs_targa__decoder* self, uint32_t a_key, uint64_t a_value) { if (!self) { @@ -72181,12 +72195,12 @@ wuffs_tga__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func tga.decoder.decode_image_config +// -------- func targa.decoder.decode_image_config WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_image_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_image_config( + wuffs_targa__decoder* self, wuffs_base__image_config* a_dst, wuffs_base__io_buffer* a_src) { if (!self) { @@ -72218,11 +72232,11 @@ wuffs_tga__decoder__decode_image_config( while (true) { { - wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_image_config(self, a_dst, a_src); + wuffs_base__status t_0 = wuffs_targa__decoder__do_decode_image_config(self, a_dst, a_src); v_status = t_0; } if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) { - status = wuffs_base__make_status(wuffs_tga__error__truncated_input); + status = wuffs_base__make_status(wuffs_targa__error__truncated_input); goto exit; } status = v_status; @@ -72247,12 +72261,12 @@ wuffs_tga__decoder__decode_image_config( return status; } -// -------- func tga.decoder.do_decode_image_config +// -------- func targa.decoder.do_decode_image_config WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_image_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_image_config( + wuffs_targa__decoder* self, wuffs_base__image_config* a_dst, wuffs_base__io_buffer* a_src) { wuffs_base__status status = wuffs_base__make_status(NULL); @@ -72302,7 +72316,7 @@ wuffs_tga__decoder__do_decode_image_config( self->private_impl.f_header_color_map_type = t_1; } if (self->private_impl.f_header_color_map_type > 1u) { - status = wuffs_base__make_status(wuffs_tga__error__bad_header); + status = wuffs_base__make_status(wuffs_targa__error__bad_header); goto exit; } { @@ -72321,7 +72335,7 @@ wuffs_tga__decoder__do_decode_image_config( (self->private_impl.f_header_image_type == 10u) || (self->private_impl.f_header_image_type == 11u)) { } else { - status = wuffs_base__make_status(wuffs_tga__error__bad_header); + status = wuffs_base__make_status(wuffs_targa__error__bad_header); goto exit; } { @@ -72393,18 +72407,18 @@ wuffs_tga__decoder__do_decode_image_config( } if (self->private_impl.f_header_color_map_type != 0u) { if ((self->private_impl.f_header_color_map_first_entry_index != 0u) || (self->private_impl.f_header_color_map_length > 256u)) { - status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file); + status = wuffs_base__make_status(wuffs_targa__error__unsupported_targa_file); goto exit; } else if ((self->private_impl.f_header_color_map_entry_size != 15u) && (self->private_impl.f_header_color_map_entry_size != 16u) && (self->private_impl.f_header_color_map_entry_size != 24u) && (self->private_impl.f_header_color_map_entry_size != 32u)) { - status = wuffs_base__make_status(wuffs_tga__error__bad_header); + status = wuffs_base__make_status(wuffs_targa__error__bad_header); goto exit; } } else { if ((self->private_impl.f_header_color_map_first_entry_index != 0u) || (self->private_impl.f_header_color_map_length != 0u) || (self->private_impl.f_header_color_map_entry_size != 0u)) { - status = wuffs_base__make_status(wuffs_tga__error__bad_header); + status = wuffs_base__make_status(wuffs_targa__error__bad_header); goto exit; } } @@ -72490,7 +72504,7 @@ wuffs_tga__decoder__do_decode_image_config( (self->private_impl.f_header_pixel_depth != 16u) && (self->private_impl.f_header_pixel_depth != 24u) && (self->private_impl.f_header_pixel_depth != 32u)) { - status = wuffs_base__make_status(wuffs_tga__error__bad_header); + status = wuffs_base__make_status(wuffs_targa__error__bad_header); goto exit; } if (((uint8_t)(self->private_impl.f_header_image_type | 8u)) == 9u) { @@ -72513,7 +72527,7 @@ wuffs_tga__decoder__do_decode_image_config( self->private_impl.f_src_bytes_per_pixel = 4u; self->private_impl.f_src_pixfmt = 2164295816u; } else { - status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file); + status = wuffs_base__make_status(wuffs_targa__error__unsupported_targa_file); goto exit; } } else { @@ -72523,7 +72537,7 @@ wuffs_tga__decoder__do_decode_image_config( self->private_impl.f_src_pixfmt = 536870920u; self->private_impl.f_opaque = true; } else { - status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file); + status = wuffs_base__make_status(wuffs_targa__error__unsupported_targa_file); goto exit; } } @@ -72537,7 +72551,7 @@ wuffs_tga__decoder__do_decode_image_config( self->private_impl.f_header_image_descriptor = t_9; } if (((uint8_t)(self->private_impl.f_header_image_descriptor & 16u)) != 0u) { - status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file); + status = wuffs_base__make_status(wuffs_targa__error__unsupported_targa_file); goto exit; } self->private_data.s_do_decode_image_config.scratch = ((uint32_t)(self->private_impl.f_header_id_length)); @@ -72700,12 +72714,12 @@ wuffs_tga__decoder__do_decode_image_config( return status; } -// -------- func tga.decoder.decode_frame_config +// -------- func targa.decoder.decode_frame_config WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_frame_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_frame_config( + wuffs_targa__decoder* self, wuffs_base__frame_config* a_dst, wuffs_base__io_buffer* a_src) { if (!self) { @@ -72737,11 +72751,11 @@ wuffs_tga__decoder__decode_frame_config( while (true) { { - wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_frame_config(self, a_dst, a_src); + wuffs_base__status t_0 = wuffs_targa__decoder__do_decode_frame_config(self, a_dst, a_src); v_status = t_0; } if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) { - status = wuffs_base__make_status(wuffs_tga__error__truncated_input); + status = wuffs_base__make_status(wuffs_targa__error__truncated_input); goto exit; } status = v_status; @@ -72766,12 +72780,12 @@ wuffs_tga__decoder__decode_frame_config( return status; } -// -------- func tga.decoder.do_decode_frame_config +// -------- func targa.decoder.do_decode_frame_config WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_frame_config( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_frame_config( + wuffs_targa__decoder* self, wuffs_base__frame_config* a_dst, wuffs_base__io_buffer* a_src) { wuffs_base__status status = wuffs_base__make_status(NULL); @@ -72797,7 +72811,7 @@ wuffs_tga__decoder__do_decode_frame_config( a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - status = wuffs_tga__decoder__do_decode_image_config(self, NULL, a_src); + status = wuffs_targa__decoder__do_decode_image_config(self, NULL, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; } @@ -72853,12 +72867,12 @@ wuffs_tga__decoder__do_decode_frame_config( return status; } -// -------- func tga.decoder.decode_frame +// -------- func targa.decoder.decode_frame WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__decode_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__decode_frame( + wuffs_targa__decoder* self, wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__pixel_blend a_blend, @@ -72893,7 +72907,7 @@ wuffs_tga__decoder__decode_frame( while (true) { { - wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_frame(self, + wuffs_base__status t_0 = wuffs_targa__decoder__do_decode_frame(self, a_dst, a_src, a_blend, @@ -72902,7 +72916,7 @@ wuffs_tga__decoder__decode_frame( v_status = t_0; } if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) { - status = wuffs_base__make_status(wuffs_tga__error__truncated_input); + status = wuffs_base__make_status(wuffs_targa__error__truncated_input); goto exit; } status = v_status; @@ -72927,12 +72941,12 @@ wuffs_tga__decoder__decode_frame( return status; } -// -------- func tga.decoder.do_decode_frame +// -------- func targa.decoder.do_decode_frame WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status -wuffs_tga__decoder__do_decode_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__do_decode_frame( + wuffs_targa__decoder* self, wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__pixel_blend a_blend, @@ -72992,7 +73006,7 @@ wuffs_tga__decoder__do_decode_frame( a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - status = wuffs_tga__decoder__do_decode_frame_config(self, NULL, a_src); + status = wuffs_targa__decoder__do_decode_frame_config(self, NULL, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; } @@ -73094,7 +73108,7 @@ wuffs_tga__decoder__do_decode_frame( v_lit_length = (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) + 1u); iop_a_src += 1u; if ((v_lit_length + v_dst_x) > self->private_impl.f_width) { - status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding); + status = wuffs_base__make_status(wuffs_targa__error__bad_run_length_encoding); goto exit; } } else { @@ -73140,7 +73154,7 @@ wuffs_tga__decoder__do_decode_frame( iop_a_src += 1u; } if ((v_run_length + v_dst_x) > self->private_impl.f_width) { - status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding); + status = wuffs_base__make_status(wuffs_targa__error__bad_run_length_encoding); goto exit; } } @@ -73184,7 +73198,7 @@ wuffs_tga__decoder__do_decode_frame( v_lit_length = (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) + 1u); iop_a_src += 1u; if ((v_lit_length + v_dst_x) > self->private_impl.f_width) { - status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding); + status = wuffs_base__make_status(wuffs_targa__error__bad_run_length_encoding); goto exit; } } else { @@ -73205,7 +73219,7 @@ wuffs_tga__decoder__do_decode_frame( self->private_data.f_scratch[2u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u)))); self->private_data.f_scratch[3u] = 255u; if ((v_run_length + v_dst_x) > self->private_impl.f_width) { - status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding); + status = wuffs_base__make_status(wuffs_targa__error__bad_run_length_encoding); goto exit; } } @@ -73252,12 +73266,12 @@ wuffs_tga__decoder__do_decode_frame( return status; } -// -------- func tga.decoder.frame_dirty_rect +// -------- func targa.decoder.frame_dirty_rect WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 -wuffs_tga__decoder__frame_dirty_rect( - const wuffs_tga__decoder* self) { +wuffs_targa__decoder__frame_dirty_rect( + const wuffs_targa__decoder* self) { if (!self) { return wuffs_base__utility__empty_rect_ie_u32(); } @@ -73273,12 +73287,12 @@ wuffs_tga__decoder__frame_dirty_rect( self->private_impl.f_height); } -// -------- func tga.decoder.num_animation_loops +// -------- func targa.decoder.num_animation_loops WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint32_t -wuffs_tga__decoder__num_animation_loops( - const wuffs_tga__decoder* self) { +wuffs_targa__decoder__num_animation_loops( + const wuffs_targa__decoder* self) { if (!self) { return 0; } @@ -73290,12 +73304,12 @@ wuffs_tga__decoder__num_animation_loops( return 0u; } -// -------- func tga.decoder.num_decoded_frame_configs +// -------- func targa.decoder.num_decoded_frame_configs WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__num_decoded_frame_configs( - const wuffs_tga__decoder* self) { +wuffs_targa__decoder__num_decoded_frame_configs( + const wuffs_targa__decoder* self) { if (!self) { return 0; } @@ -73310,12 +73324,12 @@ wuffs_tga__decoder__num_decoded_frame_configs( return 0u; } -// -------- func tga.decoder.num_decoded_frames +// -------- func targa.decoder.num_decoded_frames WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t -wuffs_tga__decoder__num_decoded_frames( - const wuffs_tga__decoder* self) { +wuffs_targa__decoder__num_decoded_frames( + const wuffs_targa__decoder* self) { if (!self) { return 0; } @@ -73330,12 +73344,12 @@ wuffs_tga__decoder__num_decoded_frames( return 0u; } -// -------- func tga.decoder.restart_frame +// -------- func targa.decoder.restart_frame WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__restart_frame( - wuffs_tga__decoder* self, +wuffs_targa__decoder__restart_frame( + wuffs_targa__decoder* self, uint64_t a_index, uint64_t a_io_position) { if (!self) { @@ -73359,23 +73373,23 @@ wuffs_tga__decoder__restart_frame( return wuffs_base__make_status(NULL); } -// -------- func tga.decoder.set_report_metadata +// -------- func targa.decoder.set_report_metadata WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct -wuffs_tga__decoder__set_report_metadata( - wuffs_tga__decoder* self, +wuffs_targa__decoder__set_report_metadata( + wuffs_targa__decoder* self, uint32_t a_fourcc, bool a_report) { return wuffs_base__make_empty_struct(); } -// -------- func tga.decoder.tell_me_more +// -------- func targa.decoder.tell_me_more WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status -wuffs_tga__decoder__tell_me_more( - wuffs_tga__decoder* self, +wuffs_targa__decoder__tell_me_more( + wuffs_targa__decoder* self, wuffs_base__io_buffer* a_dst, wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src) { @@ -73413,12 +73427,12 @@ wuffs_tga__decoder__tell_me_more( return status; } -// -------- func tga.decoder.workbuf_len +// -------- func targa.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 -wuffs_tga__decoder__workbuf_len( - const wuffs_tga__decoder* self) { +wuffs_targa__decoder__workbuf_len( + const wuffs_targa__decoder* self) { if (!self) { return wuffs_base__utility__empty_range_ii_u64(); } @@ -73430,7 +73444,7 @@ wuffs_tga__decoder__workbuf_len( return wuffs_base__utility__make_range_ii_u64(0u, 0u); } -#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) @@ -84264,9 +84278,9 @@ DecodeImageCallbacks::SelectDecoder(uint32_t fourcc, return wuffs_qoi__decoder::alloc_as__wuffs_base__image_decoder(); #endif -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) case WUFFS_BASE__FOURCC__TGA: - return wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder(); + return wuffs_targa__decoder::alloc_as__wuffs_base__image_decoder(); #endif #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) @@ -85500,9 +85514,9 @@ wuffs_drop_in__stb__make_decoder( // return wuffs_qoi__decoder__alloc_as__wuffs_base__image_decoder(); #endif -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TARGA) case WUFFS_BASE__FOURCC__TGA: - return wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder(); + return wuffs_targa__decoder__alloc_as__wuffs_base__image_decoder(); #endif #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__THUMBHASH) diff --git a/script/manual-test-truncated-input.cc b/script/manual-test-truncated-input.cc index 9cc67c08..13d90b66 100644 --- a/script/manual-test-truncated-input.cc +++ b/script/manual-test-truncated-input.cc @@ -67,7 +67,7 @@ #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP @@ -134,8 +134,8 @@ handle_image_decoder(wuffs_base__io_buffer src, case WUFFS_BASE__FOURCC__QOI: dec = wuffs_qoi__decoder::alloc_as__wuffs_base__image_decoder(); break; - case WUFFS_BASE__FOURCC__TGA: - dec = wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder(); + case WUFFS_BASE__FOURCC__TARGA: + dec = wuffs_targa__decoder::alloc_as__wuffs_base__image_decoder(); break; case WUFFS_BASE__FOURCC__TH: dec = wuffs_thumbhash__decoder::alloc_as__wuffs_base__image_decoder(); diff --git a/script/print-average-pixel.cc b/script/print-average-pixel.cc index 2c623a87..9e5381da 100644 --- a/script/print-average-pixel.cc +++ b/script/print-average-pixel.cc @@ -59,7 +59,7 @@ to use the wuffs_aux C++ API to decode an image and iterate over its pixels. #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__WBMP #define WUFFS_CONFIG__MODULE__ZLIB diff --git a/script/print-image-metadata.cc b/script/print-image-metadata.cc index 85a398bf..c5467da8 100644 --- a/script/print-image-metadata.cc +++ b/script/print-image-metadata.cc @@ -55,7 +55,7 @@ print-image-metadata prints images' metadata. #define WUFFS_CONFIG__MODULE__NIE #define WUFFS_CONFIG__MODULE__PNG #define WUFFS_CONFIG__MODULE__QOI -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA #define WUFFS_CONFIG__MODULE__THUMBHASH #define WUFFS_CONFIG__MODULE__VP8 #define WUFFS_CONFIG__MODULE__WBMP @@ -396,8 +396,8 @@ redirect: case WUFFS_BASE__FOURCC__QOI: dec = wuffs_qoi__decoder::alloc_as__wuffs_base__image_decoder(); break; - case WUFFS_BASE__FOURCC__TGA: - dec = wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder(); + case WUFFS_BASE__FOURCC__TARGA: + dec = wuffs_targa__decoder::alloc_as__wuffs_base__image_decoder(); break; case WUFFS_BASE__FOURCC__TH: dec = wuffs_thumbhash__decoder::alloc_as__wuffs_base__image_decoder(); diff --git a/std/tga/decode_tga.wuffs b/std/targa/decode_targa.wuffs similarity index 99% rename from std/tga/decode_tga.wuffs rename to std/targa/decode_targa.wuffs index e9735289..4e410607 100644 --- a/std/tga/decode_tga.wuffs +++ b/std/targa/decode_targa.wuffs @@ -11,7 +11,7 @@ pub status "#bad header" pub status "#bad run length encoding" pub status "#truncated input" -pub status "#unsupported TGA file" +pub status "#unsupported TARGA file" pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 @@ -104,7 +104,7 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. // We have a color-mapped image (in Wuffs, an indexed pixel format). if (this.header_color_map_first_entry_index <> 0) or (this.header_color_map_length > 0x100) { - return "#unsupported TGA file" + return "#unsupported TARGA file" } else if (this.header_color_map_entry_size <> 0x0F) and (this.header_color_map_entry_size <> 0x10) and (this.header_color_map_entry_size <> 0x18) and @@ -162,7 +162,7 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. this.src_bytes_per_pixel = 4 this.src_pixfmt = base.PIXEL_FORMAT__BGRA_NONPREMUL } else { - return "#unsupported TGA file" + return "#unsupported TARGA file" } } else { @@ -172,14 +172,14 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. this.src_pixfmt = base.PIXEL_FORMAT__Y this.opaque = true } else { - return "#unsupported TGA file" + return "#unsupported TARGA file" } } this.header_image_descriptor = args.src.read_u8?() if (this.header_image_descriptor & 0x10) <> 0 { // We don't support right-to-left, only left-to-right pixel order. - return "#unsupported TGA file" + return "#unsupported TARGA file" } // Skip the Image ID. diff --git a/test/c/std/tga.c b/test/c/std/targa.c similarity index 72% rename from test/c/std/tga.c rename to test/c/std/targa.c index 1404fb16..4fe98414 100644 --- a/test/c/std/tga.c +++ b/test/c/std/targa.c @@ -19,7 +19,7 @@ giflib for GIF, libpng for PNG, etc. To manually run this test: for CC in clang gcc; do - $CC -std=c99 -Wall -Werror tga.c && ./a.out + $CC -std=c99 -Wall -Werror targa.c && ./a.out rm -f a.out done @@ -52,7 +52,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the // code simply isn't compiled. #define WUFFS_CONFIG__MODULES #define WUFFS_CONFIG__MODULE__BASE -#define WUFFS_CONFIG__MODULE__TGA +#define WUFFS_CONFIG__MODULE__TARGA // If building this program in an environment that doesn't easily accommodate // relative includes, you can use the script/inline-c-relative-includes.go @@ -63,62 +63,62 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the // No mimic library. #endif -// ---------------- TGA Tests +// ---------------- TARGA Tests const char* // -wuffs_tga_decode(uint64_t* n_bytes_out, - wuffs_base__io_buffer* dst, - uint32_t wuffs_initialize_flags, - wuffs_base__pixel_format pixfmt, - uint32_t* quirks_ptr, - size_t quirks_len, - wuffs_base__io_buffer* src) { - wuffs_tga__decoder dec; +wuffs_targa_decode(uint64_t* n_bytes_out, + wuffs_base__io_buffer* dst, + uint32_t wuffs_initialize_flags, + wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, + wuffs_base__io_buffer* src) { + wuffs_targa__decoder dec; CHECK_STATUS("initialize", - wuffs_tga__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, - wuffs_initialize_flags)); + wuffs_targa__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, + wuffs_initialize_flags)); return do_run__wuffs_base__image_decoder( - wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder(&dec), + wuffs_targa__decoder__upcast_as__wuffs_base__image_decoder(&dec), n_bytes_out, dst, pixfmt, quirks_ptr, quirks_len, src); } const char* // -test_wuffs_tga_decode_interface() { +test_wuffs_targa_decode_interface() { CHECK_FOCUS(__func__); - wuffs_tga__decoder dec; + wuffs_targa__decoder dec; CHECK_STATUS("initialize", - wuffs_tga__decoder__initialize( + wuffs_targa__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( - wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder(&dec), + wuffs_targa__decoder__upcast_as__wuffs_base__image_decoder(&dec), "test/data/bricks-color.tga", 0, SIZE_MAX, 160, 120, 0xFF022460); } const char* // -test_wuffs_tga_decode_truncated_input() { +test_wuffs_targa_decode_truncated_input() { CHECK_FOCUS(__func__); wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false); - wuffs_tga__decoder dec; + wuffs_targa__decoder dec; CHECK_STATUS("initialize", - wuffs_tga__decoder__initialize( + wuffs_targa__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); wuffs_base__status status = - wuffs_tga__decoder__decode_image_config(&dec, NULL, &src); + wuffs_targa__decoder__decode_image_config(&dec, NULL, &src); if (status.repr != wuffs_base__suspension__short_read) { RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr, wuffs_base__suspension__short_read); } src.meta.closed = true; - status = wuffs_tga__decoder__decode_image_config(&dec, NULL, &src); - if (status.repr != wuffs_tga__error__truncated_input) { + status = wuffs_targa__decoder__decode_image_config(&dec, NULL, &src); + if (status.repr != wuffs_targa__error__truncated_input) { RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr, - wuffs_tga__error__truncated_input); + wuffs_targa__error__truncated_input); } return NULL; } @@ -131,23 +131,25 @@ test_wuffs_tga_decode_truncated_input() { #endif // WUFFS_MIMIC -// ---------------- TGA Benches +// ---------------- TARGA Benches const char* // -bench_wuffs_tga_decode_19k_8bpp() { +bench_wuffs_targa_decode_19k_8bpp() { CHECK_FOCUS(__func__); return do_bench_image_decode( - &wuffs_tga_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + &wuffs_targa_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL), NULL, 0, "test/data/bricks-nodither.tga", 0, SIZE_MAX, 1000); } const char* // -bench_wuffs_tga_decode_77k_24bpp() { +bench_wuffs_targa_decode_77k_24bpp() { CHECK_FOCUS(__func__); return do_bench_image_decode( - &wuffs_tga_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + &wuffs_targa_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), NULL, 0, "test/data/bricks-color.tga", 0, SIZE_MAX, 200); } @@ -164,8 +166,8 @@ bench_wuffs_tga_decode_77k_24bpp() { proc g_tests[] = { - test_wuffs_tga_decode_interface, - test_wuffs_tga_decode_truncated_input, + test_wuffs_targa_decode_interface, + test_wuffs_targa_decode_truncated_input, #ifdef WUFFS_MIMIC @@ -178,8 +180,8 @@ proc g_tests[] = { proc g_benches[] = { - bench_wuffs_tga_decode_19k_8bpp, - bench_wuffs_tga_decode_77k_24bpp, + bench_wuffs_targa_decode_19k_8bpp, + bench_wuffs_targa_decode_77k_24bpp, #ifdef WUFFS_MIMIC @@ -192,6 +194,6 @@ proc g_benches[] = { int // main(int argc, char** argv) { - g_proc_package_name = "std/tga"; + g_proc_package_name = "std/targa"; return test_main(argc, argv, g_tests, g_benches); }