Fixing some warnings on Linux

samplecode/SampleUnitMapper.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 123 matching lines @@
         SkPoint pts[2] = { fPts[1], fPts[2] };
         fMatrix.mapPoints(pts, 2);
         for (int i = 0; i < 2; i++) {
             if (SkPoint::Distance(pts[i], target) < SkIntToScalar(4)) {
                 return i + 1;
             }
         }
         return -1;
     }
 
-    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
+    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) {

[sugoi, 2013/03/06 16:14:59]

virtual function's signature did not fit base class' signature

         fDragIndex = hittest(x, y);
         return fDragIndex >= 0 ? new Click(this) : NULL;
     }
 
     virtual bool onClick(Click* click) {
         if (fDragIndex >= 0) {
             if (!invertPt(click->fCurr.fX, click->fCurr.fY,
                           &fPts[fDragIndex])) {
                 return false;
             }
 
             this->setViews();
             this->inval(NULL);
             return true;
         }
         return false;
     }
 
 private:
     int fDragIndex;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new UnitMapperView; }
 static SkViewRegister reg(MyFactory);