diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:39:56 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:39:56 +0000 |
| commit | 7bb36ab259cd856ec8f03d2d377a34899c0ae51f (patch) | |
| tree | a216380be4800db895b37b2e012ec723c73155e8 | |
| parent | 9c9d4a70028ef8dc33a46cfc0b22e254443effe3 (diff) | |
Fix build.
Use SkIntToScalar.
Reflect that 8888 can be copied to 4444 in BitmapCopyTest.
Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@10623 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gm/copyTo4444.cpp | 2 | ||||
| -rw-r--r-- | tests/BitmapCopyTest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gm/copyTo4444.cpp b/gm/copyTo4444.cpp index b3dceed639..4efe00b6dc 100644 --- a/gm/copyTo4444.cpp +++ b/gm/copyTo4444.cpp @@ -41,7 +41,7 @@ protected: } canvas->drawBitmap(bm, 0, 0); SkAssertResult(bm.copyTo(&bm4444, SkBitmap::kARGB_4444_Config)); - canvas->drawBitmap(bm4444, bm.width(), 0); + canvas->drawBitmap(bm4444, SkIntToScalar(bm.width()), 0); } private: diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp index 10e5163dbb..88ce577f68 100644 --- a/tests/BitmapCopyTest.cpp +++ b/tests/BitmapCopyTest.cpp @@ -244,7 +244,7 @@ static void TestBitmapCopy(skiatest::Reporter* reporter) { { SkBitmap::kIndex8_Config, "00111010" }, { SkBitmap::kRGB_565_Config, "00101010" }, { SkBitmap::kARGB_4444_Config, "00101110" }, - { SkBitmap::kARGB_8888_Config, "00101010" }, + { SkBitmap::kARGB_8888_Config, "00101110" }, }; static const bool isExtracted[] = { |