qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 04:47:57 -07:00
Code Releases Activity

exp/draw: small draw.drawGlyphOver optimization.

Browse Source 
Make dpix variable names consistent.

R=rsc
CC=golang-dev
https://golang.org/cl/1563041
This commit is contained in:
Nigel Tao 2010-06-14 16:49:43 +10:00
parent 9562592342
commit 44a17e9df7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pkg/exp/draw/draw.go
View File

@ -165,14 +165,14 @@ func drawFillOver(dst *image.RGBA, r Rectangle, src image.ColorImage) {
x0, x1 := r.Min.X, r.Max.X x0, x1 := r.Min.X, r.Max.X
y0, y1 := r.Min.Y, r.Max.Y y0, y1 := r.Min.Y, r.Max.Y
for y := y0; y != y1; y++ { for y := y0; y != y1; y++ {
p := dst.Pixel[y] dpix := dst.Pixel[y]
for x := x0; x != x1; x++ { for x := x0; x != x1; x++ {
rgba := p[x] rgba := dpix[x]
dr := (uint32(rgba.R)*a)/m + cr dr := (uint32(rgba.R)*a)/m + cr
dg := (uint32(rgba.G)*a)/m + cg dg := (uint32(rgba.G)*a)/m + cg
db := (uint32(rgba.B)*a)/m + cb db := (uint32(rgba.B)*a)/m + cb
da := (uint32(rgba.A)*a)/m + ca da := (uint32(rgba.A)*a)/m + ca
p[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)} dpix[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)}
} }
} }
} }
@ -209,14 +209,15 @@ func drawGlyphOver(dst *image.RGBA, r Rectangle, src image.ColorImage, mask *ima
y0, y1 := r.Min.Y, r.Max.Y y0, y1 := r.Min.Y, r.Max.Y
cr, cg, cb, ca := src.RGBA() cr, cg, cb, ca := src.RGBA()
for y, my := y0, mp.Y; y != y1; y, my = y+1, my+1 { for y, my := y0, mp.Y; y != y1; y, my = y+1, my+1 {
p := dst.Pixel[y] dpix := dst.Pixel[y]
mpix := mask.Pixel[my]
for x, mx := x0, mp.X; x != x1; x, mx = x+1, mx+1 { for x, mx := x0, mp.X; x != x1; x, mx = x+1, mx+1 {
ma := uint32(mask.Pixel[my][mx].A) ma := uint32(mpix[mx].A)
if ma == 0 { if ma == 0 {
continue continue
} }
ma |= ma << 8 ma |= ma << 8
rgba := p[x] rgba := dpix[x]
dr := uint32(rgba.R) dr := uint32(rgba.R)
dg := uint32(rgba.G) dg := uint32(rgba.G)
db := uint32(rgba.B) db := uint32(rgba.B)
@ -227,7 +228,7 @@ func drawGlyphOver(dst *image.RGBA, r Rectangle, src image.ColorImage, mask *ima
dg = (dg*a + cg*ma) / m dg = (dg*a + cg*ma) / m
db = (db*a + cb*ma) / m db = (db*a + cb*ma) / m
da = (da*a + ca*ma) / m da = (da*a + ca*ma) / m
p[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)} dpix[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)}
} }
} }
} }
@ -277,7 +278,7 @@ func drawRGBA(dst *image.RGBA, r Rectangle, src image.Image, sp Point, mask imag
for y := y0; y != y1; y, sy, my = y+dy, sy+dy, my+dy { for y := y0; y != y1; y, sy, my = y+dy, sy+dy, my+dy {
sx := sp.X + x0 - r.Min.X sx := sp.X + x0 - r.Min.X
mx := mp.X + x0 - r.Min.X mx := mp.X + x0 - r.Min.X
p := dst.Pixel[y] dpix := dst.Pixel[y]
for x := x0; x != x1; x, sx, mx = x+dx, sx+dx, mx+dx { for x := x0; x != x1; x, sx, mx = x+dx, sx+dx, mx+dx {
ma := uint32(m) ma := uint32(m)
if mask != nil { if mask != nil {
@ -286,7 +287,7 @@ func drawRGBA(dst *image.RGBA, r Rectangle, src image.Image, sp Point, mask imag
sr, sg, sb, sa := src.At(sx, sy).RGBA() sr, sg, sb, sa := src.At(sx, sy).RGBA()
var dr, dg, db, da uint32 var dr, dg, db, da uint32
if op == Over { if op == Over {
rgba := p[x] rgba := dpix[x]
dr = uint32(rgba.R) dr = uint32(rgba.R)
dg = uint32(rgba.G) dg = uint32(rgba.G)
db = uint32(rgba.B) db = uint32(rgba.B)
@ -308,7 +309,7 @@ func drawRGBA(dst *image.RGBA, r Rectangle, src image.Image, sp Point, mask imag
db = sb * ma / m db = sb * ma / m
da = sa * ma / m da = sa * ma / m
} }
p[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)} dpix[x] = image.RGBAColor{uint8(dr >> 8), uint8(dg >> 8), uint8(db >> 8), uint8(da >> 8)}
} }
} }
} }