Fill incomplete images in SkCodec parent class

src/codec/SkCodecPriv.h

 /*
  * Copyright 2015 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 SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
+#include "SkColorPriv.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
 #include "SkSwizzler.h"
 #include "SkTypes.h"
 #include "SkUtils.h"
 
 /*
  *
  * Helper routine for alpha result codes
  *
@@ skipping 111 matching lines @@
 }
 
 /*
  * If there is a color table, get a pointer to the colors, otherwise return nullptr
  */
 static const SkPMColor* get_color_ptr(SkColorTable* colorTable) {
      return nullptr != colorTable ? colorTable->readColors() : nullptr;
 }
 
 /*
+ * Given that the encoded image uses a color table, return the fill value
+ */
+static uint32_t get_color_table_fill_value(SkColorType colorType, const SkPMColor* colorPtr,

[scroggo, 2015/09/22 18:02:48]

inline, not static

[msarett, 2015/09/23 13:22:40]

Yes!  I'll go ahead and fix all of these.

+        uint8_t fillIndex) {
+    SkASSERT(nullptr != colorPtr);
+    switch (colorType) {
+        case kN32_SkColorType:
+            return colorPtr[fillIndex];
+        case kRGB_565_SkColorType:
+            return SkPixel32ToPixel16(colorPtr[fillIndex]);
+        case kIndex_8_SkColorType:
+            return fillIndex;
+        default:
+            SkASSERT(false);
+            return 0;
+    }
+}
+
+/*
  *
  * Copy the codec color table back to the client when kIndex8 color type is requested
  */
 static inline void copy_color_table(const SkImageInfo& dstInfo, SkColorTable* colorTable,
         SkPMColor* inputColorPtr, int* inputColorCount) {
     if (kIndex_8_SkColorType == dstInfo.colorType()) {
         SkASSERT(nullptr != inputColorPtr);
         SkASSERT(nullptr != inputColorCount);
         SkASSERT(nullptr != colorTable);
         memcpy(inputColorPtr, colorTable->readColors(), *inputColorCount * sizeof(SkPMColor));
@@ skipping 23 matching lines @@
         const uint32_t pixelsPerByte = 8 / bitsPerPixel;
         return compute_row_bytes_ppb(width, pixelsPerByte);
     } else {
         SkASSERT(0 == bitsPerPixel % 8);
         const uint32_t bytesPerPixel = bitsPerPixel / 8;
         return compute_row_bytes_bpp(width, bytesPerPixel);
     }
 }
 
 /*
- * On incomplete images, get the color to fill with
- */
-static inline SkPMColor get_fill_color_or_index(SkAlphaType alphaType) {
-    // This condition works properly for all supported output color types.
-    // kIndex8: The low 8-bits of both possible return values is 0, which is
-    //          our desired default index.
-    // kGray8:  The low 8-bits of both possible return values is 0, which is
-    //          black, our desired fill value.
-    // kRGB565: The low 16-bits of both possible return values is 0, which is
-    //          black, our desired fill value.
-    // kN32:    Return black for opaque images and transparent for non-opaque
-    //          images.
-    return kOpaque_SkAlphaType == alphaType ?
-            SK_ColorBLACK : SK_ColorTRANSPARENT;
-}
-
-/*
  * Get a byte from a buffer
  * This method is unsafe, the caller is responsible for performing a check
  */
 static inline uint8_t get_byte(uint8_t* buffer, uint32_t i) {
     return buffer[i];
 }
 
 /*
  * Get a short from a buffer
  * This method is unsafe, the caller is responsible for performing a check
@@ skipping 22 matching lines @@
 #endif
 }
 
 #ifdef SK_PRINT_CODEC_MESSAGES
     #define SkCodecPrintf SkDebugf
 #else
     #define SkCodecPrintf(...)
 #endif
 
 #endif // SkCodecPriv_DEFINED