aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-25 21:47:41 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-25 21:47:41 +0000
commite5f48243bdbed2662be7a31be0888abc273b09e8 (patch)
tree4cd3ddd840082f98b89dd635fe89fb1f507a975b /include
parent10863051df145299937704589a4f2ebb991fb2fa (diff)
Fix a bunch of warnings, mainly around rowBytes.
My recent change changed the way SkBitmap::fRowBytes is stored, and parameter/return values referring to rowBytes were changed to type size_t. Change the storage back, and eliminate warnings resulting from returning a size_t. Review URL: https://codereview.appspot.com/7396059 git-svn-id: http://skia.googlecode.com/svn/trunk@7855 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkBitmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 6fdde404a1..9347bd93d8 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -645,7 +645,7 @@ private:
kImageIsImmutable_Flag = 0x04
};
- size_t fRowBytes;
+ uint32_t fRowBytes;
uint32_t fWidth;
uint32_t fHeight;
uint8_t fConfig;