From: Roger Peppe <rogpeppe@gmail.com>
Date: Thu, 20 May 2010 21:33:50 +0000 (-0700)
Subject: Fix Rectangle.Canon()
X-Git-Tag: weekly.2010-05-27~61
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=798140693e942f10f2423ff6ee4f6b85738eacb0;p=gostls13.git

Fix Rectangle.Canon()

R=rsc, r, gri
CC=golang-dev
https://golang.org/cl/1239043
---

diff --git a/src/pkg/exp/draw/arith.go b/src/pkg/exp/draw/arith.go
index 6ed1c4a5a5..2b9033b8c0 100644
--- a/src/pkg/exp/draw/arith.go
+++ b/src/pkg/exp/draw/arith.go
@@ -59,10 +59,10 @@ func (r Rectangle) Sub(p Point) Rectangle { return Rectangle{r.Min.Sub(p), r.Max
 // has Min.X <= Max.X and Min.Y <= Max.Y.
 func (r Rectangle) Canon() Rectangle {
 	if r.Max.X < r.Min.X {
-		r.Max.X = r.Min.X
+		r.Min.X, r.Max.X = r.Max.X, r.Min.X
 	}
 	if r.Max.Y < r.Min.Y {
-		r.Max.Y = r.Min.Y
+		r.Min.Y, r.Max.Y = r.Max.Y, r.Min.Y
 	}
 	return r
 }