commit 844fc9b5eeef46edab49c04516010db283e420da
author Nigel Tao <nigeltao@golang.org> Fri May 29 09:53:30 2020 +1000
committer Nigel Tao <nigeltao@golang.org> Fri May 29 09:53:30 2020 +1000
tree 0b888cbb809980b9cc2608e7f0b73dd186b23823
parent 302afb7ce574b4c7b55e77062b64b49ada3777ca

Temporarily avoid using base."@I/O redirect"

This commit (and the next) will soon be followed by a rollback.

release/c/wuffs-unsupported-snapshot.c

diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index 3065fab..fe09112 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -12251,7 +12251,7 @@
       status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
       goto exit;
     } else if (self->private_impl.f_io_redirect_fourcc != 0) {
-      status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
+      status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
       goto ok;
     }
     {
@@ -12557,11 +12557,11 @@
     if (v_bits_per_pixel == 0) {
       if (v_compression == 4) {
         self->private_impl.f_io_redirect_fourcc = 1246774599;
-        status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
+        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
         goto ok;
       } else if (v_compression == 5) {
         self->private_impl.f_io_redirect_fourcc = 1347307296;
-        status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
+        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
         goto ok;
       }
       status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);

std/bmp/decode_bmp.wuffs

diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs
index 28311da..1299685 100644
--- a/std/bmp/decode_bmp.wuffs
+++ b/std/bmp/decode_bmp.wuffs
@@ -72,7 +72,7 @@
 	if (this.call_sequence <> 0) or (this.io_redirect_fourcc == 1) {
 		return base."#bad call sequence"
 	} else if this.io_redirect_fourcc <> 0 {
-		return base."@I/O redirect"
+		return base."@metadata reported"  // XXX
 	}
 
 	// Read the BITMAPFILEHEADER (14 bytes).
@@ -130,10 +130,10 @@
 	if bits_per_pixel == 0 {
 		if compression == 4 {
 			this.io_redirect_fourcc = 'JPEG'be
-			return base."@I/O redirect"
+			return base."@metadata reported"  // XXX
 		} else if compression == 5 {
 			this.io_redirect_fourcc = 'PNG 'be
-			return base."@I/O redirect"
+			return base."@metadata reported"  // XXX
 		}
 		return "#unsupported BMP file"
 	} else if bits_per_pixel == 24 {

test/c/std/bmp.c

diff --git a/test/c/std/bmp.c b/test/c/std/bmp.c
index 1e20e2f..5679347 100644
--- a/test/c/std/bmp.c
+++ b/test/c/std/bmp.c
@@ -131,9 +131,9 @@
 
   wuffs_base__status status =
       wuffs_bmp__decoder__decode_image_config(&dec, NULL, &src);
-  if (status.repr != wuffs_base__note__i_o_redirect) {
+  if (status.repr != wuffs_base__note__metadata_reported) {  // XXX
     RETURN_FAIL("decode_image_config: have \"%s\", want \"%s\"", status.repr,
-                wuffs_base__note__i_o_redirect);
+                wuffs_base__note__metadata_reported);  // XXX
   }
 
   wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer();