deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

tools/skhello.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 "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
@@ skipping 63 matching lines @@
     }
 
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setTextSize(SkIntToScalar(30));
     paint.setTextAlign(SkPaint::kCenter_Align);
 
     SkScalar width = paint.measureText(text.c_str(), text.size());
     SkScalar spacing = paint.getFontSpacing();
 
-    int w = SkScalarRound(width) + 30;
-    int h = SkScalarRound(spacing) + 30;
+    int w = SkScalarRoundToInt(width) + 30;
+    int h = SkScalarRoundToInt(spacing) + 30;
 
     static const struct {
         bool (*fProc)(int w, int h, const char path[], const char text[],
                       const SkPaint&);
         const char* fSuffix;
     } gRec[] = {
         { do_surface, ".png" },
         { do_document, ".pdf" },
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
         SkString file;
         file.printf("%s%s", path.c_str(), gRec[i].fSuffix);
         if (!gRec[i].fProc(w, h, file.c_str(), text.c_str(), paint)) {
             return -1;
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif