Request legacy mode behavior from SkCodec in BitmapRegionDecoder

src/android/SkBitmapRegionCodec.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 "SkAndroidCodec.h"
 #include "SkBitmapRegionCodec.h"
 #include "SkBitmapRegionDecoderPriv.h"
@@ skipping 34 matching lines @@
     // Ask the codec for a scaled subset
     if (!fCodec->getSupportedSubset(&subset)) {
         SkCodecPrintf("Error: Could not get subset.\n");
         return false;
     }
     SkISize scaledSize = fCodec->getSampledSubsetDimensions(sampleSize, subset);
 
     // Create the image info for the decode
     SkColorType dstColorType = fCodec->computeOutputColorType(prefColorType);
     SkAlphaType dstAlphaType = fCodec->computeOutputAlphaType(requireUnpremul);
-    SkImageInfo decodeInfo = fCodec->getInfo().makeWH(scaledSize.width(), scaledSize.height())
-                                              .makeColorType(dstColorType)
-                                              .makeAlphaType(dstAlphaType);
+
+    // Enable legacy behavior to avoid any gamma correction.  Android's assets are
+    // adjusted to expect a non-gamma correct premultiply.
+    sk_sp<SkColorSpace> colorSpace = nullptr;
+    SkImageInfo decodeInfo = SkImageInfo::Make(scaledSize.width(), scaledSize.height(),
+                                               dstColorType, dstAlphaType, colorSpace);
 
     // Construct a color table for the decode if necessary
     SkAutoTUnref<SkColorTable> colorTable(nullptr);
     int maxColors = 256;
     SkPMColor colors[256];
     if (kIndex_8_SkColorType == dstColorType) {
         colorTable.reset(new SkColorTable(colors, maxColors));
     }
 
     // Initialize the destination bitmap
@@ skipping 59 matching lines @@
     if (kIndex_8_SkColorType == dstColorType) {
         colorTable->dangerous_overwriteColors(colors, maxColors);
     }
 
     return true;
 }
 
 bool SkBitmapRegionCodec::conversionSupported(SkColorType colorType) {
     return conversion_possible(fCodec->getInfo().makeColorType(colorType), fCodec->getInfo());
 }