More PathUtilsTest.cpp nits

tests/PathUtilsTest.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 "Test.h"
+#include "SkPathUtils.h"
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkPathUtils.h"
 #include "SkRandom.h"
 #include "SkTime.h"
-
-#define SK_NUM_IT 100
+#include "Test.h"
 
 class SkBitmap;

[tfarina, 2013/07/16 18:08:50]

you don't need this forward declaration, since you already include SkBitmap.h

 
+const int kNumIt = 100;
+
 static void fill_random_bits( int chars, char* bits ){

[tfarina, 2013/07/16 18:08:50]

micro-style-nit: no need of whitespace after ( and before ), there are more
cases below.

     SkMWCRandom rand(SkTime::GetMSecs());
 
     for (int i = 0; i < chars; ++i){
         bits[i] = rand.nextU();
     }
 }
 
 static int get_bit( const char* buffer, int x ) {
     int byte = x >> 3;
     int bit = x & 7;
 
     return buffer[byte] & (128 >> bit);
 }
+
 /* // useful for debugging errors
    #include <iostream>

[tfarina, 2013/07/16 18:08:50]

can we move this include above?

Oh, looks like all this code is commented out :(

 static void print_bits( const char* bits, int w, int h) {
 
     for (int y = 0; y < h; ++y) {
         for (int x = 0; x < w; ++x){
             bool bit = get_bit(&bits[y], x)!=0;
             std::cout << bit;
             }
         std::cout << std::endl;
     }
 }
 
 static void print_bmp( SkBitmap* bmp, int w, int h){
 
     for (int y = 0; y < h; ++y) {
         for (int x = 0; x < w; ++x) {
             int d = *bmp->getAddr32(x,y);
             if (d == -1)
                 std::cout << 0;
             else
                 std::cout << 1;
         }
         std::cout << std::endl;
     }
-    }
+}
 */
 
 static void binary_to_skbitmap(const char* bin_bmp, SkBitmap* sk_bmp,
                          int w, int h, int rowBytes){
     //init the SkBitmap
     sk_bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     sk_bmp->allocPixels();
 
     for (int y = 0; y < h; ++y) { // for every row
 
@@ skipping 61 matching lines @@
 }
 
 static void TestPathUtils(skiatest::Reporter* reporter) {
     const int w[] = {4, 8, 12, 16};
     const int h = 8, rowBytes = 4;
 
     char bits[ h * rowBytes ];
     static char* binBmp = &bits[0];
 
     //loop to run randomized test lots of times
-    for (int it = 0; it < SK_NUM_IT; ++it)
+    for (int it = 0; it < kNumIt; ++it)
     {
         // generate a random binary bitmap
         fill_random_bits( h * rowBytes, binBmp); // generate random bitmap
 
         // for each bitmap width, use subset of binary bitmap
         for (unsigned int i = 0; i < SK_ARRAY_COUNT(w); ++i) {
             // generate truth bitmap
             SkBitmap bmpTruth;
             binary_to_skbitmap(binBmp, &bmpTruth, w[i], h, rowBytes);
 
             test_path(reporter, &bmpTruth, binBmp, w[i], h, rowBytes);
             test_region(reporter, &bmpTruth, binBmp, w[i], h, rowBytes);
         }
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("PathUtils", PathUtils, TestPathUtils)