From 2d6388550ed2afefb14fd0bf73255936faa2a703 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 9 Jun 2009 21:06:14 +0000 Subject: Fix a unit test failure. One of the tests sends an empty bitmap through this function, which has no config, and the assertion fails. I just removed the assretion, we assume ARGB8888 everywhere. Review URL: http://codereview.chromium.org/118456 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17976 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/ext/image_operations.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'skia/ext/image_operations.cc') diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index 1924369..cb4a29c 100644 --- a/skia/ext/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -626,8 +626,6 @@ SkBitmap ImageOperations::CreateTiledBitmap(const SkBitmap& source, // static SkBitmap ImageOperations::DownsampleByTwo(const SkBitmap& bitmap) { - DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); - // Handle the nop case. if (bitmap.width() <= 1 || bitmap.height() <= 1) return bitmap; @@ -678,7 +676,7 @@ SkBitmap ImageOperations::DownsampleByTwo(const SkBitmap& bitmap) { ag += (tmp >> 8) & 0xFF00FF; rb += tmp & 0xFF00FF; - // PUt the channels back together, dividing each by 4 to get the average. + // Put the channels back together, dividing each by 4 to get the average. // |ag| has the alpha and green channels shifted right by 8 bits from // there they should end up, so shifting left by 6 gives them in the // correct position divided by 4. -- cgit v1.1