Turning on warning as error on Linux

src/animator/SkDrawExtraPathEffect.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawExtraPathEffect.h"
@@ skipping 110 matching lines @@
             SkDrawMatrix* matrix;
             if (fDraw->addMatrix->getType() == SkType_Matrix)
                 matrix = (SkDrawMatrix*) fDraw->addMatrix;
             else {
                 SkApply* apply = (SkApply*) fDraw->addMatrix;
                 apply->refresh(*fMaker);
                 apply->activate(*fMaker);
                 apply->interpolate(*fMaker, SkScalarMulRound(distance, 1000));
                 matrix = (SkDrawMatrix*) apply->getScope();
             }
+            if (matrix) {
+                m = matrix->getMatrix();
+            }
         }
         SkScalar result = 0;
         SkAnimatorScript::EvaluateFloat(*fMaker, NULL, fDraw->spacing.c_str(), &result);
         if (drawPath)
             dst->addPath(drawPath->getPath(), m);
         fMaker->clearExtraPropertyCallBack(fDraw->fType);
         return result;
     }
 
 private:
@@ skipping 80 matching lines @@
 
 ////////// SkShape2DPathEffect
 
 class SkShape2DPathEffect : public Sk2DPathEffect {
 public:
     SkShape2DPathEffect(SkDrawShape2DPathEffect* draw, SkAnimateMaker* maker,
         const SkMatrix& matrix) : Sk2DPathEffect(matrix), fDraw(draw), fMaker(maker) {
     }
 
 protected:
-    virtual void begin(const SkIRect& uvBounds, SkPath* )
-    {
+    virtual void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
+        const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds);
+    }
+
+    virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
+        const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst);
+    }
+
+private:
+    void setUVBounds(const SkIRect& uvBounds) {
         fUVBounds.set(SkIntToScalar(uvBounds.fLeft), SkIntToScalar(uvBounds.fTop),
             SkIntToScalar(uvBounds.fRight), SkIntToScalar(uvBounds.fBottom));
     }
 
-    virtual void next(const SkPoint& loc, int u, int v, SkPath* dst)
-    {
+    void addPath(const SkPoint& loc, int u, int v, SkPath* dst) {
         fLoc = loc;
         fU = u;
         fV = v;
         SkDrawPath* drawPath;
         fMaker->setExtraPropertyCallBack(fDraw->fType, Get2D, this);
         if (fDraw->addPath->isPath()) {
             drawPath = (SkDrawPath*) fDraw->addPath;
         } else {
             SkApply* apply = (SkApply*) fDraw->addPath;
             apply->refresh(*fMaker);
@@ skipping 16 matching lines @@
             if (matrix) {
                 dst->addPath(drawPath->getPath(), matrix->getMatrix());
                 goto clearCallBack;
             }
         }
         dst->addPath(drawPath->getPath());
 clearCallBack:
         fMaker->clearExtraPropertyCallBack(fDraw->fType);
     }
 
-private:
-
     static bool Get2D(const char* token, size_t len, void* s2D, SkScriptValue* value) {
         static const char match[] = "locX|locY|left|top|right|bottom|u|v" ;
         SkShape2DPathEffect* shape2D = (SkShape2DPathEffect*) s2D;
         int index;
         if (SkAnimatorScript::MapEnums(match, token, len, &index) == false)
             return false;
         SkASSERT((sizeof(SkPoint) +     sizeof(SkRect)) / sizeof(SkScalar) == 6);
         if (index < 6) {
             value->fType = SkType_Float;
             value->fOperand.fScalar = (&shape2D->fLoc.fX)[index];
@@ skipping 212 matching lines @@
 
 void InitializeSkExtraPathEffects(SkAnimator* animator) {
     animator->addExtras(new SkExtraPathEffects(animator));
 }
 
 ////////////////
 
 
 SkExtras::SkExtras() : fExtraCallBack(NULL), fExtraStorage(NULL) {
 }