diff options
author | Rob Pike <r@golang.org> | 2010-05-07 14:32:34 -0700 |
---|---|---|
committer | Rob Pike <r@golang.org> | 2010-05-07 14:32:34 -0700 |
commit | 24ba6df00e960d0b6996b613fd936ebf077c6d3b (patch) | |
tree | acb18759d7c845589943d87dc9c5804e62def6cb /src/pkg/image/png | |
parent | 57fa5e7bb717b100f4e6b169899a465daeb3068f (diff) | |
download | golang-24ba6df00e960d0b6996b613fd936ebf077c6d3b.tar.gz |
compress: renamings.
NewDeflater -> NewWriter
NewInflater -> NewReader
Deflater -> Compressor
Inflater -> Decompressor
R=rsc
CC=golang-dev
http://codereview.appspot.com/1166041
Diffstat (limited to 'src/pkg/image/png')
-rw-r--r-- | src/pkg/image/png/reader.go | 2 | ||||
-rw-r--r-- | src/pkg/image/png/writer.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/image/png/reader.go b/src/pkg/image/png/reader.go index 5db125eb3..fddb70423 100644 --- a/src/pkg/image/png/reader.go +++ b/src/pkg/image/png/reader.go @@ -206,7 +206,7 @@ func paeth(a, b, c uint8) uint8 { } func (d *decoder) idatReader(idat io.Reader) os.Error { - r, err := zlib.NewInflater(idat) + r, err := zlib.NewReader(idat) if err != nil { return err } diff --git a/src/pkg/image/png/writer.go b/src/pkg/image/png/writer.go index b0550b0f1..06b6dcdc3 100644 --- a/src/pkg/image/png/writer.go +++ b/src/pkg/image/png/writer.go @@ -119,7 +119,7 @@ func (e *encoder) writePLTE(p image.PalettedColorModel) { // This method should only be called from writeIDATs (via writeImage). // No other code should treat an encoder as an io.Writer. // -// Note that, because the zlib deflater may involve an io.Pipe, e.Write calls may +// Note that, because the zlib Reader may involve an io.Pipe, e.Write calls may // occur on a separate go-routine than the e.writeIDATs call, and care should be // taken that e's state (such as its tmp buffer) is not modified concurrently. func (e *encoder) Write(b []byte) (int, os.Error) { @@ -225,7 +225,7 @@ func filter(cr [][]byte, pr []byte, bpp int) int { } func writeImage(w io.Writer, m image.Image, ct uint8) os.Error { - zw, err := zlib.NewDeflater(w) + zw, err := zlib.NewWriter(w) if err != nil { return err } |