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
This commit is contained in:
scroggo@google.com 2013-08-07 19:39:56 +00:00
parent 9c9d4a7002
commit 7bb36ab259
2 changed files with 2 additions and 2 deletions

View File

@ -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:

View File

@ -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[] = {