Fix a bunch of warnings, mainly around rowBytes.

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.

Committed: https://code.google.com/p/skia/source/detail?r=7855

[reed1, 2013-02-25 20:28:24]

I see lots of casts needed, when we have a local rb variable. Why not declare
that local to be size_t?

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
File src/core/SkBitmapProcState_sample.h (right):

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:51: const char* SK_RESTRICT srcAddr = (const
char*)s.fBitmap->getPixels();
how about

size_t rb = s.fBitmap->rowBytes();

instead?

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:148: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
size_t rb = ...; 

instead?

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:194: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
size_t rb = ...;

instead?

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_shad...
File src/core/SkBitmapProcState_shaderproc.h (right):

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_shad...
src/core/SkBitmapProcState_shaderproc.h:46: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
size_t rb ?

[Leon, 2013-02-25 21:06:40]

Fixed other casts as well.

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
File src/core/SkBitmapProcState_sample.h (right):

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:51: const char* SK_RESTRICT srcAddr = (const
char*)s.fBitmap->getPixels();
On 2013/02/25 20:28:24, reed1 wrote:
> how about
> 
> size_t rb = s.fBitmap->rowBytes();
> 
> instead?

Done.

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:148: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
On 2013/02/25 20:28:24, reed1 wrote:
> size_t rb = ...; 
> 
> instead?

Done.

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_samp...
src/core/SkBitmapProcState_sample.h:194: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
On 2013/02/25 20:28:24, reed1 wrote:
> size_t rb = ...;
> 
> instead?

Done.

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_shad...
File src/core/SkBitmapProcState_shaderproc.h (right):

https://codereview.appspot.com/7396059/diff/1/src/core/SkBitmapProcState_shad...
src/core/SkBitmapProcState_shaderproc.h:46: const char* SK_RESTRICT srcAddr =
(const char*)s.fBitmap->getPixels();
On 2013/02/25 20:28:24, reed1 wrote:
> size_t rb ?

Done.

[reed1, 2013-02-25 21:15:30]

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap.cpp
File src/core/SkBitmap.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap.cpp#newco...
src/core/SkBitmap.cpp:235: size_t rowBytes) {
Since this is the 64bit version, perhaps we can rewrite it to handle the case
where the return value from ComputeRowBytes is > 32bit (or at least > 31bits). I
know the current code doesn't do that either, so maybe we just add a // TODO

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap_scroll.cpp
File src/core/SkBitmap_scroll.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap_scroll.cp...
src/core/SkBitmap_scroll.cpp:84: const char* src = dst;
size_t rowBytes = ...

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBlitter_ARGB32.cpp
File src/core/SkBlitter_ARGB32.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBlitter_ARGB32.c...
src/core/SkBlitter_ARGB32.cpp:198: unsigned dst_scale = 255 -
SkGetPackedA32(color);
size_t rowBytes = ...

[Leon, 2013-02-25 21:21:25]

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap.cpp
File src/core/SkBitmap.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap.cpp#newco...
src/core/SkBitmap.cpp:235: size_t rowBytes) {
On 2013/02/25 21:15:31, reed1 wrote:
> Since this is the 64bit version, perhaps we can rewrite it to handle the case
> where the return value from ComputeRowBytes is > 32bit (or at least > 31bits).
I
> know the current code doesn't do that either, so maybe we just add a // TODO

Done.

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap_scroll.cpp
File src/core/SkBitmap_scroll.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBitmap_scroll.cp...
src/core/SkBitmap_scroll.cpp:84: const char* src = dst;
On 2013/02/25 21:15:31, reed1 wrote:
> size_t rowBytes = ...

I changed that, but then changed it back. This caller actually wants a signed
number. Below, rowBytes gets assigned -rowBytes.

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBlitter_ARGB32.cpp
File src/core/SkBlitter_ARGB32.cpp (right):

https://codereview.appspot.com/7396059/diff/26001/src/core/SkBlitter_ARGB32.c...
src/core/SkBlitter_ARGB32.cpp:198: unsigned dst_scale = 255 -
SkGetPackedA32(color);
On 2013/02/25 21:15:31, reed1 wrote:
> size_t rowBytes = ...

Done.

[reed1, 2013-02-25 21:43:47]

lgtm