From e5ea500d4714a7d84de2bf913e81be3b65d2de68 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 3 Sep 2014 11:54:58 -0700 Subject: Hide fields in SkImageInfo R=rmistry@google.com TBR=bsalomon Author: reed@google.com Review URL: https://codereview.chromium.org/536003002 --- src/core/SkBitmapDevice.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/core/SkBitmapDevice.cpp') diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index 2287864bae..2711004aef 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -70,11 +70,12 @@ SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& SkBitmapDevice* SkBitmapDevice::Create(const SkImageInfo& origInfo, const SkDeviceProperties* props) { - SkImageInfo info = origInfo; - if (!valid_for_bitmap_device(info, &info.fAlphaType)) { + SkAlphaType newAT = origInfo.alphaType(); + if (!valid_for_bitmap_device(origInfo, &newAT)) { return NULL; } + const SkImageInfo info = origInfo.makeAlphaType(newAT); SkBitmap bitmap; if (kUnknown_SkColorType == info.colorType()) { @@ -150,9 +151,7 @@ bool SkBitmapDevice::onWritePixels(const SkImageInfo& srcInfo, const void* srcPi return false; } - SkImageInfo dstInfo = fBitmap.info(); - dstInfo.fWidth = srcInfo.width(); - dstInfo.fHeight = srcInfo.height(); + const SkImageInfo dstInfo = fBitmap.info().makeWH(srcInfo.width(), srcInfo.height()); void* dstPixels = fBitmap.getAddr(x, y); size_t dstRowBytes = fBitmap.rowBytes(); -- cgit v1.2.3