Bmp Image Decoding

src/codec/SkCodec_libpng.cpp

Index: src/codec/SkCodec_libpng.cpp
diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkCodec_libpng.cpp
index 3d8d4b5634f72f14f3e9f90d945f956064d6f483..af3a4ec28c478a959ed175d731a8dcb637b85a2f 100644
--- a/src/codec/SkCodec_libpng.cpp
+++ b/src/codec/SkCodec_libpng.cpp
@@ -445,10 +445,10 @@ SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void*
     // made in the factory.
     png_read_update_info(fPng_ptr, fInfo_ptr);
 
+    const int bpp = SkSwizzler::BytesPerPixel(sc);
     if (numberPasses > 1) {
         const int width = requestedInfo.width();
         const int height = requestedInfo.height();
-        const int bpp = SkSwizzler::BytesPerPixel(sc);
         const size_t rowBytes = width * bpp;
 
         storage.reset(width * height * bpp);
@@ -466,15 +466,17 @@ SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void*
         // Now swizzle it.
         uint8_t* row = base;
         for (int y = 0; y < height; y++) {
-            reallyHasAlpha |= swizzler->next(row);
+            reallyHasAlpha |=
+                    (SkSwizzler::kOpaque_ResultAlpha != swizzler->next(row));
             row += rowBytes;
         }
     } else {
-        storage.reset(requestedInfo.width() * SkSwizzler::BytesPerPixel(sc));
+        storage.reset(requestedInfo.width() * bpp);
         uint8_t* srcRow = static_cast<uint8_t*>(storage.get());
         for (int y = 0; y < requestedInfo.height(); y++) {
             png_read_rows(fPng_ptr, &srcRow, png_bytepp_NULL, 1);
-            reallyHasAlpha |= swizzler->next(srcRow);
+            reallyHasAlpha |=
+                    (SkSwizzler::kOpaque_ResultAlpha != swizzler->next(srcRow));
         }
     }