commit fdb788cbfcdccac65d8d1f535920c7f2fdba1ead
author msarett <msarett@google.com> Wed Jul 29 10:37:29 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 29 10:37:29 2015 -0700
tree 00d89467200297be78716474ae40e82ae16c39da
parent aa2f65818dd626f87bb011c993a03015eb29db50

Make SkSwizzler::Fill() support 565

BUG=skia:4135

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

src/codec/SkJpegCodec.cpp

diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index 5acc0b3..84e90d4 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -354,7 +354,14 @@
             // the fill color for opaque images.  If the destination is kGray,
             // the low 8 bits of SK_ColorBLACK will be used.  Conveniently,
             // these are zeros, which is the representation for black in kGray.
-            SkSwizzler::Fill(dstRow, dstInfo, dstRowBytes, dstHeight - y, SK_ColorBLACK, NULL);
+            // If the destination is kRGB_565, the low 16 bits of SK_ColorBLACK
+            // will be used.  Conveniently, these are zeros, which is the
+            // representation for black in kRGB_565.
+            if (kNo_ZeroInitialized == options.fZeroInitialized ||
+                    kN32_SkColorType == dstInfo.colorType()) {
+                SkSwizzler::Fill(dstRow, dstInfo, dstRowBytes, dstHeight - y,
+                        SK_ColorBLACK, NULL);
+            }
 
             // Prevent libjpeg from failing on incomplete decode
             dinfo->output_scanline = dstHeight;
@@ -382,9 +389,11 @@
  */
 class SkJpegScanlineDecoder : public SkScanlineDecoder {
 public:
-    SkJpegScanlineDecoder(const SkImageInfo& dstInfo, SkJpegCodec* codec)
+    SkJpegScanlineDecoder(const SkImageInfo& dstInfo, SkJpegCodec* codec,
+            const SkCodec::Options& opts)
         : INHERITED(dstInfo)
         , fCodec(codec)
+        , fOpts(opts)
     {}
 
     virtual ~SkJpegScanlineDecoder() {
@@ -412,8 +421,11 @@
             uint32_t rowsDecoded =
                     turbo_jpeg_read_scanlines(fCodec->fDecoderMgr->dinfo(), &dstRow, 1);
             if (rowsDecoded != 1) {
-                SkSwizzler::Fill(
-                        dstRow, this->dstInfo(), rowBytes, count - y, SK_ColorBLACK, NULL);
+                if (SkCodec::kNo_ZeroInitialized == fOpts.fZeroInitialized ||
+                        kN32_SkColorType == this->dstInfo().colorType()) {
+                    SkSwizzler::Fill(dstRow, this->dstInfo(), rowBytes,
+                            count - y, SK_ColorBLACK, NULL);
+                }
                 fCodec->fDecoderMgr->dinfo()->output_scanline = this->dstInfo().height();
                 return SkCodec::kIncompleteInput;
             }
@@ -452,6 +464,7 @@
 
 private:
     SkAutoTDelete<SkJpegCodec> fCodec;
+    const SkCodec::Options&    fOpts;
 
     typedef SkScanlineDecoder INHERITED;
 };
@@ -499,5 +512,5 @@
     }
 
     // Return the new scanline decoder
-    return SkNEW_ARGS(SkJpegScanlineDecoder, (dstInfo, codec.detach()));
+    return SkNEW_ARGS(SkJpegScanlineDecoder, (dstInfo, codec.detach(), options));
 }