***Disables swizzles to 565.

We may want to enable swizzles to 565
for images that are encoded in a format
similar to 565, however, we do not want
to take images that decode naturally to
kN32 and then convert them to 565.

***Enable swizzles to kIndex_8.  For images
encoded in a color table format, we suggest
that they be decoded to kIndex_8.  When we
decode, we only allow conversion to kIndex_8
if it matches the suggested color type (except
wbmp which seems good as is).

***Modify dm to test images that decode to
kIndex_8.

BUG=skia:3257
BUG=skia:3440

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h
index 103839b314..e9bcd043b4 100644
--- a/src/codec/SkCodec_libpng.h
+++ b/src/codec/SkCodec_libpng.h
@@ -49,10 +49,10 @@ private:
 
     // Helper to set up swizzler and color table. Also calls png_read_update_info.
     Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst,
-                              size_t rowBytes, const Options&);
+                              size_t rowBytes, const Options&, int* ctableCount);
     // Calls rewindIfNeeded, and returns true if the decoder can continue.
     bool handleRewind();
-    bool decodePalette(bool premultiply);
+    bool decodePalette(bool premultiply, int bitDepth, int* ctableCount);
     void finish();
     void destroyReadStruct();