commit 07ef911f18e30566d8a9d790e0bd69a836fd9d24
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 04 13:22:14 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 04 13:22:14 2012 +0000
tree 352284a6918b54d51d554a1b8f39e7eb5b0644df
parent 009103d33008c4ee733b8a9fe09bb4c2c374a305

Fixed Linux compiler complaints

http://codereview.appspot.com/6269045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4135 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleUnitMapper.cpp

diff --git a/samplecode/SampleUnitMapper.cpp b/samplecode/SampleUnitMapper.cpp
index d323ecb..09d0f14 100644
--- a/samplecode/SampleUnitMapper.cpp
+++ b/samplecode/SampleUnitMapper.cpp
@@ -116,12 +116,17 @@
         canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, &fPts[1], paint);
     }
 
-    SkPoint invertPt(SkScalar x, SkScalar y) {
-        SkPoint pt;
+    bool invertPt(SkScalar x, SkScalar y, SkPoint* result) {
+        if (NULL == result)
+            return true;
+
         SkMatrix m;
-        fMatrix.invert(&m);
-        m.mapXY(x, y, &pt);
-        return pt;
+        if (!fMatrix.invert(&m)) {
+            return false;
+        }
+
+        m.mapXY(x, y, result);
+        return true;
     }
 
     int hittest(SkScalar x, SkScalar y) {
@@ -143,7 +148,11 @@
     
     virtual bool onClick(Click* click) {
         if (fDragIndex >= 0) {
-            fPts[fDragIndex] = invertPt(click->fCurr.fX, click->fCurr.fY);
+            if (!invertPt(click->fCurr.fX, click->fCurr.fY, 
+                          &fPts[fDragIndex])) {
+                return false;
+            }
+
             this->setViews();
             this->inval(NULL);
             return true;