Make std/gif's LZW decoder private

This commit is contained in:
Nigel Tao committed 2017-12-08 16:18:35 +11:00
1 parent 44f5b2d384
commit 2e12a41414
4 files changed
+40 -109

No files matched your search

+17 -45
View File
@@ -48,38 +48,11 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
// ---------------- Basic Tests
void test_basic_bad_argument_out_of_range() {
CHECK_FOCUS(__func__);
wuffs_gif__lzw_decoder dec;
wuffs_gif__lzw_decoder__initialize(&dec, WUFFS_VERSION, 0);
// Setting to 8 is in the [2..8] range.
wuffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != WUFFS_GIF__STATUS_OK) {
FAIL("status: got %d, want %d", dec.private_impl.status,
WUFFS_GIF__STATUS_OK);
}
// Setting to 999 is out of range.
wuffs_gif__lzw_decoder__set_literal_width(&dec, 999);
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
WUFFS_GIF__ERROR_BAD_ARGUMENT);
}
// That error status code should be sticky.
wuffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
WUFFS_GIF__ERROR_BAD_ARGUMENT);
}
}
void test_basic_bad_receiver() {
CHECK_FOCUS(__func__);
wuffs_base__writer1 dst = {0};
wuffs_base__reader1 src = {0};
wuffs_gif__status status = wuffs_gif__lzw_decoder__decode(NULL, dst, src);
wuffs_gif__status status = wuffs_gif__decoder__decode(NULL, dst, src);
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
FAIL("status: got %d, want %d", status, WUFFS_GIF__ERROR_BAD_RECEIVER);
}
@@ -87,10 +60,10 @@ void test_basic_bad_receiver() {
void test_basic_initializer_not_called() {
CHECK_FOCUS(__func__);
wuffs_gif__lzw_decoder dec = {{0}};
wuffs_gif__decoder dec = {{0}};
wuffs_base__writer1 dst = {0};
wuffs_base__reader1 src = {0};
wuffs_gif__status status = wuffs_gif__lzw_decoder__decode(&dec, dst, src);
wuffs_gif__status status = wuffs_gif__decoder__decode(&dec, dst, src);
if (status != WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED) {
FAIL("status: got %d, want %d", status,
WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED);
@@ -99,8 +72,8 @@ void test_basic_initializer_not_called() {
void test_basic_wuffs_version_bad() {
CHECK_FOCUS(__func__);
wuffs_gif__lzw_decoder dec;
wuffs_gif__lzw_decoder__initialize(&dec, 0, 0); // 0 is not WUFFS_VERSION.
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, 0, 0); // 0 is not WUFFS_VERSION.
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_WUFFS_VERSION) {
FAIL("status: got %d, want %d", dec.private_impl.status,
WUFFS_GIF__ERROR_BAD_WUFFS_VERSION);
@@ -110,15 +83,15 @@ void test_basic_wuffs_version_bad() {
void test_basic_wuffs_version_good() {
CHECK_FOCUS(__func__);
wuffs_gif__lzw_decoder dec;
wuffs_gif__lzw_decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
if (dec.private_impl.magic != WUFFS_BASE__MAGIC) {
FAIL("magic: got %u, want %u", dec.private_impl.magic, WUFFS_BASE__MAGIC);
return;
}
if (dec.private_impl.f_literal_width != 8) {
FAIL("f_literal_width: got %u, want %u", dec.private_impl.f_literal_width,
8);
if (dec.private_impl.f_lzw.private_impl.f_literal_width != 8) {
FAIL("f_literal_width: got %u, want %u",
dec.private_impl.f_lzw.private_impl.f_literal_width, 8);
return;
}
}
@@ -719,14 +692,13 @@ proc tests[] = {
// These basic tests are really testing the Wuffs compiler. They aren't
// specific to the std/gif code, but putting them here is as good as any
// other place.
test_basic_bad_argument_out_of_range, //
test_basic_bad_receiver, //
test_basic_initializer_not_called, //
test_basic_wuffs_version_bad, //
test_basic_wuffs_version_good, //
test_basic_status_is_error, //
test_basic_status_strings, //
test_basic_sub_struct_initializer, //
test_basic_bad_receiver, //
test_basic_initializer_not_called, //
test_basic_wuffs_version_bad, //
test_basic_wuffs_version_good, //
test_basic_status_is_error, //
test_basic_status_strings, //
test_basic_sub_struct_initializer, //
test_wuffs_lzw_decode_many_big_reads, //
test_wuffs_lzw_decode_many_small_writes_reads, //