diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-25 21:47:41 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-25 21:47:41 +0000 |
| commit | e5f48243bdbed2662be7a31be0888abc273b09e8 (patch) | |
| tree | 4cd3ddd840082f98b89dd635fe89fb1f507a975b /src/lazy | |
| parent | 10863051df145299937704589a4f2ebb991fb2fa (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 'src/lazy')
| -rw-r--r-- | src/lazy/SkLazyPixelRef.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lazy/SkLazyPixelRef.cpp b/src/lazy/SkLazyPixelRef.cpp index c0d5d9055b..c262884561 100644 --- a/src/lazy/SkLazyPixelRef.cpp +++ b/src/lazy/SkLazyPixelRef.cpp @@ -49,7 +49,7 @@ static size_t ComputeMinRowBytesAndSize(const SkImage::Info& info, size_t* rowBy Sk64 safeSize; safeSize.setZero(); if (info.fHeight > 0) { - safeSize.setMul(info.fHeight, *rowBytes); + safeSize.setMul(info.fHeight, SkToS32(*rowBytes)); } SkASSERT(!safeSize.isNeg()); return safeSize.is32() ? safeSize.get32() : 0; |