diff options
| -rw-r--r-- | include/core/SkBitmap.h | 3 | ||||
| -rw-r--r-- | src/core/SkBitmap.cpp | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 96c804d208..5e7c44eee5 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -464,7 +464,8 @@ private: }; uint32_t fRowBytes; - uint16_t fWidth, fHeight; + uint32_t fWidth; + uint32_t fHeight; uint8_t fConfig; uint8_t fFlags; uint8_t fBytesPerPixel; // based on config diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index bdc795fa6b..c5d0edaade 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -30,7 +30,7 @@ struct MipLevel { void* fPixels; uint32_t fRowBytes; - uint16_t fWidth, fHeight; + uint32_t fWidth, fHeight; }; struct SkBitmap::MipMap : SkNoncopyable { @@ -132,9 +132,9 @@ void SkBitmap::swap(SkBitmap& other) { SkTSwap<MipMap*>(fMipMap, other.fMipMap); #endif SkTSwap<void*>(fPixels, other.fPixels); - SkTSwap<uint16_t>(fWidth, other.fWidth); - SkTSwap<uint16_t>(fHeight, other.fHeight); SkTSwap<uint32_t>(fRowBytes, other.fRowBytes); + SkTSwap<uint32_t>(fWidth, other.fWidth); + SkTSwap<uint32_t>(fHeight, other.fHeight); SkTSwap<uint8_t>(fConfig, other.fConfig); SkTSwap<uint8_t>(fFlags, other.fFlags); SkTSwap<uint8_t>(fBytesPerPixel, other.fBytesPerPixel); @@ -225,8 +225,8 @@ void SkBitmap::setConfig(Config c, int width, int height, int rowBytes) { rowBytes = SkBitmap::ComputeRowBytes(c, width); } fConfig = SkToU8(c); - fWidth = SkToU16(width); - fHeight = SkToU16(height); + fWidth = width; + fHeight = height; fRowBytes = rowBytes; fBytesPerPixel = (uint8_t)ComputeBytesPerPixel(c); @@ -891,8 +891,8 @@ void SkBitmap::buildMipMap(bool forceRebuild) { rowBytes = ComputeRowBytes(config, width); level[i].fPixels = addr; - level[i].fWidth = SkToU16(width); - level[i].fHeight = SkToU16(height); + level[i].fWidth = width; + level[i].fHeight = height; level[i].fRowBytes = rowBytes; dstBM.setConfig(config, width, height, rowBytes); |