diff options
| -rw-r--r-- | skia/ext/image_operations_unittest.cc | 12 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index 3699685..b422371 100644 --- a/skia/ext/image_operations_unittest.cc +++ b/skia/ext/image_operations_unittest.cc @@ -178,13 +178,13 @@ TEST(ImageOperations, CreateBlendedBitmap) { for (int y = 0; y < src_h; y++) { for (int x = 0; x < src_w; x++) { int i = y * src_w + x; - EXPECT_EQ((255 + ((255 - i) % 255)) / 2, + EXPECT_EQ(static_cast<unsigned int>((255 + ((255 - i) % 255)) / 2), SkColorGetA(*blended.getAddr32(x, y))); - EXPECT_EQ(i % 255 / 2, + EXPECT_EQ(static_cast<unsigned int>(i % 255 / 2), SkColorGetR(*blended.getAddr32(x, y))); - EXPECT_EQ(((i * 2) % 255 + (i * 4) % 255) / 2, + EXPECT_EQ((static_cast<unsigned int>((i * 2) % 255 + (i * 4) % 255) / 2), SkColorGetG(*blended.getAddr32(x, y))); - EXPECT_EQ(i % 255 / 2, + EXPECT_EQ(static_cast<unsigned int>(i % 255 / 2), SkColorGetB(*blended.getAddr32(x, y))); } } @@ -223,7 +223,7 @@ TEST(ImageOperations, CreateMaskedBitmap) { SkColor masked_pixel = *masked.getAddr32(x, y); // Test that the alpha is equal. - int alpha = (alpha_pixel & 0xff000000) >> SK_A32_SHIFT; + unsigned int alpha = (alpha_pixel & 0xff000000) >> SK_A32_SHIFT; EXPECT_EQ(alpha, (masked_pixel & 0xff000000) >> SK_A32_SHIFT); // Test that the colors are right - SkBitmaps have premultiplied alpha, @@ -511,4 +511,4 @@ TEST(ImageOperations, DownsampleByTwoUntilSize) { // The result should be divided in half 100x43 -> 50x22 -> 25x11 EXPECT_EQ(25, result.width()); EXPECT_EQ(11, result.height()); -}
\ No newline at end of file +} diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 7beab04..8780845 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -538,8 +538,6 @@ 'msvs_disabled_warnings': [ 4800 ], }, { # else: OS!=win 'sources!': [ - '../../../skia/ext/image_operations_unittest.cc', - '../../../skia/ext/skia_utils_unittest.cc', '../../../skia/ext/vector_canvas_unittest.cc', '../webcore_unit_tests/UniscribeHelper_unittest.cpp', '../webcore_unit_tests/TransparencyWin_unittest.cpp', |