remove (unused) scale parameter from measureText

samplecode/SampleMeasure.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"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "Sk1DPathEffect.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"
 #include "SkRandom.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkDither.h"
 
 // exercise scale/linear/devkern
 struct Setting {
-    SkScalar    fScale;
     bool        fLinearText;
     bool        fDevKernText;
 };
 
-static const SkScalar ONE = SkIntToScalar(9999)/10000;
-
 static const Setting gSettings[] = {
-    { 0,            false,  false   },
-    { 0,            false,  true    },
-    { 0,            true,   false   },
-    { 0,            true,   true    },
-    { ONE,   false,  false   },
-    { ONE,   false,  true    },
-    { ONE,   true,   false   },
-    { ONE,   true,   true    }
+    { false,  false   },
+    { false,  true    },
+    { true,   false   },
+    { true,   true    },
 };
 
 static void doMeasure(SkCanvas* canvas, const SkPaint& paint, const char text[]) {
     SkScalar    dy = paint.getFontMetrics(NULL);
 
     size_t      len = strlen(text);
     SkAutoTMalloc<SkScalar> autoWidths(len);
     SkScalar*   widths = autoWidths.get();
     SkAutoTMalloc<SkRect> autoRects(len);
     SkRect*     rects = autoRects.get();
     SkRect      bounds;
 
     SkPaint p(paint);
     for (size_t i = 0; i < SK_ARRAY_COUNT(gSettings); i++) {
         p.setLinearText(gSettings[i].fLinearText);
         p.setDevKernText(gSettings[i].fDevKernText);
-        SkScalar scale = gSettings[i].fScale;
 
         int n = p.getTextWidths(text, len, widths, rects);
-        SkScalar w = p.measureText(text, len, &bounds, scale);
+        SkScalar w = p.measureText(text, len, &bounds);
 
         p.setStyle(SkPaint::kFill_Style);
         p.setColor(0x8888FF88);
         canvas->drawRect(bounds, p);
         p.setColor(0xFF000000);
         canvas->drawText(text, len, 0, 0, p);
 
         p.setStyle(SkPaint::kStroke_Style);
         p.setStrokeWidth(0);
         p.setColor(0xFFFF0000);
@@ skipping 40 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new MeasureView; }
 static SkViewRegister reg(MyFactory);