Change the PKM decoder to adhere to sampler size

src/images/SkImageDecoder_pkm.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
+#include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamHelpers.h"
 #include "SkTypes.h"
 
 #include "etc1.h"
 
 class SkPKMImageDecoder : public SkImageDecoder {
 public:
     SkPKMImageDecoder() { }
 
@@ skipping 23 matching lines @@
     SkASSERT(etc1_pkm_is_valid(buf));
 
     const unsigned short width = etc1_pkm_get_width(buf);
     const unsigned short height = etc1_pkm_get_height(buf);
 
     // should we allow the Chooser (if present) to pick a config for us???
     if (!this->chooseFromOneChoice(SkBitmap::kARGB_8888_Config, width, height)) {
         return false;
     }
 
-    bm->setConfig(SkBitmap::kARGB_8888_Config, width, height, 0, kOpaque_SkAlphaType);
+    // Setup the sampler...

[robertphillips, 2014/05/23 17:55:20]

this->getSampleSize() ??

[krajcevski, 2014/05/23 18:06:43]

Done.

+    SkScaledBitmapSampler sampler(width, height, getSampleSize());
+
+    // Set the config...
+    bm->setConfig(SkBitmap::kARGB_8888_Config, sampler.scaledWidth(), sampler.scaledHeight(),
+                  0, kOpaque_SkAlphaType);
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return true;
     }
 
     if (!this->allocPixelRef(bm, NULL)) {
         return false;
     }
 
     // Lock the pixels, since we're about to write to them...
     SkAutoLockPixels alp(*bm);
 
+    if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
+        return false;
+    }
+     
     // Advance buffer past the header
     buf += ETC_PKM_HEADER_SIZE;
 
     // ETC1 Data is encoded as RGB pixels, so we should extract it as such
     int nPixels = width * height;
     SkAutoMalloc outRGBData(nPixels * 3);
     etc1_byte *outRGBDataPtr = reinterpret_cast<etc1_byte *>(outRGBData.get());
 
     // Decode ETC1
     if (etc1_decode_image(buf, outRGBDataPtr, width, height, 3, width*3)) {
         return false;
     }
 
     // Set each of the pixels...
-    const uint8_t *src = reinterpret_cast<uint8_t *>(outRGBDataPtr);
-    uint8_t *dst = reinterpret_cast<uint8_t *>(bm->getPixels());
-    for (int i = 0; i < width*height; ++i) {
-        *dst++ = src[2]; // B
-        *dst++ = src[1]; // G
-        *dst++ = src[0]; // R
-        *dst++ = 0xFF; // Opaque alpha...
-        src += 3;
+    const int srcRowBytes = width * 3;
+    const int dstHeight = sampler.scaledHeight();
+    const uint8_t *srcRow = reinterpret_cast<uint8_t *>(outRGBDataPtr);
+    srcRow += sampler.srcY0() * srcRowBytes;

[robertphillips, 2014/05/23 17:55:20]

++y ?

[krajcevski, 2014/05/23 18:06:43]

Done.

+    for (int y = 0; y < dstHeight; y++) {
+        sampler.next(srcRow);
+        srcRow += sampler.srcDY() * srcRowBytes;
     }
 
     return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 DEFINE_DECODER_CREATOR(PKMImageDecoder);
 /////////////////////////////////////////////////////////////////////////////////////////
 
 static bool is_pkm(SkStreamRewindable* stream) {
@@ skipping 16 matching lines @@
 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
 
 static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
         return SkImageDecoder::kPKM_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm);