| Index: src/core/SkBitmap_scroll.cpp
|
| diff --git a/src/core/SkBitmap_scroll.cpp b/src/core/SkBitmap_scroll.cpp
|
| index 00a72aa1cab983f5a9ad089bbca7298c2da2c445..54158c2bec1182de89fe612b0feb1d5c459ddf24 100644
|
| --- a/src/core/SkBitmap_scroll.cpp
|
| +++ b/src/core/SkBitmap_scroll.cpp
|
| @@ -15,7 +15,7 @@ bool SkBitmap::scrollRect(const SkIRect* subset, int dx, int dy,
|
| return false;
|
| }
|
|
|
| - if (NULL != subset) {
|
| + if (subset) {
|
| SkBitmap tmp;
|
|
|
| return this->extractSubset(&tmp, *subset) &&
|
| @@ -29,14 +29,14 @@ bool SkBitmap::scrollRect(const SkIRect* subset, int dx, int dy,
|
|
|
| // check if there's nothing to do
|
| if ((dx | dy) == 0 || width <= 0 || height <= 0) {
|
| - if (NULL != inval) {
|
| + if (inval) {
|
| inval->setEmpty();
|
| }
|
| return true;
|
| }
|
|
|
| // compute the inval region now, before we see if there are any pixels
|
| - if (NULL != inval) {
|
| + if (inval) {
|
| SkIRect r;
|
|
|
| r.set(0, 0, width, height);
|
|
|