Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: include/core/SkRRect.h

Issue 12699002: Upstream changes from Android. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: more fiex Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkPaint.h ('k') | include/core/SkThread_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkRRect.h
diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h
index d6187f415aff223404982f32338873e547418520..fafe01924dafb0bba0e08fbed7490b8e86350ba6 100644
--- a/include/core/SkRRect.h
+++ b/include/core/SkRRect.h
@@ -188,12 +188,14 @@ public:
friend bool operator==(const SkRRect& a, const SkRRect& b) {
return a.fRect == b.fRect &&
- SkScalarsEqual((SkScalar*) a.fRadii, (SkScalar*) b.fRadii, 8);
+ SkScalarsEqual(a.fRadii[0].asScalars(),
+ b.fRadii[0].asScalars(), 8);
}
friend bool operator!=(const SkRRect& a, const SkRRect& b) {
return a.fRect != b.fRect ||
- !SkScalarsEqual((SkScalar*) a.fRadii, (SkScalar*) b.fRadii, 8);
+ !SkScalarsEqual(a.fRadii[0].asScalars(),
+ b.fRadii[0].asScalars(), 8);
}
/**
« no previous file with comments | « include/core/SkPaint.h ('k') | include/core/SkThread_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698