commit ca425d9fd9a35e2edd6ebdeb97f0cb88b341ef5b
author sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 23 14:37:38 2013 +0000
committer sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 23 14:37:38 2013 +0000
tree 09eef35a221acd5ebe7d112aacba067084e31f78
parent 580a17241c51712f26441c6551c773e3769738e9

Build fix

git-svn-id: http://skia.googlecode.com/svn/trunk@8826 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/DisplacementBench.cpp

diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index 32495cb..b900b58 100644
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -10,10 +10,10 @@
 #include "SkDevice.h"
 #include "SkDisplacementMapEffect.h"
 
-#define FILTER_WIDTH_SMALL  SkIntToScalar(32)
-#define FILTER_HEIGHT_SMALL SkIntToScalar(32)
-#define FILTER_WIDTH_LARGE  SkIntToScalar(256)
-#define FILTER_HEIGHT_LARGE SkIntToScalar(256)
+#define FILTER_WIDTH_SMALL  32
+#define FILTER_HEIGHT_SMALL 32
+#define FILTER_WIDTH_LARGE  256
+#define FILTER_HEIGHT_LARGE 256
 
 class DisplacementBaseBench : public SkBenchmark {
 public:

bench/MagnifierBench.cpp

diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp
index af507ac..c94898d 100644
--- a/bench/MagnifierBench.cpp
+++ b/bench/MagnifierBench.cpp
@@ -10,10 +10,10 @@
 #include "SkMagnifierImageFilter.h"
 #include "SkRandom.h"
 
-#define FILTER_WIDTH_SMALL  SkIntToScalar(32)
-#define FILTER_HEIGHT_SMALL SkIntToScalar(32)
-#define FILTER_WIDTH_LARGE  SkIntToScalar(256)
-#define FILTER_HEIGHT_LARGE SkIntToScalar(256)
+#define FILTER_WIDTH_SMALL  32
+#define FILTER_HEIGHT_SMALL 32
+#define FILTER_WIDTH_LARGE  256
+#define FILTER_HEIGHT_LARGE 256
 
 class MagnifierBench : public SkBenchmark {
 public:

bench/MergeBench.cpp

diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index d74c4c2..eff32b8 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -6,7 +6,6 @@
  */
 #include "SkBenchmark.h"
 #include "SkBitmapSource.h"
-#include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkMergeImageFilter.h"