From 547351cfecb3b1e26dea9b5d090f7bf0bc7be154 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 17 Jul 2017 16:39:32 +1000 Subject: [PATCH] Add testdata/romeo.txt.{flate,zlib}. --- script/extract-flate-offsets.go | 21 +++++++++++++++++++-- test/testdata/README.md | 20 +++++++++++++++----- test/testdata/romeo.txt.flate | Bin 0 -> 530 bytes test/testdata/romeo.txt.zlib | Bin 0 -> 536 bytes 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 test/testdata/romeo.txt.flate create mode 100644 test/testdata/romeo.txt.zlib diff --git a/script/extract-flate-offsets.go b/script/extract-flate-offsets.go index da070b2c..bb7794ea 100644 --- a/script/extract-flate-offsets.go +++ b/script/extract-flate-offsets.go @@ -10,6 +10,8 @@ package main // // Usage: go run extract-flate-offsets.go foo.gz bar.gz // +// Alternatively: go run extract-flate-offsets.go -write-flate foo.gz +// // Alternatively: go run extract-flate-offsets.go -write-zlib foo.gz import ( @@ -26,7 +28,8 @@ import ( ) var ( - writeZlib = flag.Bool("write-zlib", false, "whether to convert gzip to zlib") + writeFlate = flag.Bool("write-flate", false, "whether to convert gzip to raw flate") + writeZlib = flag.Bool("write-zlib", false, "whether to convert gzip to zlib") ) // GZIP wraps a header and footer around flate data. The format is described in @@ -102,13 +105,27 @@ func decode(filename string) error { return err } - if *writeZlib { + if *writeFlate { + return doWriteFlate(src[i:], uncompressed, filename) + } else if *writeZlib { return doWriteZlib(src[i:], uncompressed, filename) } fmt.Printf("%7d %7d %x %s\n", i, len(src), md5.Sum(uncompressed), filename) return nil } +func doWriteFlate(flateCompressed []byte, uncompressed []byte, filename string) error { + if strings.HasSuffix(filename, ".gz") { + filename = filename[:len(filename)-3] + } + filename += ".flate" + if err := ioutil.WriteFile(filename, flateCompressed, 0666); err != nil { + return err + } + fmt.Printf("wrote %s\n", filename) + return nil +} + func doWriteZlib(flateCompressed []byte, uncompressed []byte, filename string) error { buf := bytes.NewBuffer(nil) // The ZLIB header (as per https://www.ietf.org/rfc/rfc1950.txt) is 2 diff --git a/test/testdata/README.md b/test/testdata/README.md index 52a2c30e..c44dd720 100644 --- a/test/testdata/README.md +++ b/test/testdata/README.md @@ -1,9 +1,20 @@ +Unless otherwise noted, the *.gz files were generated by the gzip command line +tool and the .flate and .zlib versions were then generated by +script/extract-flate-offsets.go. Similarly, the *.giflzw files were generated +by script/extract-giflzw.go and the *.palette and *.indexes files were +generated by script/extract-palette-indexes.go + +The *.jpeg files are usually the canonical versions of the testdata images, and +other versions (*.bmp, *.gif, *.png, *.tiff) were generated by ImageMagick's +convert command line tool. The *.webp versions were generated by the cwebp +command line tool. + + + 256.bytes just holds "\x00\x01\x02\x03...\xff". bricks-* are various encodings of an original photo by Nigel Tao -. The *.giflzw files were generated by -script/extract-giflzw.go and the *.palette and *.indexes files were generated -by script/extract-palette-indexes.go +. harvesters.* are various encodings of a photo of "The Harvesters" by Pieter Bruegel the Elder, held by the Metropolitan Museum of Art. @@ -30,8 +41,7 @@ Museum." midsummer.txt is an excerpt of Shakespeare's "A Midsummer Night's Dream", copied from http://shakespeare.mit.edu/midsummer/midsummer.1.1.html -pi.txt contains the digits of pi. The *.giflzw file was generated by -script/compress-giflzw.go +pi.txt contains the digits of pi. pjw-thumbnail.* are various encodings of an image derived from an iconic, original photo of Peter J. Weinberger by Rob Pike . diff --git a/test/testdata/romeo.txt.flate b/test/testdata/romeo.txt.flate new file mode 100644 index 0000000000000000000000000000000000000000..61baf35f8a63077567e1edf77ab6f00e2866641d GIT binary patch literal 530 zcmeYbKA3mgfM@S#?Hj>*ZhW?S?Fw(1Opfki@NAQ7lNFiW*K%u;;>E9f*2}x9-t-e& zq5kRP-sjFQG#7m2-Pbo)x$W)yS&t6fICkOjvb35tA0j5J*RWLl{g}Jm_Mja9&&W_a zev8PiD{USbO3Jqlrp-33QMLC@Ja%nEL&*e(<1SHOmn|24lia#a_r2P6!(RtP=W(7_ zPM+oT<;M9Nt^TVLlzGd#*9rH8{Bf<~y6|AL!4I7uPy10Xyn{{8G>)f?1=%4uP zlic&SKe!p=7IkR1P3)5D#9lw^%7uxpeO~^#6Q(}gJ;&$Gdez`yOUa7{D{7i~TGUT< zTh}{^J>Otn*I9j4yYoeOO4{Fo*>CqeC`yeLo4IDSu3t;(w1WveoewhqY*WD4^H^#QeY%MiRa||GRUs%I=IWuMMgq6M5?y0Vj6~)Bpeg literal 0 HcmV?d00001 diff --git a/test/testdata/romeo.txt.zlib b/test/testdata/romeo.txt.zlib new file mode 100644 index 0000000000000000000000000000000000000000..13ee84d3ab3e5053ae7656998fe6b792f39f3ed1 GIT binary patch literal 536 zcmb=J;~RW1@3sNY-p|@Mg7w_^Z1vg|-ZGgS-NoS9Cf6n_GP|$k)+EJ?U-zt+cU8UV zC$>WU)5pEfonL4!_{h7jZ?1CN+xN2`9k_Aq!sBIWHETXZOjfU9srdUbcf0LDIsTuK zp?3ThkzH5XJTjD&ZyQXTZCayh@11z;+J=Ub2@c0yqP{L$F8U_9b)D{ewd;nz4v5a< zJg=NQ%jwIF^EX=kS0yO(mUXWa?g{zhTE%tY!Dh*0eHEMqH}>a#|4=+R#(DpTjNXRw zjFT>JT9aB8lXit&c6i3@`|Qo7U;FMqdNPS`f8mtoh9w#{E?sqT2Q@eAzCPEvYg^Di z@!2Q2=Wl;-GsZ3I&~BU9CDn<&e%6%>6J7hf{BtKveYks$&ztqC!NHc27Y$a_H1o8m zpX#=*cNBZR!Mv`s`l@#4i|~}RzXh}3?s-s@8Y?z)&1zl0meOel6L>lwWd6&apl92< zG27tl6i3fF3Xeo(oDH|fgkN&2*}kNDdiR~uiy;LHW=2u&W|99Jle|rLKUgpFByxtv z!QH1H6*g{q+&67|hv~xH_jV%xRWn&5BeK*(L%trI@X@8fNPZH}!+Wb8zh}Ie@Y(m6 z$m{e-RkQd9kq1@FW|{S_Ugmq`tI5NgJa7I5Y;F?&RN7|~-8pf&|3#lgs~uGL?P=Gn zp5XiId;S#Nw;Ga*L)?}2XKZr67ps$AE8PEg=VF!J8DCx-R7EE8)-#6hwz~%anGy~b literal 0 HcmV?d00001