Pass the destination pointer to next

src/codec/SkCodec_libbmp.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec_libbmp.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 741 matching lines @@
     const int height = dstInfo.height();
     const size_t rowBytes = SkAlign4(compute_row_bytes(width, fBitsPerPixel));
 
     // Allocate a buffer large enough to hold the full image
     SkAutoTDeleteArray<uint8_t>
         srcBuffer(SkNEW_ARRAY(uint8_t, height*rowBytes));
     uint8_t* srcRow = srcBuffer.get();
 
     // Create the swizzler
     SkAutoTDelete<SkMaskSwizzler> maskSwizzler(
-            SkMaskSwizzler::CreateMaskSwizzler(dstInfo, dst, dstRowBytes,
-            fMasks, fBitsPerPixel));
+            SkMaskSwizzler::CreateMaskSwizzler(dstInfo, fMasks, fBitsPerPixel));
 
     // Iterate over rows of the image
     bool transparent = true;
     for (int y = 0; y < height; y++) {
         // Read a row of the input
         if (stream()->read(srcRow, rowBytes) != rowBytes) {
             SkCodecPrintf("Warning: incomplete input stream.\n");
             // Fill the destination image on failure
             SkPMColor fillColor = dstInfo.alphaType() == kOpaque_SkAlphaType ?
                     SK_ColorBLACK : SK_ColorTRANSPARENT;
             if (kNo_ZeroInitialized == opts.fZeroInitialized || 0 != fillColor) {
                 void* dstStart = get_dst_start_row(dst, dstRowBytes, y, fRowOrder);
                 SkSwizzler::Fill(dstStart, dstInfo, dstRowBytes, dstInfo.height() - y, fillColor,
                         NULL);
             }
             return kIncompleteInput;
         }
 
         // Decode the row in destination format
         int row = kBottomUp_RowOrder == fRowOrder ? height - 1 - y : y;
-        SkSwizzler::ResultAlpha r = maskSwizzler->next(srcRow, row);
+        void* dstRow = SkTAddOffset<void>(dst, dstRowBytes * row);
+        SkSwizzler::ResultAlpha r = maskSwizzler->next(srcRow, dstRow);
         transparent &= SkSwizzler::IsTransparent(r);
 
         // Move to the next row
         srcRow = SkTAddOffset<uint8_t>(srcRow, rowBytes);
     }
 
     // Some fully transparent bmp images are intended to be opaque.  Here, we
     // correct for this possibility.
     if (transparent) {
         const SkImageInfo& opaqueInfo =
                 dstInfo.makeAlphaType(kOpaque_SkAlphaType);
         SkAutoTDelete<SkMaskSwizzler> opaqueSwizzler(
-                SkMaskSwizzler::CreateMaskSwizzler(opaqueInfo, dst, dstRowBytes,
-                                                   fMasks, fBitsPerPixel));
+                SkMaskSwizzler::CreateMaskSwizzler(opaqueInfo, fMasks,
+                                                   fBitsPerPixel));

[scroggo, 2015/07/27 20:42:06]

nit: Can this fit on the previous line now?

[msarett, 2015/07/27 21:11:33]

Yes!

         srcRow = srcBuffer.get();
         for (int y = 0; y < height; y++) {
             // Decode the row in opaque format
             int row = kBottomUp_RowOrder == fRowOrder ? height - 1 - y : y;
-            opaqueSwizzler->next(srcRow, row);
+            void* dstRow = SkTAddOffset<void>(dst, dstRowBytes * row);
+            opaqueSwizzler->next(srcRow, dstRow);
 
             // Move to the next row
             srcRow = SkTAddOffset<uint8_t>(srcRow, rowBytes);
         }
     }
 
     // Finished decoding the entire image
     return kSuccess;
 }
 
@@ skipping 313 matching lines @@
         default:
             SkASSERT(false);
             return kInvalidInput;
     }
 
     // Get a pointer to the color table if it exists
     const SkPMColor* colorPtr = NULL != fColorTable.get() ? fColorTable->readColors() : NULL;
 
     // Create swizzler
     SkAutoTDelete<SkSwizzler> swizzler(SkSwizzler::CreateSwizzler(config,
-            colorPtr, dstInfo, dst, dstRowBytes, kNo_ZeroInitialized));
+            colorPtr, dstInfo, kNo_ZeroInitialized));
 
     // Allocate space for a row buffer and a source for the swizzler
     SkAutoTDeleteArray<uint8_t> srcBuffer(SkNEW_ARRAY(uint8_t, rowBytes));
 
     // Iterate over rows of the image
     // FIXME: bool transparent = true;
     for (int y = 0; y < height; y++) {
         // Read a row of the input
         if (stream()->read(srcBuffer.get(), rowBytes) != rowBytes) {
             SkCodecPrintf("Warning: incomplete input stream.\n");
             // Fill the destination image on failure
             if (kNo_ZeroInitialized == opts.fZeroInitialized || !zeroFill) {
                 void* dstStart = get_dst_start_row(dst, dstRowBytes, y, fRowOrder);
                 SkSwizzler::Fill(dstStart, dstInfo, dstRowBytes, dstInfo.height() - y,
                         fillColorOrIndex, colorPtr);
             }
             return kIncompleteInput;
         }
 
         // Decode the row in destination format
         uint32_t row;
         if (kTopDown_RowOrder == fRowOrder) {
             row = y;
         } else {
             row = height - 1 - y;
         }
 
-        swizzler->next(srcBuffer.get(), row);
+        void* dstRow = SkTAddOffset<void>(dst, dstRowBytes * row);
+        swizzler->next(srcBuffer.get(), dstRow);
         // FIXME: SkSwizzler::ResultAlpha r =
         //        swizzler->next(srcBuffer.get(), row);
         // FIXME: transparent &= SkSwizzler::IsTransparent(r);
     }
 
     // FIXME: This code exists to match the behavior in the chromium decoder
     // and to follow the bmp specification as it relates to alpha masks.  It is
     // commented out because we have yet to discover a test image that provides
     // an alpha mask and uses this decode mode.
 
@@ skipping 49 matching lines @@
                 uint32_t alphaBit =
                         (srcBuffer.get()[quotient] >> shift) & 0x1;
                 dstRow[x] &= alphaBit - 1;
             }
         }
     }
 
     // Finished decoding the entire image
     return kSuccess;
 }