| Index: src/core/SkPictureShader.cpp
|
| diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
|
| index a7b5412b5a5dabc1a6a584429a229caddf531b48..03eeb74c52a4b9bfda1e3eef5b01ea8a4315bc5a 100644
|
| --- a/src/core/SkPictureShader.cpp
|
| +++ b/src/core/SkPictureShader.cpp
|
| @@ -22,7 +22,7 @@ SkPictureShader::SkPictureShader(const SkPicture* picture, TileMode tmx, TileMod
|
| const SkMatrix* localMatrix, const SkRect* tile)
|
| : INHERITED(localMatrix)
|
| , fPicture(SkRef(picture))
|
| - , fTile(NULL != tile ? *tile : picture->cullRect())
|
| + , fTile(tile ? *tile : picture->cullRect())
|
| , fTmx(tmx)
|
| , fTmy(tmy) {
|
| }
|
| @@ -42,7 +42,7 @@ SkPictureShader::~SkPictureShader() {
|
|
|
| SkPictureShader* SkPictureShader::Create(const SkPicture* picture, TileMode tmx, TileMode tmy,
|
| const SkMatrix* localMatrix, const SkRect* tile) {
|
| - if (!picture || picture->cullRect().isEmpty() || (NULL != tile && tile->isEmpty())) {
|
| + if (!picture || picture->cullRect().isEmpty() || (tile && tile->isEmpty())) {
|
| return NULL;
|
| }
|
| return SkNEW_ARGS(SkPictureShader, (picture, tmx, tmy, localMatrix, tile));
|
|
|