Revert "Revert "remove kA1_Config, as it is no longer supported""

include/core/SkImageDecoder.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkImageDecoder_DEFINED
@@ skipping 168 matching lines @@
             depth [8, 16, 32/24] -> 0, 2, 4
             alpha [no, yes] -> 0, 1
         The two index values are OR'd together.
             src: 8-index, no-alpha  -> 0
             src: 8-index, yes-alpha -> 1
             src: 16bit,   no-alpha  -> 2    // e.g. 565
             src: 16bit,   yes-alpha -> 3    // e.g. 1555
             src: 32/24,   no-alpha  -> 4
             src: 32/24,   yes-alpha -> 5
      */
-    void setPrefConfigTable(const SkBitmap::Config pref[6]);
+    void setPrefConfigTable(const SkBitmap::Config pref[5]);
 
     /**
      *  Optional table describing the caller's preferred config based on
      *  information about the src data. Each field should be set to the
      *  preferred config for a src described in the name of the field. The
      *  src attributes are described in terms of depth (8-index,
      *  8bit-grayscale, or 8-bits/component) and whether there is per-pixel
      *  alpha (does not apply to grayscale). If the caller has no preference
      *  for a particular src type, its slot should be set to kNo_Config.
      *
@@ skipping 377 matching lines @@
 DECLARE_DECODER_CREATOR(WBMPImageDecoder);
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 
 
 // Typedefs to make registering decoder and formatter callbacks easier.
 // These have to be defined outside SkImageDecoder. :(
 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)>        SkImageDecoder_DecodeReg;
 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecoder_FormatReg;
 
 #endif