Type warning fix for: Add string art GM and sample.

samplecode/SampleStringArt.cpp

 /*
  * Copyright 2013 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 "SkCanvas.h"
 
 // Reproduces https://code.google.com/p/chromium/issues/detail?id=279014
@@ skipping 19 matching lines @@
     virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         SkScalar angle = fAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI);
 
         SkPoint center = SkPoint::Make(SkScalarHalf(this->width()), SkScalarHalf(this->height()));
         SkScalar length = 5;
         SkScalar step = angle;
 
         SkPath path;
         path.moveTo(center);
 
-        while (length < (SkScalarHalf(SkMin32(this->width(), this->height())) - 10.f))
+        while (length < (SkScalarHalf(SkMinScalar(this->width(), this->height())) - 10.f))
         {
             SkPoint rp = SkPoint::Make(length*SkScalarCos(step) + center.fX,
                                        length*SkScalarSin(step) + center.fY);
             path.lineTo(rp);
             length += SkScalarDiv(angle, SkScalarHalf(SK_ScalarPI));
             step += angle;
         }
         path.close();
 
         SkPaint paint;
@@ skipping 12 matching lines @@
 private:
 
     SkScalar fAngle;
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new StringArtView; }
 static SkViewRegister reg(MyFactory);