mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Rename decode_config to decode_image_config
This commit is contained in:
1 parent
7e4b244208
commit
dcda30b96a
5 files changed
+53
-50
No files matched your search
@@ -281,7 +281,7 @@ const char* play() {
|
||||
if (first_play) {
|
||||
first_play = false;
|
||||
wuffs_base__status s =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
return wuffs_gif__status__string(s);
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
s = wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
s = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
ret = wuffs_gif__status__string(s);
|
||||
goto exit;
|
||||
|
||||
@@ -2365,7 +2365,7 @@ typedef struct {
|
||||
uint32_t coro_susp_point;
|
||||
uint32_t v_num_loops;
|
||||
bool v_ffio;
|
||||
} c_decode_config[1];
|
||||
} c_decode_image_config[1];
|
||||
struct {
|
||||
uint32_t coro_susp_point;
|
||||
} c_decode_frame[1];
|
||||
@@ -2428,8 +2428,8 @@ typedef struct {
|
||||
#ifdef __cplusplus
|
||||
inline void check_wuffs_version(size_t sizeof_star_self,
|
||||
uint64_t wuffs_version);
|
||||
inline wuffs_base__status decode_config(wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
inline wuffs_base__status decode_image_config(wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
inline uint64_t frame_count();
|
||||
inline wuffs_base__range_ii_u64 work_buffer_size();
|
||||
inline wuffs_base__status decode_frame(wuffs_base__image_buffer* a_dst,
|
||||
@@ -2453,9 +2453,9 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_gif__decoder__decode_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint64_t //
|
||||
wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self);
|
||||
@@ -2481,9 +2481,9 @@ wuffs_gif__decoder::check_wuffs_version(size_t sizeof_star_self,
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
wuffs_gif__decoder::decode_config(wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
return wuffs_gif__decoder__decode_config(this, a_dst, a_src);
|
||||
wuffs_gif__decoder::decode_image_config(wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
return wuffs_gif__decoder__decode_image_config(this, a_dst, a_src);
|
||||
}
|
||||
|
||||
inline uint64_t //
|
||||
@@ -6507,12 +6507,12 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
// -------- func gif.decoder.decode_config
|
||||
// -------- func gif.decoder.decode_image_config
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_gif__decoder__decode_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
@@ -6529,10 +6529,10 @@ wuffs_gif__decoder__decode_config(wuffs_gif__decoder* self,
|
||||
bool v_ffio;
|
||||
|
||||
uint32_t coro_susp_point =
|
||||
self->private_impl.c_decode_config[0].coro_susp_point;
|
||||
self->private_impl.c_decode_image_config[0].coro_susp_point;
|
||||
if (coro_susp_point) {
|
||||
v_num_loops = self->private_impl.c_decode_config[0].v_num_loops;
|
||||
v_ffio = self->private_impl.c_decode_config[0].v_ffio;
|
||||
v_num_loops = self->private_impl.c_decode_image_config[0].v_num_loops;
|
||||
v_ffio = self->private_impl.c_decode_image_config[0].v_ffio;
|
||||
} else {
|
||||
v_ffio = false;
|
||||
}
|
||||
@@ -6578,15 +6578,15 @@ wuffs_gif__decoder__decode_config(wuffs_gif__decoder* self,
|
||||
|
||||
goto ok;
|
||||
ok:
|
||||
self->private_impl.c_decode_config[0].coro_susp_point = 0;
|
||||
self->private_impl.c_decode_image_config[0].coro_susp_point = 0;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
goto suspend;
|
||||
suspend:
|
||||
self->private_impl.c_decode_config[0].coro_susp_point = coro_susp_point;
|
||||
self->private_impl.c_decode_config[0].v_num_loops = v_num_loops;
|
||||
self->private_impl.c_decode_config[0].v_ffio = v_ffio;
|
||||
self->private_impl.c_decode_image_config[0].coro_susp_point = coro_susp_point;
|
||||
self->private_impl.c_decode_image_config[0].v_num_loops = v_num_loops;
|
||||
self->private_impl.c_decode_image_config[0].v_ffio = v_ffio;
|
||||
|
||||
goto exit;
|
||||
exit:
|
||||
@@ -6664,7 +6664,7 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
|
||||
|
||||
if (self->private_impl.f_call_sequence == 0) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
|
||||
status = wuffs_gif__decoder__decode_config(self, NULL, a_src);
|
||||
status = wuffs_gif__decoder__decode_image_config(self, NULL, a_src);
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ pub struct decoder?(
|
||||
// - 2: frame decoded.
|
||||
//
|
||||
// Call sequence state transitions:
|
||||
// - 0 -> 1: via decode_config.
|
||||
// - 0 -> 1: via decode_image_config.
|
||||
// - 1 -> 2: via decode_frame.
|
||||
// - 2 -> 2: via decode_frame.
|
||||
call_sequence base.u8,
|
||||
@@ -103,7 +103,7 @@ pub struct decoder?(
|
||||
lzw lzw.decoder,
|
||||
)
|
||||
|
||||
pub func decoder.decode_config?(dst nptr base.image_config, src base.io_reader)() {
|
||||
pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_reader)() {
|
||||
if this.call_sequence >= 1 {
|
||||
return error "invalid call sequence"
|
||||
}
|
||||
@@ -147,7 +147,7 @@ pub func decoder.work_buffer_size()(ret base.range_ii_u64) {
|
||||
|
||||
pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader, work_buffer slice base.u8)() {
|
||||
if this.call_sequence == 0 {
|
||||
this.decode_config?(dst:nullptr, src:in.src)
|
||||
this.decode_image_config?(dst:nullptr, src:in.src)
|
||||
}
|
||||
|
||||
if not this.end_of_data {
|
||||
|
||||
+27
-24
@@ -72,10 +72,12 @@ void test_basic_bad_receiver() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
|
||||
wuffs_base__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src);
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_image_config(NULL, &ic, src);
|
||||
if (status != WUFFS_BASE__ERROR_BAD_RECEIVER) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_BASE__ERROR_BAD_RECEIVER,
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
status, wuffs_gif__status__string(status),
|
||||
WUFFS_BASE__ERROR_BAD_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_RECEIVER));
|
||||
}
|
||||
}
|
||||
@@ -85,7 +87,7 @@ void test_basic_bad_sizeof_receiver() {
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION);
|
||||
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER,
|
||||
@@ -100,7 +102,7 @@ void test_basic_bad_wuffs_version() {
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION ^ 0x123456789ABC);
|
||||
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_WUFFS_VERSION) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_BASE__ERROR_BAD_WUFFS_VERSION,
|
||||
@@ -114,10 +116,11 @@ void test_basic_check_wuffs_version_not_called() {
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
|
||||
wuffs_base__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src);
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
|
||||
if (status != WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status),
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
status, wuffs_gif__status__string(status),
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED,
|
||||
wuffs_gif__status__string(
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED));
|
||||
@@ -218,7 +221,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
wuffs_base__status s =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
return wuffs_gif__status__string(s);
|
||||
}
|
||||
@@ -270,9 +273,9 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s)", status,
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status));
|
||||
return false;
|
||||
}
|
||||
@@ -427,18 +430,18 @@ void test_wuffs_gif_call_sequence() {
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, NULL, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_BASE__STATUS_OK,
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
status, wuffs_gif__status__string(status), WUFFS_BASE__STATUS_OK,
|
||||
wuffs_gif__status__string(WUFFS_BASE__STATUS_OK));
|
||||
return;
|
||||
}
|
||||
|
||||
status = wuffs_gif__decoder__decode_config(&dec, NULL, src_reader);
|
||||
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
|
||||
if (status != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status),
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
status, wuffs_gif__status__string(status),
|
||||
WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE));
|
||||
return;
|
||||
@@ -464,9 +467,9 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s)", status,
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status));
|
||||
return false;
|
||||
}
|
||||
@@ -574,9 +577,9 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
wuffs_base__status s =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
FAIL("decode_config: %s", wuffs_gif__status__string(s));
|
||||
FAIL("decode_image_config: %s", wuffs_gif__status__string(s));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -645,10 +648,10 @@ void test_wuffs_gif_decode_input_is_a_png() {
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (status != WUFFS_GIF__ERROR_BAD_HEADER) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_HEADER,
|
||||
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
status, wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_HEADER,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_HEADER));
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user