diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:59:01 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:59:01 -0400 |
| commit | a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e (patch) | |
| tree | 1f4289d1f765d793e8c942ca5b3b87fa56a30258 /include/core/SkPoint.h | |
| parent | 573b53f8618997434563ae650004f89a20aaf631 (diff) | |
| parent | 2a049989f422cb1f59e9e05f413d13745f34a3d1 (diff) | |
| download | external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.zip external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.tar.gz external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.tar.bz2 | |
resolved conflicts for merge of 2a049989 to master
Change-Id: Ia1cbb6b274e1b3739704de9dd997e6d5dc5185af
Diffstat (limited to 'include/core/SkPoint.h')
| -rw-r--r-- | include/core/SkPoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h index de7c0ef..d371e64 100644 --- a/include/core/SkPoint.h +++ b/include/core/SkPoint.h @@ -442,11 +442,11 @@ struct SK_API SkPoint { void setOrthog(const SkPoint& vec, Side side = kLeft_Side) { // vec could be this SkScalar tmp = vec.fX; - if (kLeft_Side == side) { + if (kRight_Side == side) { fX = -vec.fY; fY = tmp; } else { - SkASSERT(kRight_Side == side); + SkASSERT(kLeft_Side == side); fX = vec.fY; fY = -tmp; } |