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/core/SkBitmapProcState_shaderproc.h | |
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/core/SkBitmapProcState_shaderproc.h')
-rw-r--r-- | src/core/SkBitmapProcState_shaderproc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h index cf15a50598..6b8f74aedd 100644 --- a/src/core/SkBitmapProcState_shaderproc.h +++ b/src/core/SkBitmapProcState_shaderproc.h @@ -44,7 +44,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, int y1 = TILEY_PROCF((fy + s.fFilterOneY), maxY); const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels(); - unsigned rb = s.fBitmap->rowBytes(); + size_t rb = s.fBitmap->rowBytes(); row0 = (const SRCTYPE*)(srcAddr + y0 * rb); row1 = (const SRCTYPE*)(srcAddr + y1 * rb); // now initialize fx |