Resolve bugs

cmd/Makefile

@@ -1,7 +1,7 @@
 
 include $(GOROOT)/src/Make.inc
 
-TARG=gettingStarted testdraw2d testX11draw testandroid testgopher testimage testpostscript draw2dgl
+TARG=gettingStarted testdraw2d testX11draw testandroid testgopher testimage testpostscript #draw2dgl
 
 OFILES=$(TARG:%=%.$O)
 

cmd/gettingStarted.go

@@ -37,7 +37,7 @@ func saveToPngFile(filePath string, m image.Image) {
 }
 
 func main() {
-	i := image.NewRGBA(200, 200)
+	i := image.NewRGBA(image.Rect(0,0,200, 200))
 	gc := draw2d.NewGraphicContext(i)
 	gc.MoveTo(10.0, 10.0)
 	gc.LineTo(100.0, 10.0)

cmd/testX11draw.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"image/draw"
-	"image/draw/x11"
+	"exp/gui"
+	"exp/gui/x11"
 	"image"
 	"math"
 	"draw2d.googlecode.com/hg/draw2d"
@@ -37,11 +37,11 @@ func main() {
 	for {
 
 		switch evt := (<-window.EventChan()).(type) {
-		case draw.KeyEvent:
+		case gui.KeyEvent:
 			if evt.Key == 'q' {
 				window.Close()
 			}
-		case draw.MouseEvent:
+		case gui.MouseEvent:
 			if evt.Buttons&1 != 0 {
 				if nbclick%2 == 0 {
 					gc.MoveTo(float64(evt.Loc.X), float64(evt.Loc.Y))

cmd/testandroid.go

@@ -24,7 +24,7 @@ var (
 )
 
 func initGc(w, h int) (image.Image, draw2d.GraphicContext) {
-	i := image.NewRGBA(w, h)
+	i := image.NewRGBA(image.Rect(0, 0,w, h))
 	gc := draw2d.NewGraphicContext(i)
 	lastTime = time.Nanoseconds()
 

cmd/testdraw2d.go

@@ -26,7 +26,7 @@ var (
 )
 
 func initGc(w, h int) (image.Image, draw2d.GraphicContext) {
-	i := image.NewRGBA(w, h)
+	i := image.NewRGBA(image.Rect(0, 0, w, h))
 	gc := draw2d.NewGraphicContext(i)
 	lastTime = time.Nanoseconds()
 

cmd/testgopher.go

@@ -24,7 +24,7 @@ var (
 )
 
 func initGc(w, h int) (image.Image, draw2d.GraphicContext) {
-	i := image.NewRGBA(w, h)
+	i := image.NewRGBA(image.Rect(0, 0, w, h))
 	gc := draw2d.NewGraphicContext(i)
 	lastTime = time.Nanoseconds()
 

cmd/testimage.go

@@ -55,7 +55,7 @@ func loadFromPngFile(filePath string) image.Image {
 
 func main() {
 	source := loadFromPngFile("../resource/image/TestAndroid.png")
-	dest := image.NewRGBA(1024, 768)
+	dest := image.NewRGBA(image.Rect(0, 0, 1024, 768))
 	width, height := float64(source.Bounds().Dx()), float64(source.Bounds().Dy())
 	tr := draw2d.NewIdentityMatrix()
 	tr.Translate(width/2, height/2)

cmd/testpostscript.go

@@ -38,7 +38,7 @@ func saveToPngFile(filePath string, m image.Image) {
 }
 
 func main() {
-	i := image.NewRGBA(600, 800)
+	i := image.NewRGBA(image.Rect(0, 0, 600, 800))
 	gc := draw2d.NewGraphicContext(i)
 	gc.Translate(0, 380)
 	gc.Scale(1, -1)

draw2d/image.go

@@ -37,8 +37,8 @@ func NewGraphicContext(img draw.Image) *ImageGraphicContext {
 	switch selectImage := img.(type) {
 	case *image.RGBA:
 		painter = raster.NewRGBAPainter(selectImage)
-	case *image.NRGBA:
-		painter = NewNRGBAPainter(selectImage)
+	//case *image.NRGBA:
+	//	painter = NewNRGBAPainter(selectImage)
 	default:
 		panic("Image type not supported")
 	}

draw2d/paint.go

@@ -1,15 +1,15 @@
 // Copyright 2010 The draw2d Authors. All rights reserved.
 // created: 21/11/2010 by Laurent Le Goff
 package draw2d
-
+/*
 import (
 	"image/draw"
 	"image"
 	"freetype-go.googlecode.com/hg/freetype/raster"
-)
+)*/
 
 const M = 1<<16 - 1
-
+/*
 type NRGBAPainter struct {
 	// The image to compose onto.
 	Image *image.NRGBA
@@ -46,7 +46,7 @@ func (r *NRGBAPainter) Paint(ss []raster.Span, done bool) {
 		ma := s.A >> 16
 		if r.Op == draw.Over {
 			for i, nrgba := range p {
-				dr, dg, db, da := nrgba.RGBA()
+				dr, dg, db, da := nrgba.
 				a := M - (r.ca*ma)/M
 				da = (da*a + r.ca*ma) / M
 				if da != 0 {
@@ -74,6 +74,7 @@ func (r *NRGBAPainter) Paint(ss []raster.Span, done bool) {
 			}
 		}
 	}
+	
 }
 
 // SetColor sets the color to paint the spans.
@@ -85,3 +86,4 @@ func (r *NRGBAPainter) SetColor(c image.Color) {
 func NewNRGBAPainter(m *image.NRGBA) *NRGBAPainter {
 	return &NRGBAPainter{Image: m}
 }
+*/