aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-04 13:22:14 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-04 13:22:14 +0000
commit07ef911f18e30566d8a9d790e0bd69a836fd9d24 (patch)
tree352284a6918b54d51d554a1b8f39e7eb5b0644df /include/views
parent009103d33008c4ee733b8a9fe09bb4c2c374a305 (diff)
Fixed Linux compiler complaints
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkView.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/include/views/SkView.h b/include/views/SkView.h
index a5349c21ba..1241cabd86 100644
--- a/include/views/SkView.h
+++ b/include/views/SkView.h
@@ -203,12 +203,18 @@ public:
void detachAllChildren();
/** Convert the specified point from global coordinates into view-local coordinates
- */
- void globalToLocal(SkPoint* pt) const { if (pt) this->globalToLocal(pt->fX, pt->fY, pt); }
+ * Return true on success; false on failure
+ */
+ bool globalToLocal(SkPoint* pt) const {
+ if (NULL != pt) {
+ return this->globalToLocal(pt->fX, pt->fY, pt);
+ }
+ return true; // nothing to do so return true
+ }
/** Convert the specified x,y from global coordinates into view-local coordinates, returning
the answer in the local parameter.
*/
- void globalToLocal(SkScalar globalX, SkScalar globalY, SkPoint* local) const;
+ bool globalToLocal(SkScalar globalX, SkScalar globalY, SkPoint* local) const;
/** \class F2BIter