aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkPath.h
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-08-28 10:34:05 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-28 17:48:57 +0000
commita93a14a99816d25b773f0b12868143702baf44bf (patch)
tree727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /include/core/SkPath.h
parent695db408437807d049ecc02b3b852704092728f2 (diff)
Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's -Wzero-as-null-pointer-constant. This updates most issues in Skia code. However, there are places where GL and Vulkan want pointer values which are explicitly 0, external headers which use NULL directly, and possibly more uses in un-compiled sources (for other platforms). Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345 Reviewed-on: https://skia-review.googlesource.com/39521 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/core/SkPath.h')
-rw-r--r--include/core/SkPath.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 0a70f0e9ad..f0d6f3b2ae 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -663,7 +663,7 @@ public:
* @param direction If not null, set to the rectangle's direction
* @return true if the path specifies a rectangle
*/
- bool isRect(SkRect* rect, bool* isClosed = NULL, Direction* direction = NULL) const;
+ bool isRect(SkRect* rect, bool* isClosed = nullptr, Direction* direction = nullptr) const;
/** Returns true if the path specifies a pair of nested rectangles, or would draw a
pair of nested rectangles when filled. If so, and if
@@ -677,7 +677,7 @@ public:
@param dirs If not null, returns the direction of the rects
@return true if the path describes a pair of nested rectangles
*/
- bool isNestedFillRects(SkRect rect[2], Direction dirs[2] = NULL) const;
+ bool isNestedFillRects(SkRect rect[2], Direction dirs[2] = nullptr) const;
/**
* Add a closed rectangle contour to the path