PathUtilsTest valgrind patch

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"
 
@@ skipping 45 matching lines @@
                 *sk_bmp->getAddr32(x,y) = OFF;
             }
         }
     }
 }
 
 static bool test_bmp(skiatest::Reporter* reporter,
                       const SkBitmap* bmp1, const SkBitmap* bmp2,
                       int h, int w) {
     for (int y = 0; y < h; ++y) { // loop through all pixels
         for (int x = 0; x < w; ++x) {

[robertphillips, 2013/07/13 17:01:08]

This change seems correct but makes the test fail

-            REPORTER_ASSERT( reporter, *bmp1->getAddr32(x,y) == *bmp1->getAddr32(x,y) );
+            REPORTER_ASSERT( reporter, *bmp1->getAddr32(x,y) == *bmp2->getAddr32(x,y) );
         }
     }
     return true;
 }
 
 static void test_path_eq(skiatest::Reporter* reporter, const SkPath* path,
                       const SkBitmap* truth, int h, int w){
     // make paint
     SkPaint bmpPaint;
     bmpPaint.setAntiAlias(true);  // Black paint for bitmap
     bmpPaint.setStyle(SkPaint::kFill_Style);
     bmpPaint.setColor(SK_ColorBLACK);
 
     // make bmp
     SkBitmap bmp;
     bmp.setConfig(SkBitmap::kARGB_8888_Config, w, h);
     bmp.allocPixels();
-    SkCanvas(bmp).drawPath(*path, bmpPaint);
+    SkCanvas canvas(bmp);
+    canvas.clear(0xFFFFFFFF);
+    canvas.drawPath(*path, bmpPaint);
 
     // test bmp
     test_bmp(reporter, &bmp, truth, h, w);
 }
 
 static void test_path(skiatest::Reporter* reporter, const SkBitmap* truth,
                             const char* bin_bmp, int h, int w, int stride){
     // make path
     SkPath path;
     SkPathUtils::BitsToPath_Path(&path, bin_bmp, h, w, stride);
@@ skipping 34 matching lines @@
             bin2SkBitmap(bin_bmp, &bmpTruth, h, w[i], stride);
 
             test_path(reporter, &bmpTruth, bin_bmp, h, w[i], stride);
             test_region(reporter, &bmpTruth, bin_bmp, h, w[i], stride);
         }
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("PathUtils", PathUtils, TestPathUtils)