diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-01-02 15:05:27 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-01-21 23:53:22 -0800 |
| commit | 5a8ea165926cb0737ab03bc48c18dc5198ab5305 (patch) | |
| tree | 962dc3357c57f019f85658f99e2e753e30201c27 /libgo/go/image | |
| parent | 6ac6529e155c9baa0aaaed7aca06bd38ebda5b43 (diff) | |
| download | gcc-5a8ea165926cb0737ab03bc48c18dc5198ab5305.tar.gz | |
libgo: update to Go1.14beta1
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/214297
Diffstat (limited to 'libgo/go/image')
| -rw-r--r-- | libgo/go/image/gif/writer_test.go | 2 | ||||
| -rw-r--r-- | libgo/go/image/png/writer.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libgo/go/image/gif/writer_test.go b/libgo/go/image/gif/writer_test.go index 0bc24d1beec..b619961787d 100644 --- a/libgo/go/image/gif/writer_test.go +++ b/libgo/go/image/gif/writer_test.go @@ -52,7 +52,7 @@ func averageDelta(m0, m1 image.Image) int64 { } // averageDeltaBounds returns the average delta in RGB space. The average delta is -// calulated in the specified bounds. +// calculated in the specified bounds. func averageDeltaBound(m0, m1 image.Image, b0, b1 image.Rectangle) int64 { var sum, n int64 for y := b0.Min.Y; y < b0.Max.Y; y++ { diff --git a/libgo/go/image/png/writer.go b/libgo/go/image/png/writer.go index 2bd4fde692c..53adc1633c0 100644 --- a/libgo/go/image/png/writer.go +++ b/libgo/go/image/png/writer.go @@ -426,10 +426,11 @@ func (e *encoder) writeImage(w io.Writer, m image.Image, cb int, level int) erro var a uint8 var c int + pixelsPerByte := 8 / bitsPerPixel for x := b.Min.X; x < b.Max.X; x++ { a = a<<uint(bitsPerPixel) | pi.ColorIndexAt(x, y) c++ - if c == 8/bitsPerPixel { + if c == pixelsPerByte { cr[0][i] = a i += 1 a = 0 @@ -437,7 +438,7 @@ func (e *encoder) writeImage(w io.Writer, m image.Image, cb int, level int) erro } } if c != 0 { - for c != 8/bitsPerPixel { + for c != pixelsPerByte { a = a << uint(bitsPerPixel) c++ } |