diff --git a/cmd/handsum/main.go b/cmd/handsum/main.go index 242ef30a..eab546bb 100644 --- a/cmd/handsum/main.go +++ b/cmd/handsum/main.go @@ -40,8 +40,8 @@ var ( roundtripFlag = flag.Bool("roundtrip", false, "whether to encode-and-decode the input") bFlag = flag.String("b", "gray", "encoding background color: e.g. red, white, 9c27b0 or #ff8") - cFlag = flag.String("c", "rgb", "encoding color: gray or rgb [default]") - qFlag = flag.Int("q", 3, "encoding quality: 0, 1, 2 or 3 [default]") + cFlag = flag.String("c", "rgb", "encoding color: gray (1), rgb (3, default) or rgba (4)") + qFlag = flag.Int("q", 3, "encoding quality: 0, 1, 2 or 3 (default)") ) const usageStr = `handsum decodes and encodes the Handsum lossy image file format. @@ -75,8 +75,8 @@ Flags: -roundtrip -b encoding background color: e.g. red, white, 9c27b0 or #ff8 - -c encoding color: gray or rgb [default] - -q encoding quality: 0, 1, 2 or 3 [default] + -c encoding color: gray (1), rgb (3, default) or rgba (4) + -q encoding quality: 0, 1, 2 or 3 (default) ` func main() { @@ -92,8 +92,10 @@ func main1() error { color := handsum.ColorRGB switch *cFlag { - case "0", "GRAY", "Gray", "gray": + case "1", "GRAY", "Gray", "gray": color = handsum.ColorGray + case "4", "RGBA", "Rgba", "rgba": + color = handsum.ColorRGBA } quality := handsum.Quality(max(0, min(3, *qFlag))) diff --git a/internal/cgen/base/magic-submodule.c b/internal/cgen/base/magic-submodule.c index 3bfcc977..b342a1a1 100644 --- a/internal/cgen/base/magic-submodule.c +++ b/internal/cgen/base/magic-submodule.c @@ -175,6 +175,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data, {+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG {+0x54482020, "\x02\xC3\xBE\xFE"}, // TH {+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ + {+0x484E534D, "\x01\xFE\xD6"}, // HANDSUM {+0x484E534D, "\x01\xFE\xD7"}, // HANDSUM {+0x4A504547, "\x01\xFF\xD8"}, // JPEG }; diff --git a/lib/handsum/handsum.go b/lib/handsum/handsum.go index ba6b9cbf..f11c3497 100644 --- a/lib/handsum/handsum.go +++ b/lib/handsum/handsum.go @@ -15,9 +15,9 @@ // This is a very lossy format for very small thumbnails. Very small in terms // of image dimensions, up to 16×16 pixels, but also in terms of file size. // -// The file format has two color settings (Gray and RGB) and four quality -// settings. For any given color-and-quality combination, every Handsum image -// file with those settings is a fixed number of bytes. For color=Gray: +// The file format has three color settings (Gray, RGB and RGBA) and four +// quality settings. For any given color-and-quality combination, every Handsum +// image file with those settings is a fixed number of bytes. For color=Gray: // // - A quality=0 file is 33 bytes long. // - A quality=1 file is 51 bytes long. @@ -31,6 +31,13 @@ // - A quality=2 file is 123 bytes long. // - A quality=3 file is 147 bytes long. // +// For color=RGBA: +// +// - A quality=0 file is 72 bytes long. +// - A quality=1 file is 99 bytes long. +// - A quality=2 file is 147 bytes long. +// - A quality=3 file is 171 bytes long. +// // Every Gray/q0 image file is exactly 48 bytes (384 bits) long. For a 16×16 // pixel image, this uses 1.5 bits (0.1875 bytes) per pixel. // @@ -38,10 +45,10 @@ // 4.59375 bits per pixel for a 16×16 pixel image (a 1:1 aspect ratio), or // 6.125 bits per pixel for a 16×12 pixel image (a 4:3 aspect ratio). // -// A Handsum file's starts with a 3 byte header: a 16-bit magic signature, a -// 1-bit color, a 2-bit quality and a 5-bit aspect ratio. An image's longest -// dimension (width or height) is 16 pixels and the aspect ratio gives the -// shorter dimension. +// A Handsum file's starts with a 3 byte header: a 15-bit magic signature, a +// 2-bit color (Gray, RGB or RGBA), a 2-bit quality and a 5-bit aspect ratio. +// An image's longest dimension (width or height) is 16 pixels and the aspect +// ratio gives the shorter dimension. // // The color=RGB payload, after the header, holds a scaled 16×16 pixel YCbCr // 4:2:0 JPEG MCU (Minimum Coded Unit), 4 Luma and 2 Chroma blocks. Each block @@ -136,13 +143,19 @@ import ( // that is no greater than 16. const MaxDimension = 16 -// Magic is the byte string prefix of every Handsum image file. +// MagicEtc is the byte string prefix of every Handsum image file. A Gray image +// starts with Magic0. An RGB or RGBA image starts with Magic1. The two 16-bit +// strings only differ in their final bit. // // It's like how every JPEG image file starts with "\xFF\xD8". -const Magic = "\xFE\xD7" +const ( + Magic0 = "\xFE\xD6" + Magic1 = "\xFE\xD7" +) func init() { - image.RegisterFormat("handsum", Magic, Decode, DecodeConfig) + image.RegisterFormat("handsum", Magic0, Decode, DecodeConfig) + image.RegisterFormat("handsum", Magic1, Decode, DecodeConfig) } var ( @@ -156,20 +169,32 @@ const ( ) func fileSize(c Color, q Quality) int { - // 33, 51, 83, 99. 48, 75, 123, 147. - return int("\x21\x33\x53\x63\x30\x4B\x7B\x93"[(int(c&1)<<2)|int(q&3)]) + // 33, 51, 83, 99. + // 0, 0, 0, 0. + // 48, 75, 123, 147. + // 72, 99, 147, 171. + return int(("" + + "\x21\x33\x53\x63" + + "\x00\x00\x00\x00" + + "\x30\x4B\x7B\x93" + + "\x48\x63\x93\xAB")[(int((c-1)&3)<<2)|int(q&3)]) } -// Color is a Handsum image's color setting, either 0 (Gray) or 1 (RGB). +// Color is a Handsum image's color setting, either 1 (Gray), 3 (RGB) or 4 +// (RGBA). type Color uint8 const ( - ColorGray = Color(0) - ColorRGB = Color(1) + ColorGray = Color(1) + ColorRGB = Color(3) + ColorRGBA = Color(4) ) func (c Color) numberOfBlocks() int { - return int("\x04\x06"[c&1]) + if c == ColorGray { + return 4 + } + return 6 } // OptionColor is an option type, what Rust would call an Option. @@ -180,7 +205,10 @@ type OptionColor struct { // MakeOptionColor returns an option value that is Some(c), instead of the // OptionColor zero-value, which is None. func MakeOptionColor(c Color) OptionColor { - return OptionColor{representation: 0x80 | uint8(c)} + if (c == ColorGray) || (c == ColorRGB) || (c == ColorRGBA) { + return OptionColor{representation: 0x80 | uint8(c)} + } + return OptionColor{} } // Quality is a Handsum image's quality setting, from 0 (worst) to 3 (best). @@ -206,7 +234,10 @@ type OptionQuality struct { // MakeOptionQuality returns an option value that is Some(q), instead of the // OptionQuality zero-value, which is None. func MakeOptionQuality(q Quality) OptionQuality { - return OptionQuality{representation: 0x80 | uint8(q)} + if (0 <= q) && (q <= 3) { + return OptionQuality{representation: 0x80 | uint8(q)} + } + return OptionQuality{} } // EncodeOptions are optional arguments to Encode. The zero value is valid and @@ -223,14 +254,14 @@ type EncodeOptions struct { func (o *EncodeOptions) color() Color { if (o != nil) && ((o.Color.representation & 0x80) != 0) { - return Color(o.Color.representation & 0x01) + return Color(o.Color.representation & 0x7F) } return ColorRGB } func (o *EncodeOptions) quality() Quality { if (o != nil) && ((o.Quality.representation & 0x80) != 0) { - return Quality(o.Quality.representation & 0x03) + return Quality(o.Quality.representation & 0x7F) } return QualityBest } @@ -278,9 +309,9 @@ func Encode(w io.Writer, src image.Image, options *EncodeOptions) error { c := options.color() q := options.quality() buf := [fileSizeMax]byte{} - buf[0] = Magic[0] - buf[1] = Magic[1] - buf[2] = ((uint8(c)) << 7) | ((uint8(q)) << 5) | aspectRatio + buf[0] = Magic0[0] + buf[1] = Magic0[1] | uint8((c-1)>>1) + buf[2] = ((uint8(c - 1)) << 7) | ((uint8(q)) << 5) | aspectRatio bitOffset := 3 * 8 encodeBlock := encodeBlockFuncs[q] @@ -381,12 +412,16 @@ func DecodeConfig(r io.Reader) (image.Config, error) { buf := [fileSizeHeader]byte{} if _, err := io.ReadFull(r, buf[:]); err != nil { return image.Config{}, err - } else if (buf[0] != Magic[0]) || (buf[1] != Magic[1]) { + } else if (buf[0] != Magic0[0]) || ((0xFE & buf[1]) != Magic0[1]) { + return image.Config{}, ErrNotAHandsumFile + } + c, ok := decodeColorSetting(buf[1], buf[2]) + if !ok { return image.Config{}, ErrNotAHandsumFile } cm := color.GrayModel - if (buf[2] & 0x80) != 0 { + if c > ColorGray { cm = color.RGBAModel } @@ -398,15 +433,30 @@ func DecodeConfig(r io.Reader) (image.Config, error) { }, nil } +func decodeColorSetting(buf1 byte, buf2 byte) (Color, bool) { + switch ((buf1 & 1) << 1) | (buf2 >> 7) { + case 0: + return ColorGray, true + case 2: + return ColorRGB, true + case 3: + // TODO: return ColorRGBA, true + } + return 0, false +} + // Decode reads a Handsum image from r. func Decode(r io.Reader) (image.Image, error) { buf := [fileSizeMax]byte{} if _, err := io.ReadFull(r, buf[:fileSizeHeader]); err != nil { return nil, err - } else if (buf[0] != Magic[0]) || (buf[1] != Magic[1]) { + } else if (buf[0] != Magic0[0]) || ((0xFE & buf[1]) != Magic0[1]) { + return nil, ErrNotAHandsumFile + } + c, ok := decodeColorSetting(buf[1], buf[2]) + if !ok { return nil, ErrNotAHandsumFile } - c := Color(buf[2] >> 7) q := Quality((buf[2] >> 5) & 0x03) if _, err := io.ReadFull(r, buf[fileSizeHeader:fileSize(c, q)]); err != nil { return nil, err @@ -424,7 +474,7 @@ func Decode(r io.Reader) (image.Image, error) { cbQuadBlockU8 := lowleveljpeg.QuadBlockU8{} crQuadBlockU8 := lowleveljpeg.QuadBlockU8{} - if c != 0 { + if c > ColorGray { cbBlockU8 := lowleveljpeg.BlockU8{} crBlockU8 := lowleveljpeg.BlockU8{} @@ -438,7 +488,7 @@ func Decode(r io.Reader) (image.Image, error) { } dstW, dstH := decodeWidthAndHeight(buf[2]) - return finishDecode(dstW, dstH, c == 0, &lumaQuadBlockU8, &cbQuadBlockU8, &crQuadBlockU8), nil + return finishDecode(dstW, dstH, c == ColorGray, &lumaQuadBlockU8, &cbQuadBlockU8, &crQuadBlockU8), nil } func decodeWidthAndHeight(buf2 byte) (w int, h int) { diff --git a/lib/handsum/handsum_test.go b/lib/handsum/handsum_test.go index 142c50fc..bb64e38c 100644 --- a/lib/handsum/handsum_test.go +++ b/lib/handsum/handsum_test.go @@ -25,7 +25,13 @@ func makePlainColorImage(grayValue uint8) image.Image { } func testRoundTrip(tt *testing.T, src image.Image, pixelValue uint8, justCheckThatItsGray bool) { - for c := Color(0); c < 2; c++ { + colors := []Color{ + ColorGray, + ColorRGB, + // TODO: ColorRGBA, + } + + for _, c := range colors { for q := Quality(0); q < 4; q++ { buf := &bytes.Buffer{} err := Encode(buf, src, &EncodeOptions{ diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c05f1146..a9580dd0 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23989,6 +23989,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data, {+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG {+0x54482020, "\x02\xC3\xBE\xFE"}, // TH {+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ + {+0x484E534D, "\x01\xFE\xD6"}, // HANDSUM {+0x484E534D, "\x01\xFE\xD7"}, // HANDSUM {+0x4A504547, "\x01\xFF\xD8"}, // JPEG }; @@ -50319,12 +50320,16 @@ const char wuffs_handsum__error__truncated_input[] = "#handsum: truncated input" // ---------------- Private Consts -static const uint32_t -WUFFS_HANDSUM__PAYLOAD_SIZES[2][4] WUFFS_BASE__POTENTIALLY_UNUSED = { +static const uint8_t +WUFFS_HANDSUM__PAYLOAD_SIZES[4][4] WUFFS_BASE__POTENTIALLY_UNUSED = { { 30u, 48u, 80u, 96u, + }, { + 0u, 0u, 0u, 0u, }, { 45u, 72u, 120u, 144u, + }, { + 76u, 99u, 147u, 171u, }, }; @@ -50917,9 +50922,9 @@ wuffs_handsum__decoder__do_decode_image_config( { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; - if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { - t_0 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src))); - iop_a_src += 2; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) { + t_0 = ((uint32_t)(wuffs_base__peek_u24be__no_bounds_check(iop_a_src))); + iop_a_src += 3; } else { self->private_data.s_do_decode_image_config.scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); @@ -50929,34 +50934,29 @@ wuffs_handsum__decoder__do_decode_image_config( goto suspend; } uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch; - uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56)); - *scratch <<= 8; + uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu)); *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; - if (num_bits_0 == 8) { - t_0 = ((uint32_t)(*scratch)); + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0); + if (num_bits_0 == 16) { + t_0 = ((uint32_t)(*scratch >> 40)); break; } num_bits_0 += 8u; - *scratch |= ((uint64_t)(num_bits_0)) << 56; + *scratch |= ((uint64_t)(num_bits_0)); } } v_c32 = t_0; } - if (v_c32 != 55294u) { + if ((v_c32 >> 9u) != 32619u) { status = wuffs_base__make_status(wuffs_handsum__error__bad_header); goto exit; } - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint32_t t_1 = *iop_a_src++; - v_c32 = t_1; + self->private_impl.f_color = ((v_c32 >> 7u) & 3u); + if ((self->private_impl.f_color & 1u) == 1u) { + status = wuffs_base__make_status(wuffs_handsum__error__bad_header); + goto exit; } - self->private_impl.f_color = (v_c32 >> 7u); self->private_impl.f_quality = ((v_c32 >> 5u) & 3u); if ((v_c32 & 16u) == 0u) { self->private_impl.f_width = 16u; @@ -51243,6 +51243,7 @@ wuffs_handsum__decoder__do_decode_frame( uint32_t v_pixfmt = 0; wuffs_base__status v_status = wuffs_base__make_status(NULL); uint32_t v_num_read = 0; + uint32_t v_payload_size = 0; uint32_t v_which = 0; const uint8_t* iop_a_src = NULL; @@ -51300,10 +51301,14 @@ wuffs_handsum__decoder__do_decode_frame( } goto ok; } - while (v_num_read < WUFFS_HANDSUM__PAYLOAD_SIZES[self->private_impl.f_color][self->private_impl.f_quality]) { + while (true) { + v_payload_size = ((uint32_t)(WUFFS_HANDSUM__PAYLOAD_SIZES[self->private_impl.f_color][self->private_impl.f_quality])); + if (v_num_read >= v_payload_size) { + break; + } v_num_read += wuffs_private_impl__io_reader__limited_copy_u32_to_slice( - &iop_a_src, io2_a_src,(WUFFS_HANDSUM__PAYLOAD_SIZES[self->private_impl.f_color][self->private_impl.f_quality] - v_num_read), wuffs_base__make_slice_u8_ij(self->private_data.f_bits, v_num_read, 256)); - if (v_num_read < WUFFS_HANDSUM__PAYLOAD_SIZES[self->private_impl.f_color][self->private_impl.f_quality]) { + &iop_a_src, io2_a_src,(v_payload_size - v_num_read), wuffs_base__make_slice_u8_ij(self->private_data.f_bits, v_num_read, 256)); + if (v_num_read < v_payload_size) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); } diff --git a/std/handsum/decode_handsum.wuffs b/std/handsum/decode_handsum.wuffs index 4d836b9b..d48ea5b6 100644 --- a/std/handsum/decode_handsum.wuffs +++ b/std/handsum/decode_handsum.wuffs @@ -22,7 +22,7 @@ pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( width : base.u32[..= 16], height : base.u32[..= 16], - color : base.u32[..= 1], + color : base.u32[..= 3], // 0=gray, 2=rgb, 3=rgba. quality : base.u32[..= 3], // The call sequence state machine is discussed in @@ -68,12 +68,14 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. return base."#bad call sequence" } - c32 = args.src.read_u16le_as_u32?() - if c32 <> '\xFE\xD7'le { + c32 = args.src.read_u24be_as_u32?() + if (c32 >> 9) <> 0x7F6B { + return "#bad header" + } + this.color = (c32 >> 7) & 3 + if (this.color & 1) == 1 { return "#bad header" } - c32 = args.src.read_u8_as_u32?() - this.color = c32 >> 7 this.quality = (c32 >> 5) & 3 if (c32 & 0x10) == 0x00 { // Landscape. @@ -161,10 +163,11 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, } pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, blend: base.pixel_blend, workbuf: slice base.u8, opts: nptr base.decode_frame_options) { - var pixfmt : base.u32 - var status : base.status - var num_read : base.u32 - var which : base.u32[..= 1] + var pixfmt : base.u32 + var status : base.status + var num_read : base.u32 + var payload_size : base.u32[..= 171] + var which : base.u32[..= 1] if this.call_sequence == 0x40 { // No-op. @@ -189,13 +192,17 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade return status } - while num_read < PAYLOAD_SIZES[this.color][this.quality] { - assert num_read < 256 via "a < b: a < c; c <= b"(c: PAYLOAD_SIZES[this.color][this.quality]) - assert PAYLOAD_SIZES[this.color][this.quality] > num_read via "a > b: b < a"() + while true { + payload_size = PAYLOAD_SIZES[this.color][this.quality] as base.u32 + if num_read >= payload_size { + break + } + assert num_read < 256 via "a < b: a < c; c <= b"(c: payload_size) + assert payload_size > num_read via "a > b: b < a"() num_read ~mod+= args.src.limited_copy_u32_to_slice!( - up_to: PAYLOAD_SIZES[this.color][this.quality] - num_read, + up_to: payload_size - num_read, s: this.bits[num_read ..]) - if num_read < PAYLOAD_SIZES[this.color][this.quality] { + if num_read < payload_size { yield? base."$short read" } } @@ -1084,10 +1091,14 @@ pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } -pri const PAYLOAD_SIZES : roarray[2] roarray[4] base.u32[..= 144] = [[ +pri const PAYLOAD_SIZES : roarray[4] roarray[4] base.u8[..= 171] = [[ 30, 48, 80, 96, +],[ + 0, 0, 0, 0, ],[ 45, 72, 120, 144, +],[ + 69, 96, 144, 168, ]] pri const NUM_COEFFS : roarray[4] base.u32[..= 15] = [ diff --git a/test/data/bricks-color.c3q0.handsum b/test/data/bricks-color.c3q0.handsum index dbfffe7a..b98deb9b 100644 --- a/test/data/bricks-color.c3q0.handsum +++ b/test/data/bricks-color.c3q0.handsum @@ -1 +1 @@ -þ׋†¼“‡§ŠˆHˆ—˜›‰¨˜uxºh{ixHކ{xwv‰»§†¬˜†©Y—§SV´§v \ No newline at end of file +þ× †¼“‡§ŠˆHˆ—˜›‰¨˜uxºh{ixHކ{xwv‰»§†¬˜†©Y—§SV´§v \ No newline at end of file diff --git a/test/data/bricks-color.c3q1.handsum b/test/data/bricks-color.c3q1.handsum index 4183ac08..c8d36fc7 100644 --- a/test/data/bricks-color.c3q1.handsum +++ b/test/data/bricks-color.c3q1.handsum @@ -1 +1 @@ -þ׫UÚ‡7Ÿ…¦˜hƒš†Ô{¼C—‡Dy§´›z¦Šwe“ºÔÕ‡&mYæRiƒ‰h噋Sz¶úk¦»{œTÚêIÍpoÕ¨ãSË6…ðb \ No newline at end of file +þ×+UÚ‡7Ÿ…¦˜hƒš†Ô{¼C—‡Dy§´›z¦Šwe“ºÔÕ‡&mYæRiƒ‰h噋Sz¶úk¦»{œTÚêIÍpoÕ¨ãSË6…ðb \ No newline at end of file diff --git a/test/data/bricks-color.c3q2.handsum b/test/data/bricks-color.c3q2.handsum index 9be3844f..17a4bdfa 100644 --- a/test/data/bricks-color.c3q2.handsum +++ b/test/data/bricks-color.c3q2.handsum @@ -1 +1 @@ -þ×ËUÚ‡ˆˆ7Ÿ…‡h¦˜h‰‡ƒš†i‰Ô{¼ª‡C—‡™ˆDy§‰š´›z†x¦Šwˆˆe“º—yÔÕ‡˜‰&mYxˆæRi™‡ƒ‰hxˆå™‹†–Sz¶˜yúk¦gZ»{§—œTÚÇ‹êIÍe•poº·Õ¨ãKˆSË6Y“…ðb‡o \ No newline at end of file +þ×KUÚ‡ˆˆ7Ÿ…‡h¦˜h‰‡ƒš†i‰Ô{¼ª‡C—‡™ˆDy§‰š´›z†x¦Šwˆˆe“º—yÔÕ‡˜‰&mYxˆæRi™‡ƒ‰hxˆå™‹†–Sz¶˜yúk¦gZ»{§—œTÚÇ‹êIÍe•poº·Õ¨ãKˆSË6Y“…ðb‡o \ No newline at end of file diff --git a/test/data/bricks-color.c3q3.handsum b/test/data/bricks-color.c3q3.handsum index 757c12ff..614e4bf9 100644 Binary files a/test/data/bricks-color.c3q3.handsum and b/test/data/bricks-color.c3q3.handsum differ diff --git a/test/data/bricks-gray.c1q0.handsum b/test/data/bricks-gray.c1q0.handsum index 1ac253b0..e68b300c 100644 --- a/test/data/bricks-gray.c1q0.handsum +++ b/test/data/bricks-gray.c1q0.handsum @@ -1 +1 @@ -þ× s¬”—¦zx(‰˜™›‰˜™sw¹x‹yx(�‡‹xwwˆ \ No newline at end of file +þÖ s¬”—¦zx(‰˜™›‰˜™sw¹x‹yx(�‡‹xwwˆ \ No newline at end of file diff --git a/test/data/bricks-gray.c1q1.handsum b/test/data/bricks-gray.c1q1.handsum index bd1dd66d..e01e3283 100644 --- a/test/data/bricks-gray.c1q1.handsum +++ b/test/data/bricks-gray.c1q1.handsum @@ -1 +1 @@ -þ×+cÚ‡%Ÿ”“˜x‚š‡Ò{Ëa—ˆRy¨²‹z£‰wR“ªÂÅw4lhÔSh�ˆxÓ™{ay§ \ No newline at end of file +þÖ+cÚ‡%Ÿ”“˜x‚š‡Ò{Ëa—ˆRy¨²‹z£‰wR“ªÂÅw4lhÔSh�ˆxÓ™{ay§ \ No newline at end of file diff --git a/test/data/bricks-gray.c1q2.handsum b/test/data/bricks-gray.c1q2.handsum index 44b22d31..fbe205a1 100644 --- a/test/data/bricks-gray.c1q2.handsum +++ b/test/data/bricks-gray.c1q2.handsum @@ -1 +1 @@ -þ×KcÚ‡ˆ‡%Ÿ”†h“˜x‰ˆ‚š‡xˆÒ{˪‡a—ˆ™ˆRy¨‰š²‹z‡x£‰wˆˆR“ª—yÂÅw˜‰4lhxˆÔSh˜ˆ�ˆxxˆÓ™{‡–ay§˜y \ No newline at end of file +þÖKcÚ‡ˆ‡%Ÿ”†h“˜x‰ˆ‚š‡xˆÒ{˪‡a—ˆ™ˆRy¨‰š²‹z‡x£‰wˆˆR“ª—yÂÅw˜‰4lhxˆÔSh˜ˆ�ˆxxˆÓ™{‡–ay§˜y \ No newline at end of file diff --git a/test/data/bricks-gray.c1q3.handsum b/test/data/bricks-gray.c1q3.handsum index da133856..3c26d886 100644 --- a/test/data/bricks-gray.c1q3.handsum +++ b/test/data/bricks-gray.c1q3.handsum @@ -1 +1 @@ -þ×krMø©ðr45‚8¶ƒ9«b)ªs8{¡—ôˆ€(…‰�&{‘(vt˜¡(Öq‰ƒ)™¡(Tƒ(šrDD’©hˆ¤!MQKÉ”[qІH®€ˆ¥«�(bt,I�— \ No newline at end of file +þÖkrMø©ðr45‚8¶ƒ9«b)ªs8{¡—ôˆ€(…‰�&{‘(vt˜¡(Öq‰ƒ)™¡(Tƒ(šrDD’©hˆ¤!MQKÉ”[qІH®€ˆ¥«�(bt,I�— \ No newline at end of file diff --git a/test/data/bricks-gray.c3q3.handsum b/test/data/bricks-gray.c3q3.handsum index 10176cb6..7ea00cc4 100644 --- a/test/data/bricks-gray.c3q3.handsum +++ b/test/data/bricks-gray.c3q3.handsum @@ -1 +1 @@ -þ×ërMø©ðr45‚8¶ƒ9«b)ªs8{¡—ôˆ€(…‰�&{‘(vt˜¡(Öq‰ƒ)™¡(Tƒ(šrDD’©hˆ¤!MQKÉ”[qІH®€ˆ¥«�(bt,I�—ˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆ \ No newline at end of file +þ×krMø©ðr45‚8¶ƒ9«b)ªs8{¡—ôˆ€(…‰�&{‘(vt˜¡(Öq‰ƒ)™¡(Tƒ(šrDD’©hˆ¤!MQKÉ”[qІH®€ˆ¥«�(bt,I�—ˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆˆ \ No newline at end of file diff --git a/test/data/mona-lisa.21x32.c3q0.handsum b/test/data/mona-lisa.21x32.c3q0.handsum index 513ba341..16ede001 100644 --- a/test/data/mona-lisa.21x32.c3q0.handsum +++ b/test/data/mona-lisa.21x32.c3q0.handsum @@ -1 +1 @@ -þךv‹švXˆ™h¶yª¦†™—c{‰˜¹Yy(¸ˆŠ‰Š™˜w”˜yˆˆˆ—y‡wˆˆˆ˜ \ No newline at end of file +þ×v‹švXˆ™h¶yª¦†™—c{‰˜¹Yy(¸ˆŠ‰Š™˜w”˜yˆˆˆ—y‡wˆˆˆ˜ \ No newline at end of file diff --git a/test/data/mona-lisa.21x32.c3q3.handsum b/test/data/mona-lisa.21x32.c3q3.handsum index e662a274..b9cc26fa 100644 --- a/test/data/mona-lisa.21x32.c3q3.handsum +++ b/test/data/mona-lisa.21x32.c3q3.handsum @@ -1 +1 @@ -þ×ú‡vh‡u‰wŒ·Ç›xdZ˜´yæuWŠ„ˆ†zh‡vhôUâhš‰ô;”uj¸ø2hUjxUH¬Skö“;xƒ%™’)¶fjš�—’,¹Õ?ˆ‚H¦‘˜q8–£&y�)—‘˜�—•X»†W˜–Zž&l™‡vJx„j©gx”ˆˆ—E¨†x‰¥…º†XŠš¨‰š§y©È™‹‡ \ No newline at end of file +þ×z‡vh‡u‰wŒ·Ç›xdZ˜´yæuWŠ„ˆ†zh‡vhôUâhš‰ô;”uj¸ø2hUjxUH¬Skö“;xƒ%™’)¶fjš�—’,¹Õ?ˆ‚H¦‘˜q8–£&y�)—‘˜�—•X»†W˜–Zž&l™‡vJx„j©gx”ˆˆ—E¨†x‰¥…º†XŠš¨‰š§y©È™‹‡ \ No newline at end of file