From bfefaf854b37a685de0e8c6997bbe041dd4256f2 Mon Sep 17 00:00:00 2001 From: "legoff.laurent" Date: Wed, 8 Jun 2011 00:31:06 +0200 Subject: [PATCH] draw android in green thanks to my wife, rename exp/draw to image/draw --- cmd/testX11draw.go | 4 ++-- cmd/testandroid.go | 2 +- cmd/testimage.go | 2 +- draw2d/curve/curve_test.go | 2 +- draw2d/image.go | 2 +- draw2d/paint.go | 4 ++-- draw2d/raster/line.go | 2 +- draw2d/rgba_interpolation.go | 2 +- draw2dgl/gc.go | 2 +- resource/result/TestAndroid.png | Bin 4565 -> 4604 bytes 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/testX11draw.go b/cmd/testX11draw.go index 71f56fa..be9645b 100644 --- a/cmd/testX11draw.go +++ b/cmd/testX11draw.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "exp/draw" - "exp/draw/x11" + "image/draw" + "image/draw/x11" "image" "math" "draw2d.googlecode.com/hg/draw2d" diff --git a/cmd/testandroid.go b/cmd/testandroid.go index 6ebf6ed..6120fa4 100644 --- a/cmd/testandroid.go +++ b/cmd/testandroid.go @@ -91,7 +91,7 @@ func android(gc draw2d.GraphicContext, x, y float64) { func main() { i, gc := initGc(width, height) - gc.SetFillColor(image.RGBAColor{0xff, 0x44, 0x44, 0xff}) + gc.SetFillColor(image.RGBAColor{0x44, 0xff, 0x44, 0xff}) gc.SetStrokeColor(image.RGBAColor{0x44, 0x44, 0x44, 0xff}) android(gc, 10, 10) saveToPngFile("TestAndroid", i) diff --git a/cmd/testimage.go b/cmd/testimage.go index c4bfcf9..e4cef6a 100644 --- a/cmd/testimage.go +++ b/cmd/testimage.go @@ -9,7 +9,7 @@ import ( "image" "time" "image/png" - "exp/draw" + "image/draw" "draw2d.googlecode.com/hg/draw2d" ) diff --git a/draw2d/curve/curve_test.go b/draw2d/curve/curve_test.go index b3ae18a..7c3ff5e 100644 --- a/draw2d/curve/curve_test.go +++ b/draw2d/curve/curve_test.go @@ -8,7 +8,7 @@ import ( "bufio" "image" "image/png" - "exp/draw" + "image/draw" "draw2d.googlecode.com/hg/draw2d/raster" ) diff --git a/draw2d/image.go b/draw2d/image.go index cbc80ce..48dc79f 100644 --- a/draw2d/image.go +++ b/draw2d/image.go @@ -3,7 +3,7 @@ package draw2d import ( - "exp/draw" + "image/draw" "image" "log" "freetype-go.googlecode.com/hg/freetype" diff --git a/draw2d/paint.go b/draw2d/paint.go index be3bbd1..c05fe7e 100644 --- a/draw2d/paint.go +++ b/draw2d/paint.go @@ -3,7 +3,7 @@ package draw2d import ( - "exp/draw" + "image/draw" "image" "freetype-go.googlecode.com/hg/freetype/raster" ) @@ -40,7 +40,7 @@ func (r *NRGBAPainter) Paint(ss []raster.Span, done bool) { } base := s.Y * r.Image.Stride p := r.Image.Pix[base+s.X0 : base+s.X1] - // This code is duplicated from drawGlyphOver in $GOROOT/src/pkg/exp/draw/draw.go. + // This code is duplicated from drawGlyphOver in $GOROOT/src/pkg/image/draw/draw.go. // TODO(nigeltao): Factor out common code into a utility function, once the compiler // can inline such function calls. ma := s.A >> 16 diff --git a/draw2d/raster/line.go b/draw2d/raster/line.go index 8a9d33a..92fed7a 100644 --- a/draw2d/raster/line.go +++ b/draw2d/raster/line.go @@ -3,7 +3,7 @@ package raster import ( - "exp/draw" + "image/draw" "image" ) diff --git a/draw2d/rgba_interpolation.go b/draw2d/rgba_interpolation.go index 88663b2..c70ae5a 100644 --- a/draw2d/rgba_interpolation.go +++ b/draw2d/rgba_interpolation.go @@ -2,7 +2,7 @@ package draw2d import ( - "exp/draw" + "image/draw" "image" "math" ) diff --git a/draw2dgl/gc.go b/draw2dgl/gc.go index de8a043..e87807d 100644 --- a/draw2dgl/gc.go +++ b/draw2dgl/gc.go @@ -2,7 +2,7 @@ package draw2dgl import ( "image" - "exp/draw" + "image/draw" "gl" "freetype-go.googlecode.com/hg/freetype/raster" "draw2d.googlecode.com/hg/draw2d" diff --git a/resource/result/TestAndroid.png b/resource/result/TestAndroid.png index b0294d0365c36b10d1b59a1c71be57f5e4573f5f..817429b3321f3c19e30a899455087cca61525c20 100644 GIT binary patch delta 4240 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