diff options
| author |  reed <reed@google.com> | 2014-09-03 11:54:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-03 11:54:58 -0700 |
| commit | e5ea500d4714a7d84de2bf913e81be3b65d2de68 (patch) | |
| tree | 0c94feeb709b17b954f5e97fad463ec9cfc4dc18 /src/image/SkSurface_Raster.cpp | |
| parent | 42b0dfeb29e993b7fd247dcecff705d3dd4cf191 (diff) | |
Hide fields in SkImageInfo
R=rmistry@google.com
TBR=bsalomon
Author: reed@google.com
Review URL: https://codereview.chromium.org/536003002
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 986994ab8f..167f7733db 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -41,7 +41,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) { static const size_t kMaxTotalSize = SK_MaxS32; int shift = 0; - switch (info.fColorType) { + switch (info.colorType()) { case kAlpha_8_SkColorType: shift = 0; break; @@ -59,7 +59,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) { return true; } - uint64_t minRB = (uint64_t)info.fWidth << shift; + uint64_t minRB = (uint64_t)info.width() << shift; if (minRB > rowBytes) { return false; } @@ -69,7 +69,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) { return false; } - uint64_t size = sk_64_mul(info.fHeight, rowBytes); + uint64_t size = sk_64_mul(info.height(), rowBytes); if (size > kMaxTotalSize) { return false; } @@ -86,7 +86,7 @@ SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t } SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) - : INHERITED(pr->info().fWidth, pr->info().fHeight) + : INHERITED(pr->info().width(), pr->info().height()) { const SkImageInfo& info = pr->info(); |