commit 2af6c1204de73a2513189007b9623fec0e296dc2
author halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 13 19:25:21 2013 +0000
committer halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 13 19:25:21 2013 +0000
tree ebda8477f655e62f063450269d794f5e15475ae3
parent 4428734907480cdb4ccecb47152d7be8cd1aec32

Fix win7 BitmapTest

BUG=
R=bungeman@google.com

Review URL: https://codereview.chromium.org/110223005

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

tests/BitmapTest.cpp

diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index a6859fa..250b6da 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -24,7 +24,7 @@
             if (setConf) {
                 REPORTER_ASSERT(reporter, bm.allocPixels(NULL));
             }
-            REPORTER_ASSERT(reporter, (width & height) != bm.empty());
+            REPORTER_ASSERT(reporter, SkToBool(width & height) != bm.empty());
         }
     }
 }