2 files changed, 17 insertions, 51 deletions

diff --git a/src/pkg/exp/draw/arith.go b/src/pkg/exp/draw/arith.go
index 43aefbaad..314754ea9 100644
--- a/src/pkg/exp/draw/arith.go
+++ b/src/pkg/exp/draw/arith.go
@@ -21,44 +21,28 @@ type Rectangle struct {
 var ZR Rectangle
 
 // Pt is shorthand for Point{X, Y}.
-func Pt(X, Y int) Point {
-	return Point{X, Y};
-}
+func Pt(X, Y int) Point	{ return Point{X, Y} }
 
 // Rect is shorthand for Rectangle{Pt(x0, y0), Pt(x1, y1)}.
-func Rect(x0, y0, x1, y1 int) Rectangle {
-	return Rectangle{Point{x0, y0}, Point{x1, y1}};
-}
+func Rect(x0, y0, x1, y1 int) Rectangle	{ return Rectangle{Point{x0, y0}, Point{x1, y1}} }
 
 // Rpt is shorthand for Rectangle{min, max}.
-func Rpt(min, max Point) Rectangle {
-	return Rectangle{min, max};
-}
+func Rpt(min, max Point) Rectangle	{ return Rectangle{min, max} }
 
 // Add returns the sum of p and q: Pt(p.X+q.X, p.Y+q.Y).
-func (p Point) Add(q Point) Point {
-	return Point{p.X + q.X, p.Y + q.Y};
-}
+func (p Point) Add(q Point) Point	{ return Point{p.X + q.X, p.Y + q.Y} }
 
 // Sub returns the difference of p and q: Pt(p.X-q.X, p.Y-q.Y).
-func (p Point) Sub(q Point) Point {
-	return Point{p.X - q.X, p.Y - q.Y};
-}
+func (p Point) Sub(q Point) Point	{ return Point{p.X - q.X, p.Y - q.Y} }
 
 // Mul returns p scaled by k: Pt(p.X*k p.Y*k).
-func (p Point) Mul(k int) Point {
-	return Point{p.X * k, p.Y * k};
-}
+func (p Point) Mul(k int) Point	{ return Point{p.X * k, p.Y * k} }
 
 // Div returns p divided by k: Pt(p.X/k, p.Y/k).
-func (p Point) Div(k int) Point {
-	return Point{p.X / k, p.Y / k};
-}
+func (p Point) Div(k int) Point	{ return Point{p.X / k, p.Y / k} }
 
 // Eq returns true if p and q are equal.
-func (p Point) Eq(q Point) bool {
-	return p.X == q.X && p.Y == q.Y;
-}
+func (p Point) Eq(q Point) bool	{ return p.X == q.X && p.Y == q.Y }
 
 // Inset returns the rectangle r inset by n: Rect(r.Min.X+n, r.Min.Y+n, r.Max.X-n, r.Max.Y-n).
 func (r Rectangle) Inset(n int) Rectangle {
@@ -66,14 +50,10 @@ func (r Rectangle) Inset(n int) Rectangle {
 }
 
 // Add returns the rectangle r translated by p: Rpt(r.Min.Add(p), r.Max.Add(p)).
-func (r Rectangle) Add(p Point) Rectangle {
-	return Rectangle{r.Min.Add(p), r.Max.Add(p)};
-}
+func (r Rectangle) Add(p Point) Rectangle	{ return Rectangle{r.Min.Add(p), r.Max.Add(p)} }
 
 // Sub returns the rectangle r translated by -p: Rpt(r.Min.Sub(p), r.Max.Sub(p)).
-func (r Rectangle) Sub(p Point) Rectangle {
-	return Rectangle{r.Min.Sub(p), r.Max.Sub(p)};
-}
+func (r Rectangle) Sub(p Point) Rectangle	{ return Rectangle{r.Min.Sub(p), r.Max.Sub(p)} }
 
 // Canon returns a canonical version of r: the returned rectangle
 // has Min.X <= Max.X and Min.Y <= Max.Y.
@@ -94,9 +74,7 @@ func (r Rectangle) Overlaps(r1 Rectangle) bool {
 }
 
 // Empty retruns true if r contains no points.
-func (r Rectangle) Empty() bool {
-	return r.Max.X <= r.Min.X || r.Max.Y <= r.Min.Y;
-}
+func (r Rectangle) Empty() bool	{ return r.Max.X <= r.Min.X || r.Max.Y <= r.Min.Y }
 
 // InRect returns true if all the points in r are also in r1.
 func (r Rectangle) In(r1 Rectangle) bool {
@@ -157,11 +135,7 @@ func (r Rectangle) Clip(r1 Rectangle) Rectangle {
 }
 
 // Dx returns the width of the rectangle r: r.Max.X - r.Min.X.
-func (r Rectangle) Dx() int {
-	return r.Max.X - r.Min.X;
-}
+func (r Rectangle) Dx() int	{ return r.Max.X - r.Min.X }
 
 // Dy returns the width of the rectangle r: r.Max.Y - r.Min.Y.
-func (r Rectangle) Dy() int {
-	return r.Max.Y - r.Min.Y;
-}
+func (r Rectangle) Dy() int	{ return r.Max.Y - r.Min.Y }
diff --git a/src/pkg/exp/draw/color.go b/src/pkg/exp/draw/color.go
index db772c7ad..310f70e30 100644
--- a/src/pkg/exp/draw/color.go
+++ b/src/pkg/exp/draw/color.go
@@ -92,17 +92,11 @@ func (c Color) SetAlpha(a uint8) Color {
 	return r<<24 | g<<16 | b<<8 | Color(a);
 }
 
-func (c Color) Width() int {
-	return 1e9;
-}
+func (c Color) Width() int	{ return 1e9 }
 
-func (c Color) Height() int {
-	return 1e9;
-}
+func (c Color) Height() int	{ return 1e9 }
 
-func (c Color) At(x, y int) image.Color {
-	return c;
-}
+func (c Color) At(x, y int) image.Color	{ return c }
 
 func toColor(color image.Color) image.Color {
 	if c, ok := color.(Color); ok {
@@ -112,6 +106,4 @@ func toColor(color image.Color) image.Color {
 	return Color(r>>24<<24 | g>>24<<16 | b>>24<<8 | a>>24);
 }
 
-func (c Color) ColorModel() image.ColorModel {
-	return image.ColorModelFunc(toColor);
-}
+func (c Color) ColorModel() image.ColorModel	{ return image.ColorModelFunc(toColor) }