summaryrefslogtreecommitdiffstats
path: root/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
diff options
context:
space:
mode:
Diffstat (limited to 'Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go')
-rw-r--r--Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go24
1 files changed, 16 insertions, 8 deletions
diff --git a/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go b/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
index 983b64d71..247962f2d 100644
--- a/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
+++ b/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
@@ -20,8 +20,8 @@ import (
"path/filepath"
"strings"
- "golang.org/x/image/bmp"
- "golang.org/x/image/tiff"
+ "github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/bmp"
+ "github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/tiff"
)
type Format int
@@ -226,9 +226,13 @@ func Clone(img image.Image) *image.NRGBA {
dst.Pix[di+1] = src.Pix[si+1]
dst.Pix[di+2] = src.Pix[si+2]
default:
- dst.Pix[di+0] = uint8(uint16(src.Pix[si+0]) * 0xff / uint16(a))
- dst.Pix[di+1] = uint8(uint16(src.Pix[si+1]) * 0xff / uint16(a))
- dst.Pix[di+2] = uint8(uint16(src.Pix[si+2]) * 0xff / uint16(a))
+ var tmp uint16
+ tmp = uint16(src.Pix[si+0]) * 0xff / uint16(a)
+ dst.Pix[di+0] = uint8(tmp)
+ tmp = uint16(src.Pix[si+1]) * 0xff / uint16(a)
+ dst.Pix[di+1] = uint8(tmp)
+ tmp = uint16(src.Pix[si+2]) * 0xff / uint16(a)
+ dst.Pix[di+2] = uint8(tmp)
}
di += 4
@@ -257,9 +261,13 @@ func Clone(img image.Image) *image.NRGBA {
dst.Pix[di+1] = src.Pix[si+2]
dst.Pix[di+2] = src.Pix[si+4]
default:
- dst.Pix[di+0] = uint8(uint16(src.Pix[si+0]) * 0xff / uint16(a))
- dst.Pix[di+1] = uint8(uint16(src.Pix[si+2]) * 0xff / uint16(a))
- dst.Pix[di+2] = uint8(uint16(src.Pix[si+4]) * 0xff / uint16(a))
+ var tmp uint16
+ tmp = uint16(src.Pix[si+0]) * 0xff / uint16(a)
+ dst.Pix[di+0] = uint8(tmp)
+ tmp = uint16(src.Pix[si+2]) * 0xff / uint16(a)
+ dst.Pix[di+1] = uint8(tmp)
+ tmp = uint16(src.Pix[si+4]) * 0xff / uint16(a)
+ dst.Pix[di+2] = uint8(tmp)
}
di += 4