Allow decoding JPEG into A8.

src/images/SkImageDecoder.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkBitmap.h"
@@ skipping 127 matching lines @@
     return bitmap->allocPixels(fAllocator, ctable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkImageDecoder::setPrefConfigTable(const SkBitmap::Config pref[6]) {
     if (NULL == pref) {
         fUsePrefTable = false;
     } else {
         fUsePrefTable = true;
-        memcpy(fPrefTable, pref, sizeof(fPrefTable));
+        fPrefTable.f8Index_NoAlpha = pref[0];
+        fPrefTable.f8Index_YesAlpha = pref[1];
+        fPrefTable.f8Gray = SkBitmap::kNo_Config;
+        fPrefTable.f16bit_NoAlpha = pref[2];
+        fPrefTable.f16bit_YesAlpha = pref[3];
+        fPrefTable.f32_24bit_NoAlpha = pref[4];
+        fPrefTable.f32_24bit_YesAlpha = pref[5];
     }
 }
 
+void SkImageDecoder::setPrefConfigTable(const PrefConfigTable& prefTable) {
+    fUsePrefTable = true;
+    fPrefTable = prefTable;
+}
+
 SkBitmap::Config SkImageDecoder::getPrefConfig(SrcDepth srcDepth,
                                                bool srcHasAlpha) const {
     SkBitmap::Config config;
 
     if (fUsePrefTable) {
-        int index = 0;
         switch (srcDepth) {
             case kIndex_SrcDepth:
-                index = 0;
+                config = srcHasAlpha ? fPrefTable.f8Index_YesAlpha
+                                     : fPrefTable.f8Index_NoAlpha;
+                break;
+            case k8BitGray_SrcDepth:
+                config = fPrefTable.f8Gray;
                 break;
             case k16Bit_SrcDepth:
-                index = 2;
+                config = srcHasAlpha ? fPrefTable.f16bit_YesAlpha
+                                     : fPrefTable.f16bit_NoAlpha;
                 break;
             case k32Bit_SrcDepth:
-                index = 4;
+                config = srcHasAlpha ? fPrefTable.f32_24bit_YesAlpha
+                                     : fPrefTable.f32_24bit_NoAlpha;
                 break;
         }
-        if (srcHasAlpha) {
-            index += 1;
-        }
-        config = fPrefTable[index];
     } else {
         config = fDefaultPref;
     }
 
     if (SkBitmap::kNo_Config == config) {
         config = SkImageDecoder::GetDeviceConfig();
     }
     return config;
 }
 
@@ skipping 271 matching lines @@
             if (kUnknown_Format == *format) {
                 if (stream->rewind()) {
                     *format = GetStreamFormat(stream);
                 }
             }
         }
         delete codec;
     }
     return success;
 }