Make sure the color profile propagetes through the system.
authorherb <herb@google.com>
Thu, 14 Apr 2016 20:58:05 +0000 (13:58 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 14 Apr 2016 20:58:05 +0000 (13:58 -0700)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1892543002

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

src/core/SkBitmap.cpp

index 7e8e62e88b2c684adb5573a782da5cd06c47d73a..3bb763b4f43cf65f7117dbcdb79cbe8f444b79bb 100644 (file)
@@ -747,8 +747,7 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
         SkPixelRef* pixelRef = fPixelRef->deepCopy(this->colorType(), this->profileType(), &subset);
         if (pixelRef != nullptr) {
             SkBitmap dst;
-            dst.setInfo(SkImageInfo::Make(subset.width(), subset.height(),
-                                          this->colorType(), this->alphaType()));
+            dst.setInfo(this->info().makeWH(subset.width(), subset.height()));
             dst.setIsVolatile(this->isVolatile());
             dst.setPixelRef(pixelRef)->unref();
             SkDEBUGCODE(dst.validate());
@@ -763,8 +762,7 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
     SkASSERT(static_cast<unsigned>(r.fTop) < static_cast<unsigned>(this->height()));
 
     SkBitmap dst;
-    dst.setInfo(SkImageInfo::Make(r.width(), r.height(), this->colorType(), this->alphaType()),
-                this->rowBytes());
+    dst.setInfo(this->info().makeWH(r.width(), r.height()), this->rowBytes());
     dst.setIsVolatile(this->isVolatile());
 
     if (fPixelRef) {