mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Remove the WUFFS_FOO__STATUS_ETC names
This commit is contained in:
1 parent
d770e879ab
commit
50a955317a
30 files changed
+214
-677
No files matched your search
@@ -374,11 +374,8 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
if recvTyp.QID()[1] == t.IDIOReader {
|
||||
switch method.Ident() {
|
||||
case t.IDUnreadU8:
|
||||
b.printf("if (ioptr_src == iobounds0orig_src) { status = %sERROR_INVALID_I_O_OPERATION;",
|
||||
g.PKGPREFIX)
|
||||
b.writes("goto exit;")
|
||||
b.writes("}\n")
|
||||
b.printf("ioptr_src--;\n")
|
||||
b.writes("if (ioptr_src == iobounds0orig_src) {" +
|
||||
"status = WUFFS_BASE__ERROR_INVALID_I_O_OPERATION; goto exit; } ioptr_src--;\n")
|
||||
return nil
|
||||
|
||||
case t.IDReadU8:
|
||||
@@ -462,10 +459,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
switch method.Ident() {
|
||||
case t.IDWriteU8:
|
||||
if !n.ProvenNotToSuspend() {
|
||||
b.printf("if (ioptr_dst == iobounds1_dst) { status = %sSUSPENSION_SHORT_WRITE;",
|
||||
g.PKGPREFIX)
|
||||
b.writes("goto suspend;")
|
||||
b.writes("}\n")
|
||||
b.writes("if (ioptr_dst == iobounds1_dst) { status = WUFFS_BASE__SUSPENSION_SHORT_WRITE; goto suspend; }\n")
|
||||
}
|
||||
|
||||
b.printf("*ioptr_dst++ = ")
|
||||
|
||||
@@ -96,7 +96,6 @@ func Do(args []string) error {
|
||||
|
||||
} else {
|
||||
g := &gen{
|
||||
PKGPREFIX: "WUFFS_" + strings.ToUpper(pkgName) + "__",
|
||||
pkgPrefix: "wuffs_" + pkgName + "__",
|
||||
pkgName: pkgName,
|
||||
tm: tm,
|
||||
@@ -246,7 +245,6 @@ func genStatusStringData(b *buffer, pkgPrefix string, ss *[256]string) error {
|
||||
}
|
||||
|
||||
type gen struct {
|
||||
PKGPREFIX string // e.g. "WUFFS_JPEG__"
|
||||
pkgPrefix string // e.g. "wuffs_jpeg__"
|
||||
pkgName string // e.g. "jpeg"
|
||||
|
||||
@@ -328,21 +326,6 @@ func (g *gen) genHeader(b *buffer) error {
|
||||
pkgID := g.checker.PackageID()
|
||||
b.printf("#define %spackageid %d // 0x%08X\n\n", g.pkgPrefix, pkgID, pkgID)
|
||||
|
||||
for _, z := range builtin.StatusList {
|
||||
name := z.Message
|
||||
if z.Keyword == t.IDError {
|
||||
name = "error " + name
|
||||
} else if z.Keyword == t.IDSuspension {
|
||||
name = "suspension " + name
|
||||
} else {
|
||||
name = "status " + name
|
||||
}
|
||||
code := int32(z.Value) << 24
|
||||
b.printf("#define %s %d // 0x%08X\n",
|
||||
strings.ToUpper(cName(name, g.PKGPREFIX)), code, uint32(code))
|
||||
}
|
||||
b.writes("\n")
|
||||
|
||||
for _, s := range g.statusList {
|
||||
code := (int32(s.value) << 24) | int32(pkgID)
|
||||
b.printf("#define %s %d // 0x%08X\n", s.name, code, uint32(code))
|
||||
@@ -624,7 +607,7 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error {
|
||||
func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
// For API/ABI compatibility, the very first field in the struct's
|
||||
// private_impl must be the status code. This lets the initializer callee
|
||||
// set "self->private_impl.status = WUFFS_ETC__ERROR_BAD_WUFFS_VERSION;"
|
||||
// set "self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;"
|
||||
// regardless of the sizeof(*self) struct reserved by the caller and even
|
||||
// if the caller and callee were built with different versions.
|
||||
structName := n.QID().Str(g.tm)
|
||||
@@ -773,22 +756,22 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
|
||||
if err := g.writeInitializerSignature(b, n, false); err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf("{\n")
|
||||
b.printf("if (!self) { return; }\n")
|
||||
b.writes("{\n")
|
||||
b.writes("if (!self) { return; }\n")
|
||||
|
||||
b.printf("if (sizeof(*self) != sizeof_star_self) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_SIZEOF_RECEIVER;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
b.printf("if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || " +
|
||||
b.writes("if (sizeof(*self) != sizeof_star_self) {\n")
|
||||
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;\n")
|
||||
b.writes("return;\n")
|
||||
b.writes("}\n")
|
||||
b.writes("if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || " +
|
||||
"(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_WUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
b.printf("if (self->private_impl.magic != 0) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;\n")
|
||||
b.writes("return;\n")
|
||||
b.writes("}\n")
|
||||
b.writes("if (self->private_impl.magic != 0) {\n")
|
||||
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;\n")
|
||||
b.writes("return;\n")
|
||||
b.writes("}\n")
|
||||
|
||||
b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n")
|
||||
|
||||
|
||||
@@ -127,16 +127,13 @@ const baseImplC = "" +
|
||||
""
|
||||
|
||||
type template_args_short_read struct {
|
||||
PKGPREFIX string
|
||||
name string
|
||||
name string
|
||||
}
|
||||
|
||||
func template_short_read(b *buffer, args template_args_short_read) error {
|
||||
b.printf("short_read_%s:\nif (wuffs_base__io_reader__is_eof(a_%s)) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
|
||||
b.printf("short_read_%s:\nif (wuffs_base__io_reader__is_eof(a_%s)) {\nstatus = WUFFS_BASE__ERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = WUFFS_BASE__SUSPENSION_SHORT_READ;\ngoto suspend;\n",
|
||||
args.name,
|
||||
args.name,
|
||||
args.PKGPREFIX,
|
||||
args.PKGPREFIX,
|
||||
)
|
||||
return nil
|
||||
}
|
||||
@@ -214,7 +214,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
if z.Message == "" {
|
||||
return fmt.Errorf("no status code for %q", msg)
|
||||
}
|
||||
status.name = strings.ToUpper(g.cName(z.String()))
|
||||
status.name = strings.ToUpper(cName(z.String(), "WUFFS_BASE__"))
|
||||
}
|
||||
b.writes(status.name)
|
||||
return nil
|
||||
|
||||
@@ -180,19 +180,19 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
|
||||
|
||||
b.writes("if (!self) {")
|
||||
if g.currFunk.suspendible {
|
||||
b.printf("return %sERROR_BAD_RECEIVER;", g.PKGPREFIX)
|
||||
b.writes("return WUFFS_BASE__ERROR_BAD_RECEIVER;")
|
||||
} else if len(outFields) == 0 {
|
||||
b.printf("return;")
|
||||
b.writes("return;")
|
||||
} else if len(outFields) == 1 {
|
||||
// TODO: don't assume that the return type is an integer.
|
||||
b.printf("return 0;")
|
||||
b.writes("return 0;")
|
||||
} else {
|
||||
return fmt.Errorf("TODO: handle structured return types")
|
||||
}
|
||||
b.writes("}")
|
||||
|
||||
b.printf("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {"+
|
||||
"self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }", g.PKGPREFIX)
|
||||
b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {" +
|
||||
"self->private_impl.status = WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }")
|
||||
|
||||
b.writes("if (self->private_impl.status < 0) {")
|
||||
if g.currFunk.suspendible {
|
||||
@@ -318,8 +318,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error {
|
||||
}
|
||||
shortReadsSeen[sr] = struct{}{}
|
||||
if err := template_short_read(b, template_args_short_read{
|
||||
PKGPREFIX: g.PKGPREFIX,
|
||||
name: sr,
|
||||
name: sr,
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -389,12 +388,12 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error {
|
||||
b.writes(") {")
|
||||
if g.currFunk.suspendible {
|
||||
if g.currFunk.public {
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT;\n", g.PKGPREFIX)
|
||||
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT;\n")
|
||||
}
|
||||
b.printf("return %sERROR_BAD_ARGUMENT;\n\n", g.PKGPREFIX)
|
||||
b.writes("return WUFFS_BASE__ERROR_BAD_ARGUMENT;\n\n")
|
||||
} else if !n.Receiver().IsZero() {
|
||||
// TODO: unused code path??
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT; return;", g.PKGPREFIX)
|
||||
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT; return;")
|
||||
} else {
|
||||
b.printf("return;")
|
||||
}
|
||||
|
||||
@@ -329,7 +329,7 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
|
||||
b.writes("status = ")
|
||||
retKeyword := t.IDStatus
|
||||
if retExpr == nil {
|
||||
b.printf("%s%s", g.PKGPREFIX, "STATUS_OK")
|
||||
b.writes("WUFFS_BASE__STATUS_OK")
|
||||
} else {
|
||||
retKeyword = retExpr.Operator()
|
||||
// TODO: check that retExpr has no call-suspendibles.
|
||||
@@ -352,8 +352,8 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
|
||||
b.writes("goto ok;")
|
||||
default:
|
||||
g.currFunk.hasGotoOK = true
|
||||
b.printf("if (status == 0) { goto ok; } else if (status > 0) { "+
|
||||
"status = %sERROR_CANNOT_RETURN_A_SUSPENSION; } goto exit;", g.PKGPREFIX)
|
||||
b.writes("if (status == 0) { goto ok; } else if (status > 0) { " +
|
||||
"status = WUFFS_BASE__ERROR_CANNOT_RETURN_A_SUSPENSION; } goto exit;")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
// This file has a .h extension, not a .c extension, so that Go tools such as
|
||||
// "go generate" don't try to build it as part of the Go package, via cgo.
|
||||
|
||||
template short_read(string qPKGPREFIXq, string qnameq) {
|
||||
template short_read(string qnameq) {
|
||||
short_read_qnameq:
|
||||
if (wuffs_base__io_reader__is_eof(a_qnameq)) {
|
||||
status = qPKGPREFIXqERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = qPKGPREFIXqSUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
@@ -263,7 +263,7 @@ const char* play() {
|
||||
while (1) {
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (s) {
|
||||
if (s == WUFFS_GIF__SUSPENSION_END_OF_DATA) {
|
||||
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
break;
|
||||
}
|
||||
return wuffs_gif__status__string(s);
|
||||
|
||||
+3
-3
@@ -90,13 +90,13 @@ static const char* decode() {
|
||||
ignore_return_value(write(stdout_fd, dst_buffer, dst.wi));
|
||||
}
|
||||
|
||||
if (s == WUFFS_GZIP__STATUS_OK) {
|
||||
if (s == WUFFS_BASE__STATUS_OK) {
|
||||
return NULL;
|
||||
}
|
||||
if (s == WUFFS_GZIP__SUSPENSION_SHORT_READ) {
|
||||
if (s == WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
break;
|
||||
}
|
||||
if (s != WUFFS_GZIP__SUSPENSION_SHORT_WRITE) {
|
||||
if (s != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
return wuffs_gzip__status__string(s);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,8 +82,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
while (true) {
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (s) {
|
||||
if ((s == WUFFS_GIF__SUSPENSION_END_OF_DATA) && seen_ok) {
|
||||
s = WUFFS_GIF__STATUS_OK;
|
||||
if ((s == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) {
|
||||
s = WUFFS_BASE__STATUS_OK;
|
||||
}
|
||||
ret = wuffs_gif__status__string(s);
|
||||
goto exit;
|
||||
|
||||
@@ -60,7 +60,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
while (true) {
|
||||
dst.wi = 0;
|
||||
s = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s != WUFFS_ZLIB__SUSPENSION_SHORT_WRITE) {
|
||||
if (s != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
ret = wuffs_zlib__status__string(s);
|
||||
break;
|
||||
}
|
||||
|
||||
+4
-23
@@ -1271,25 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_adler32__packageid 681002 // 0x000A642A
|
||||
|
||||
#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_adler32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -1956,17 +1937,17 @@ void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -1983,7 +1964,7 @@ uint32_t wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return 0;
|
||||
|
||||
+4
-22
@@ -1271,24 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_crc32__packageid 810620 // 0x000C5E7C
|
||||
|
||||
#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_crc32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -2319,17 +2301,17 @@ void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2346,7 +2328,7 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return 0;
|
||||
|
||||
+23
-42
@@ -1271,25 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
@@ -2174,17 +2155,17 @@ void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2198,11 +2179,11 @@ wuffs_base__status wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self,
|
||||
wuffs_base__io_writer a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_DEFLATE__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
@@ -2263,7 +2244,7 @@ wuffs_base__status wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self,
|
||||
if (status == 0) {
|
||||
goto ok;
|
||||
} else if (status > 0) {
|
||||
status = WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION;
|
||||
status = WUFFS_BASE__ERROR_CANNOT_RETURN_A_SUSPENSION;
|
||||
}
|
||||
goto exit;
|
||||
}
|
||||
@@ -2478,10 +2459,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2586,15 +2567,15 @@ static wuffs_base__status wuffs_deflate__decoder__decode_uncompressed(
|
||||
v_n_copied = wuffs_base__io_writer__copy_from_reader32(
|
||||
&ioptr_dst, iobounds1_dst, &ioptr_src, iobounds1_src, v_length);
|
||||
if (v_length <= v_n_copied) {
|
||||
status = WUFFS_DEFLATE__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
}
|
||||
v_length -= v_n_copied;
|
||||
if (((uint64_t)(iobounds1_dst - ioptr_dst)) == 0) {
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
|
||||
} else {
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
|
||||
}
|
||||
}
|
||||
@@ -2624,10 +2605,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2949,10 +2930,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -3567,7 +3548,7 @@ label_0_break:;
|
||||
while (v_n_bits >= 8) {
|
||||
v_n_bits -= 8;
|
||||
if (ioptr_src == iobounds0orig_src) {
|
||||
status = WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION;
|
||||
status = WUFFS_BASE__ERROR_INVALID_I_O_OPERATION;
|
||||
goto exit;
|
||||
}
|
||||
ioptr_src--;
|
||||
@@ -3704,7 +3685,7 @@ static wuffs_base__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
if ((v_table_entry >> 31) != 0) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
|
||||
if (ioptr_dst == iobounds1_dst) {
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
goto suspend;
|
||||
}
|
||||
*ioptr_dst++ = ((uint8_t)(((v_table_entry >> 8) & 255)));
|
||||
@@ -3745,7 +3726,7 @@ static wuffs_base__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
if ((v_table_entry >> 31) != 0) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
|
||||
if (ioptr_dst == iobounds1_dst) {
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
goto suspend;
|
||||
}
|
||||
*ioptr_dst++ = ((uint8_t)(((v_table_entry >> 8) & 255)));
|
||||
@@ -3921,7 +3902,7 @@ static wuffs_base__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
goto label_5_break;
|
||||
}
|
||||
}
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
|
||||
}
|
||||
label_5_break:;
|
||||
@@ -3940,7 +3921,7 @@ static wuffs_base__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
}
|
||||
v_hlen -= v_n_copied;
|
||||
v_hdist += v_n_copied;
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
|
||||
}
|
||||
label_6_break:;
|
||||
@@ -3957,7 +3938,7 @@ static wuffs_base__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
goto label_7_break;
|
||||
}
|
||||
v_length -= v_n_copied;
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11);
|
||||
}
|
||||
label_7_break:;
|
||||
@@ -4008,9 +3989,9 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_DEFLATE__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
+44
-77
@@ -1280,24 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_lzw__packageid 1316776 // 0x001417A8
|
||||
|
||||
#define WUFFS_LZW__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_LZW__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_LZW__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_LZW__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_LZW__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_LZW__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_LZW__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_LZW__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_LZW__ERROR_BAD_CODE -15460440 // 0xFF1417A8
|
||||
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -32237656 // 0xFE1417A8
|
||||
|
||||
@@ -1378,24 +1360,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_gif__packageid 1017222 // 0x000F8586
|
||||
|
||||
#define WUFFS_GIF__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_GIF__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_GIF__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_GIF__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_GIF__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_GIF__ERROR_BAD_BLOCK -15759994 // 0xFF0F8586
|
||||
#define WUFFS_GIF__ERROR_BAD_EXTENSION_LABEL -32537210 // 0xFE0F8586
|
||||
#define WUFFS_GIF__ERROR_BAD_GRAPHIC_CONTROL -49314426 // 0xFD0F8586
|
||||
@@ -2244,17 +2208,17 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2272,17 +2236,18 @@ wuffs_base__status wuffs_gif__decoder__decode_config(
|
||||
wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_GIF__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
self->private_impl.status =
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
}
|
||||
if (!a_dst) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_ARGUMENT;
|
||||
return WUFFS_GIF__ERROR_BAD_ARGUMENT;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT;
|
||||
return WUFFS_BASE__ERROR_BAD_ARGUMENT;
|
||||
}
|
||||
wuffs_base__status status = WUFFS_BASE__STATUS_OK;
|
||||
|
||||
@@ -2298,7 +2263,7 @@ wuffs_base__status wuffs_gif__decoder__decode_config(
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
|
||||
|
||||
if (self->private_impl.f_call_sequence >= 1) {
|
||||
status = WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE;
|
||||
status = WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE;
|
||||
goto exit;
|
||||
}
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
|
||||
@@ -2349,17 +2314,18 @@ wuffs_base__status wuffs_gif__decoder__decode_frame(
|
||||
wuffs_base__image_buffer* a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_GIF__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
self->private_impl.status =
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
}
|
||||
if (!a_dst) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_ARGUMENT;
|
||||
return WUFFS_GIF__ERROR_BAD_ARGUMENT;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT;
|
||||
return WUFFS_BASE__ERROR_BAD_ARGUMENT;
|
||||
}
|
||||
wuffs_base__status status = WUFFS_BASE__STATUS_OK;
|
||||
|
||||
@@ -2372,7 +2338,7 @@ wuffs_base__status wuffs_gif__decoder__decode_frame(
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
|
||||
|
||||
if (self->private_impl.f_call_sequence == 0) {
|
||||
status = WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE;
|
||||
status = WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE;
|
||||
goto exit;
|
||||
}
|
||||
if (!self->private_impl.f_end_of_data) {
|
||||
@@ -2388,7 +2354,7 @@ wuffs_base__status wuffs_gif__decoder__decode_frame(
|
||||
}
|
||||
if (self->private_impl.f_end_of_data) {
|
||||
while (true) {
|
||||
status = WUFFS_GIF__SUSPENSION_END_OF_DATA;
|
||||
status = WUFFS_BASE__SUSPENSION_END_OF_DATA;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
|
||||
}
|
||||
}
|
||||
@@ -2420,10 +2386,11 @@ wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1(
|
||||
wuffs_gif__decoder* self,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_GIF__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
self->private_impl.status =
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
@@ -2524,10 +2491,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2608,10 +2575,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2753,10 +2720,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2814,7 +2781,7 @@ static wuffs_base__status wuffs_gif__decoder__decode_extension(
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
status = WUFFS_GIF__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
} else if (v_label == 255) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
|
||||
@@ -2828,7 +2795,7 @@ static wuffs_base__status wuffs_gif__decoder__decode_extension(
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
status = WUFFS_GIF__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
}
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
|
||||
@@ -2864,10 +2831,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -2915,7 +2882,7 @@ static wuffs_base__status wuffs_gif__decoder__skip_blocks(
|
||||
v_block_size = t_0;
|
||||
}
|
||||
if (v_block_size == 0) {
|
||||
status = WUFFS_GIF__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
}
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
|
||||
@@ -2952,10 +2919,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -3011,7 +2978,7 @@ static wuffs_base__status wuffs_gif__decoder__decode_ae(
|
||||
v_block_size = t_0;
|
||||
}
|
||||
if (v_block_size == 0) {
|
||||
status = WUFFS_GIF__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
}
|
||||
if (v_block_size != 11) {
|
||||
@@ -3165,10 +3132,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -3303,10 +3270,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -3501,10 +3468,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
@@ -3740,19 +3707,19 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part1(
|
||||
iobounds1_w = o_0_iobounds1_v_w;
|
||||
a_src = o_0_a_src;
|
||||
}
|
||||
if ((v_z == 0) || (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
|
||||
if ((v_z == 0) || (v_z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
|
||||
status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst);
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
if (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE) {
|
||||
if (v_z == WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
goto label_1_continue;
|
||||
}
|
||||
self->private_impl.f_previous_lzw_decode_ended_abruptly = false;
|
||||
goto label_1_break;
|
||||
}
|
||||
if ((v_block_size == 0) && (v_z == WUFFS_GIF__SUSPENSION_SHORT_READ)) {
|
||||
if ((v_block_size == 0) && (v_z == WUFFS_BASE__SUSPENSION_SHORT_READ)) {
|
||||
goto label_1_break;
|
||||
}
|
||||
status = v_z;
|
||||
@@ -3819,10 +3786,10 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GIF__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
|
||||
|
||||
+8
-63
@@ -1280,24 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_crc32__packageid 810620 // 0x000C5E7C
|
||||
|
||||
#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_crc32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -1363,25 +1345,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
@@ -1526,24 +1489,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_gzip__packageid 1041911 // 0x000FE5F7
|
||||
|
||||
#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_GZIP__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_GZIP__ERROR_BAD_CHECKSUM -15735305 // 0xFF0FE5F7
|
||||
#define WUFFS_GZIP__ERROR_BAD_COMPRESSION_METHOD -32512521 // 0xFE0FE5F7
|
||||
#define WUFFS_GZIP__ERROR_BAD_ENCODING_FLAGS -49289737 // 0xFD0FE5F7
|
||||
@@ -2243,17 +2188,17 @@ void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2276,7 +2221,7 @@ void wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self,
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return;
|
||||
@@ -2291,11 +2236,11 @@ wuffs_base__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
|
||||
wuffs_base__io_writer a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_GZIP__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
@@ -2631,9 +2576,9 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_GZIP__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_GZIP__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
+14
-30
@@ -1271,24 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_lzw__packageid 1316776 // 0x001417A8
|
||||
|
||||
#define WUFFS_LZW__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_LZW__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_LZW__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_LZW__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_LZW__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_LZW__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_LZW__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_LZW__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_LZW__ERROR_BAD_CODE -15460440 // 0xFF1417A8
|
||||
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -32237656 // 0xFE1417A8
|
||||
|
||||
@@ -1982,17 +1964,17 @@ void wuffs_lzw__decoder__check_wuffs_version(wuffs_lzw__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_LZW__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_LZW__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2008,13 +1990,14 @@ void wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status = WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
self->private_impl.status =
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return;
|
||||
}
|
||||
if (a_lw < 2 || a_lw > 8) {
|
||||
self->private_impl.status = WUFFS_LZW__ERROR_BAD_ARGUMENT;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2027,10 +2010,11 @@ wuffs_base__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
|
||||
wuffs_base__io_writer a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_LZW__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status = WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
self->private_impl.status =
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
@@ -2136,7 +2120,7 @@ wuffs_base__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
|
||||
if (v_code < v_clear_code) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
|
||||
if (ioptr_dst == iobounds1_dst) {
|
||||
status = WUFFS_LZW__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
goto suspend;
|
||||
}
|
||||
*ioptr_dst++ = ((uint8_t)(v_code));
|
||||
@@ -2151,7 +2135,7 @@ wuffs_base__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
|
||||
v_width = (v_literal_width + 1);
|
||||
goto label_0_continue;
|
||||
} else if (v_code == v_end_code) {
|
||||
status = WUFFS_LZW__STATUS_OK;
|
||||
status = WUFFS_BASE__STATUS_OK;
|
||||
goto ok;
|
||||
} else if (v_code <= v_save_code) {
|
||||
v_s = 4095;
|
||||
@@ -2184,7 +2168,7 @@ wuffs_base__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
|
||||
goto label_1_break;
|
||||
}
|
||||
v_s = ((v_s + ((uint32_t)((v_n_copied & 4095)))) & 4095);
|
||||
status = WUFFS_LZW__SUSPENSION_SHORT_WRITE;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_WRITE;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
|
||||
}
|
||||
label_1_break:;
|
||||
@@ -2242,9 +2226,9 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_LZW__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_LZW__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
+8
-64
@@ -1280,25 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_adler32__packageid 681002 // 0x000A642A
|
||||
|
||||
#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_adler32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -1364,25 +1345,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
@@ -1527,24 +1489,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_zlib__packageid 2064249 // 0x001F7F79
|
||||
|
||||
#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_ZLIB__ERROR_BAD_CHECKSUM -14712967 // 0xFF1F7F79
|
||||
#define WUFFS_ZLIB__ERROR_BAD_COMPRESSION_METHOD -31490183 // 0xFE1F7F79
|
||||
#define WUFFS_ZLIB__ERROR_BAD_COMPRESSION_WINDOW_SIZE -48267399 // 0xFD1F7F79
|
||||
@@ -2247,17 +2191,17 @@ void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
|
||||
return;
|
||||
}
|
||||
if (sizeof(*self) != sizeof_star_self) {
|
||||
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;
|
||||
return;
|
||||
}
|
||||
if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
|
||||
(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
|
||||
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION;
|
||||
self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (self->private_impl.magic != 0) {
|
||||
self->private_impl.status =
|
||||
WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
|
||||
return;
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -2280,7 +2224,7 @@ void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self,
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return;
|
||||
@@ -2295,11 +2239,11 @@ wuffs_base__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
|
||||
wuffs_base__io_writer a_dst,
|
||||
wuffs_base__io_reader a_src) {
|
||||
if (!self) {
|
||||
return WUFFS_ZLIB__ERROR_BAD_RECEIVER;
|
||||
return WUFFS_BASE__ERROR_BAD_RECEIVER;
|
||||
}
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
self->private_impl.status =
|
||||
WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED;
|
||||
}
|
||||
if (self->private_impl.status < 0) {
|
||||
return self->private_impl.status;
|
||||
@@ -2497,9 +2441,9 @@ exit:
|
||||
|
||||
short_read_src:
|
||||
if (wuffs_base__io_reader__is_eof(a_src)) {
|
||||
status = WUFFS_ZLIB__ERROR_UNEXPECTED_EOF;
|
||||
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
status = WUFFS_ZLIB__SUSPENSION_SHORT_READ;
|
||||
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
goto suspend;
|
||||
}
|
||||
@@ -1271,25 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_adler32__packageid 681002 // 0x000A642A
|
||||
|
||||
#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_adler32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
|
||||
@@ -1271,24 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_crc32__packageid 810620 // 0x000C5E7C
|
||||
|
||||
#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_crc32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
|
||||
@@ -1271,25 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
|
||||
@@ -1280,24 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_lzw__packageid 1316776 // 0x001417A8
|
||||
|
||||
#define WUFFS_LZW__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_LZW__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_LZW__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_LZW__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_LZW__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_LZW__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_LZW__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_LZW__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_LZW__ERROR_BAD_CODE -15460440 // 0xFF1417A8
|
||||
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -32237656 // 0xFE1417A8
|
||||
|
||||
@@ -1378,24 +1360,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_gif__packageid 1017222 // 0x000F8586
|
||||
|
||||
#define WUFFS_GIF__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_GIF__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_GIF__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_GIF__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_GIF__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_GIF__ERROR_BAD_BLOCK -15759994 // 0xFF0F8586
|
||||
#define WUFFS_GIF__ERROR_BAD_EXTENSION_LABEL -32537210 // 0xFE0F8586
|
||||
#define WUFFS_GIF__ERROR_BAD_GRAPHIC_CONTROL -49314426 // 0xFD0F8586
|
||||
|
||||
@@ -1280,24 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_crc32__packageid 810620 // 0x000C5E7C
|
||||
|
||||
#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_crc32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -1363,25 +1345,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
@@ -1526,24 +1489,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_gzip__packageid 1041911 // 0x000FE5F7
|
||||
|
||||
#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_GZIP__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_GZIP__ERROR_BAD_CHECKSUM -15735305 // 0xFF0FE5F7
|
||||
#define WUFFS_GZIP__ERROR_BAD_COMPRESSION_METHOD -32512521 // 0xFE0FE5F7
|
||||
#define WUFFS_GZIP__ERROR_BAD_ENCODING_FLAGS -49289737 // 0xFD0FE5F7
|
||||
|
||||
@@ -1271,24 +1271,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_lzw__packageid 1316776 // 0x001417A8
|
||||
|
||||
#define WUFFS_LZW__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_LZW__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_LZW__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_LZW__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_LZW__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_LZW__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_LZW__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_LZW__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_LZW__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_LZW__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_LZW__ERROR_BAD_CODE -15460440 // 0xFF1417A8
|
||||
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -32237656 // 0xFE1417A8
|
||||
|
||||
|
||||
@@ -1280,25 +1280,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_adler32__packageid 681002 // 0x000A642A
|
||||
|
||||
#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
const char* wuffs_adler32__status__string(wuffs_base__status s);
|
||||
|
||||
// ---------------- Public Consts
|
||||
@@ -1364,25 +1345,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_deflate__packageid 848533 // 0x000CF295
|
||||
|
||||
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
|
||||
-536870912 // 0xE0000000
|
||||
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
|
||||
-15928683 // 0xFF0CF295
|
||||
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
|
||||
@@ -1527,24 +1489,6 @@ extern "C" {
|
||||
|
||||
#define wuffs_zlib__packageid 2064249 // 0x001F7F79
|
||||
|
||||
#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -16777216 // 0xFF000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER -33554432 // 0xFE000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -50331648 // 0xFD000000
|
||||
#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -67108864 // 0xFC000000
|
||||
#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \
|
||||
-268435456 // 0xF0000000
|
||||
#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \
|
||||
-285212672 // 0xEF000000
|
||||
#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -805306368 // 0xD0000000
|
||||
#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -1073741824 // 0xC0000000
|
||||
#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -822083584 // 0xCF000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 33554432 // 0x02000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 50331648 // 0x03000000
|
||||
#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -536870912 // 0xE0000000
|
||||
#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
|
||||
#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
|
||||
|
||||
#define WUFFS_ZLIB__ERROR_BAD_CHECKSUM -14712967 // 0xFF1F7F79
|
||||
#define WUFFS_ZLIB__ERROR_BAD_COMPRESSION_METHOD -31490183 // 0xFE1F7F79
|
||||
#define WUFFS_ZLIB__ERROR_BAD_COMPRESSION_WINDOW_SIZE -48267399 // 0xFD1F7F79
|
||||
|
||||
+12
-13
@@ -127,11 +127,11 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__status s =
|
||||
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
|
||||
if (s == WUFFS_DEFLATE__STATUS_OK) {
|
||||
if (s == WUFFS_BASE__STATUS_OK) {
|
||||
return NULL;
|
||||
}
|
||||
if ((wlimit && (s == WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_DEFLATE__SUSPENSION_SHORT_READ))) {
|
||||
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
|
||||
continue;
|
||||
}
|
||||
return wuffs_deflate__status__string(s);
|
||||
@@ -236,18 +236,17 @@ void test_wuffs_deflate_decode_split_src() {
|
||||
wuffs_base__status s1 =
|
||||
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
|
||||
if (s0 != WUFFS_DEFLATE__SUSPENSION_SHORT_READ) {
|
||||
if (s0 != WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
FAIL("i=%d: s0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s0,
|
||||
wuffs_deflate__status__string(s0),
|
||||
WUFFS_DEFLATE__SUSPENSION_SHORT_READ,
|
||||
wuffs_deflate__status__string(WUFFS_DEFLATE__SUSPENSION_SHORT_READ));
|
||||
wuffs_deflate__status__string(s0), WUFFS_BASE__SUSPENSION_SHORT_READ,
|
||||
wuffs_deflate__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
|
||||
return;
|
||||
}
|
||||
|
||||
if (s1 != WUFFS_DEFLATE__STATUS_OK) {
|
||||
if (s1 != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("i=%d: s1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s1,
|
||||
wuffs_deflate__status__string(s1), WUFFS_DEFLATE__STATUS_OK,
|
||||
wuffs_deflate__status__string(WUFFS_DEFLATE__STATUS_OK));
|
||||
wuffs_deflate__status__string(s1), WUFFS_BASE__STATUS_OK,
|
||||
wuffs_deflate__status__string(WUFFS_BASE__STATUS_OK));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -318,8 +317,8 @@ void test_wuffs_deflate_history_full() {
|
||||
|
||||
if (!do_test_wuffs_deflate_history(
|
||||
i, gt, &src, &got, &dec, 0, want.wi + i,
|
||||
i >= 0 ? WUFFS_DEFLATE__STATUS_OK
|
||||
: WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE)) {
|
||||
i >= 0 ? WUFFS_BASE__STATUS_OK
|
||||
: WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -385,7 +384,7 @@ void test_wuffs_deflate_history_partial() {
|
||||
|
||||
if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec,
|
||||
starting_history_index, fragment_length,
|
||||
WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE)) {
|
||||
WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+37
-35
@@ -55,10 +55,10 @@ void test_basic_bad_receiver() {
|
||||
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);
|
||||
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
|
||||
if (status != WUFFS_BASE__ERROR_BAD_RECEIVER) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_RECEIVER));
|
||||
wuffs_gif__status__string(status), WUFFS_BASE__ERROR_BAD_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_RECEIVER));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,12 +66,12 @@ void test_basic_bad_sizeof_receiver() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION);
|
||||
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER) {
|
||||
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER));
|
||||
WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -81,12 +81,12 @@ void test_basic_bad_wuffs_version() {
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION ^ 0x123456789ABC);
|
||||
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_WUFFS_VERSION) {
|
||||
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_WUFFS_VERSION) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_GIF__ERROR_BAD_WUFFS_VERSION,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION));
|
||||
WUFFS_BASE__ERROR_BAD_WUFFS_VERSION,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -97,26 +97,26 @@ void test_basic_check_wuffs_version_not_called() {
|
||||
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);
|
||||
if (status != WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) {
|
||||
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),
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED,
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED,
|
||||
wuffs_gif__status__string(
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED));
|
||||
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED));
|
||||
}
|
||||
}
|
||||
|
||||
void test_basic_status_is_error() {
|
||||
CHECK_FOCUS(__func__);
|
||||
if (wuffs_base__status__is_error(WUFFS_GIF__STATUS_OK)) {
|
||||
if (wuffs_base__status__is_error(WUFFS_BASE__STATUS_OK)) {
|
||||
FAIL("is_error(OK) returned true");
|
||||
return;
|
||||
}
|
||||
if (!wuffs_base__status__is_error(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION)) {
|
||||
if (!wuffs_base__status__is_error(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION)) {
|
||||
FAIL("is_error(BAD_WUFFS_VERSION) returned false");
|
||||
return;
|
||||
}
|
||||
if (wuffs_base__status__is_error(WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
|
||||
if (wuffs_base__status__is_error(WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
|
||||
FAIL("is_error(SHORT_WRITE) returned true");
|
||||
return;
|
||||
}
|
||||
@@ -128,20 +128,21 @@ void test_basic_status_is_error() {
|
||||
|
||||
void test_basic_status_strings() {
|
||||
CHECK_FOCUS(__func__);
|
||||
const char* s0 = wuffs_gif__status__string(WUFFS_GIF__STATUS_OK);
|
||||
const char* s0 = wuffs_gif__status__string(WUFFS_BASE__STATUS_OK);
|
||||
const char* t0 = "ok";
|
||||
if (strcmp(s0, t0)) {
|
||||
FAIL("got \"%s\", want \"%s\"", s0, t0);
|
||||
return;
|
||||
}
|
||||
const char* s1 =
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION);
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION);
|
||||
const char* t1 = "bad wuffs version";
|
||||
if (strcmp(s1, t1)) {
|
||||
FAIL("got \"%s\", want \"%s\"", s1, t1);
|
||||
return;
|
||||
}
|
||||
const char* s2 = wuffs_gif__status__string(WUFFS_GIF__SUSPENSION_SHORT_WRITE);
|
||||
const char* s2 =
|
||||
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_WRITE);
|
||||
const char* t2 = "short write";
|
||||
if (strcmp(s2, t2)) {
|
||||
FAIL("got \"%s\", want \"%s\"", s2, t2);
|
||||
@@ -212,7 +213,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
|
||||
}));
|
||||
while (true) {
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (s == WUFFS_GIF__SUSPENSION_END_OF_DATA) {
|
||||
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
break;
|
||||
}
|
||||
if (s) {
|
||||
@@ -248,7 +249,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
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);
|
||||
if (status != WUFFS_GIF__STATUS_OK) {
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status));
|
||||
return false;
|
||||
@@ -298,7 +299,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
|
||||
if (status == WUFFS_GIF__STATUS_OK) {
|
||||
if (status == WUFFS_BASE__STATUS_OK) {
|
||||
const char* msg = copy_to_io_buffer_from_image_buffer(&got, &ib);
|
||||
if (msg) {
|
||||
FAIL("%s", msg);
|
||||
@@ -306,10 +307,10 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (status != WUFFS_GIF__SUSPENSION_SHORT_READ) {
|
||||
if (status != WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__SUSPENSION_SHORT_READ,
|
||||
wuffs_gif__status__string(WUFFS_GIF__SUSPENSION_SHORT_READ));
|
||||
wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_SHORT_READ,
|
||||
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -365,10 +366,11 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (status != WUFFS_GIF__SUSPENSION_END_OF_DATA) {
|
||||
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__SUSPENSION_END_OF_DATA,
|
||||
wuffs_gif__status__string(WUFFS_GIF__SUSPENSION_END_OF_DATA));
|
||||
wuffs_gif__status__string(status),
|
||||
WUFFS_BASE__SUSPENSION_END_OF_DATA,
|
||||
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
|
||||
return false;
|
||||
}
|
||||
if (src.ri != src.wi) {
|
||||
@@ -398,11 +400,11 @@ void test_wuffs_gif_call_sequence() {
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (status != WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE) {
|
||||
if (status != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
|
||||
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status),
|
||||
WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE));
|
||||
WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE,
|
||||
wuffs_gif__status__string(WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -427,7 +429,7 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
if (status != WUFFS_GIF__STATUS_OK) {
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_config: got %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status));
|
||||
return false;
|
||||
@@ -449,7 +451,7 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
uint32_t i;
|
||||
for (i = 0; i < want_num_frames; i++) {
|
||||
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (status != WUFFS_GIF__STATUS_OK) {
|
||||
if (status != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, status,
|
||||
wuffs_gif__status__string(status));
|
||||
return false;
|
||||
@@ -472,10 +474,10 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
|
||||
// There should be no more frames.
|
||||
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
|
||||
if (status != WUFFS_GIF__SUSPENSION_END_OF_DATA) {
|
||||
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__SUSPENSION_END_OF_DATA,
|
||||
wuffs_gif__status__string(WUFFS_GIF__SUSPENSION_END_OF_DATA));
|
||||
wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_END_OF_DATA,
|
||||
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -83,11 +83,11 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__status s =
|
||||
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
|
||||
|
||||
if (s == WUFFS_GZIP__STATUS_OK) {
|
||||
if (s == WUFFS_BASE__STATUS_OK) {
|
||||
return NULL;
|
||||
}
|
||||
if ((wlimit && (s == WUFFS_GZIP__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_GZIP__SUSPENSION_SHORT_READ))) {
|
||||
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
|
||||
continue;
|
||||
}
|
||||
return wuffs_gzip__status__string(s);
|
||||
@@ -137,11 +137,11 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
|
||||
return false;
|
||||
}
|
||||
set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit));
|
||||
want = WUFFS_GZIP__SUSPENSION_SHORT_READ;
|
||||
want = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
} else {
|
||||
want = (bad_checksum && !ignore_checksum)
|
||||
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
|
||||
: WUFFS_GZIP__STATUS_OK;
|
||||
: WUFFS_BASE__STATUS_OK;
|
||||
}
|
||||
|
||||
wuffs_base__status status =
|
||||
|
||||
+7
-7
@@ -101,22 +101,22 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
|
||||
if (status == WUFFS_LZW__STATUS_OK) {
|
||||
if (status == WUFFS_BASE__STATUS_OK) {
|
||||
if (src.ri != src.wi) {
|
||||
FAIL("decode returned \"ok\" but src was not exhausted");
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if ((status != WUFFS_LZW__SUSPENSION_SHORT_READ) &&
|
||||
(status != WUFFS_LZW__SUSPENSION_SHORT_WRITE)) {
|
||||
if ((status != WUFFS_BASE__SUSPENSION_SHORT_READ) &&
|
||||
(status != WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
|
||||
FAIL("decode: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
|
||||
" (%s)",
|
||||
status, wuffs_lzw__status__string(status),
|
||||
WUFFS_LZW__SUSPENSION_SHORT_READ,
|
||||
wuffs_lzw__status__string(WUFFS_LZW__SUSPENSION_SHORT_READ),
|
||||
WUFFS_LZW__SUSPENSION_SHORT_WRITE,
|
||||
wuffs_lzw__status__string(WUFFS_LZW__SUSPENSION_SHORT_WRITE));
|
||||
WUFFS_BASE__SUSPENSION_SHORT_READ,
|
||||
wuffs_lzw__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ),
|
||||
WUFFS_BASE__SUSPENSION_SHORT_WRITE,
|
||||
wuffs_lzw__status__string(WUFFS_BASE__SUSPENSION_SHORT_WRITE));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -83,11 +83,11 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__status s =
|
||||
wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
|
||||
if (s == WUFFS_ZLIB__STATUS_OK) {
|
||||
if (s == WUFFS_BASE__STATUS_OK) {
|
||||
return NULL;
|
||||
}
|
||||
if ((wlimit && (s == WUFFS_ZLIB__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_ZLIB__SUSPENSION_SHORT_READ))) {
|
||||
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
|
||||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
|
||||
continue;
|
||||
}
|
||||
return wuffs_zlib__status__string(s);
|
||||
@@ -136,11 +136,11 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
|
||||
return false;
|
||||
}
|
||||
set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit));
|
||||
want = WUFFS_ZLIB__SUSPENSION_SHORT_READ;
|
||||
want = WUFFS_BASE__SUSPENSION_SHORT_READ;
|
||||
} else {
|
||||
want = (bad_checksum && !ignore_checksum)
|
||||
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
|
||||
: WUFFS_ZLIB__STATUS_OK;
|
||||
: WUFFS_BASE__STATUS_OK;
|
||||
}
|
||||
|
||||
wuffs_base__status status =
|
||||
|
||||
Reference in new issue
Block a user