Fix a unit test failure. One of the tests sends an empty bitmap through this...

skia/ext/image_operations.cc

Index: skia/ext/image_operations.cc
===================================================================
--- skia/ext/image_operations.cc	(revision 17971)
+++ skia/ext/image_operations.cc	(working copy)
@@ -626,8 +626,6 @@
 
 // static
 SkBitmap ImageOperations::DownsampleByTwo(const SkBitmap& bitmap) {
-  DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);

[Peter Kasting, 2009/06/09 21:10:46]

Instead of removing this, the right fix seems like moving it below the "nop
case".  That will avoid DCHECKing unless we're actually going to do something
destructive, but still catch the bad case.  The unit tests would pass with that.

-
   // Handle the nop case.
   if (bitmap.width() <= 1 || bitmap.height() <= 1)
     return bitmap;
@@ -678,7 +676,7 @@
       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.