commit 6ba4572eed5a4ecfdd22d118fa55b5c06902b574
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jun 21 18:30:53 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jun 21 18:30:53 2013 +0000
tree ccb8c5501a48f4687d7dbece92805771a01fa121
parent 5f99545de67ee729b4b17f1aae56f8c9dcf460f9

remove dst/rendertarget support for kARGB_4444_Config

BUG=

Review URL: https://codereview.chromium.org/17335008

git-svn-id: http://skia.googlecode.com/svn/trunk@9727 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index b53e4bc..da7bff8 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -793,17 +793,11 @@
             }
             break;
         }
-        case kARGB_4444_Config:
         case kRGB_565_Config: {
             uint16_t* p = (uint16_t*)fPixels;
-            uint16_t v;
-
-            if (kARGB_4444_Config == fConfig) {
-                v = SkPackARGB4444(a >> 4, r >> 4, g >> 4, b >> 4);
-            } else {    // kRGB_565_Config
-                v = SkPackRGB16(r >> (8 - SK_R16_BITS), g >> (8 - SK_G16_BITS),
-                                b >> (8 - SK_B16_BITS));
-            }
+            uint16_t v = SkPackRGB16(r >> (8 - SK_R16_BITS),
+                                     g >> (8 - SK_G16_BITS),
+                                     b >> (8 - SK_B16_BITS));
             while (--height >= 0) {
                 sk_memset16(p, v, width);
                 p = (uint16_t*)((char*)p + rowBytes);
@@ -1005,12 +999,12 @@
     bool sameConfigs = (this->config() == dstConfig);
     switch (dstConfig) {
         case kA8_Config:
-        case kARGB_4444_Config:
         case kRGB_565_Config:
         case kARGB_8888_Config:
             break;
         case kA1_Config:
         case kIndex8_Config:
+        case kARGB_4444_Config:
             if (!sameConfigs) {
                 return false;
             }