| Index: tools/skdiff_utils.cpp
|
| diff --git a/tools/skdiff_utils.cpp b/tools/skdiff_utils.cpp
|
| index e656e3c44b5ca3d9173b5f15315490e583b39377..1e2a727945b921892404788349f391f560966528 100644
|
| --- a/tools/skdiff_utils.cpp
|
| +++ b/tools/skdiff_utils.cpp
|
| @@ -16,7 +16,7 @@
|
| #include <memory>
|
|
|
| bool are_buffers_equal(SkData* skdata1, SkData* skdata2) {
|
| - if ((NULL == skdata1) || (NULL == skdata2)) {
|
| + if ((nullptr == skdata1) || (nullptr == skdata2)) {
|
| return false;
|
| }
|
| if (skdata1->size() != skdata2->size()) {
|
| @@ -39,7 +39,7 @@ bool get_bitmap(SkData* fileBits, DiffResource& resource, SkImageDecoder::Mode m
|
| // In debug, the DLL will automatically be unloaded when this is deleted,
|
| // but that shouldn't be a problem in release mode.
|
| std::unique_ptr<SkImageDecoder> codec(SkImageDecoder::Factory(&stream));
|
| - if (NULL == codec) {
|
| + if (nullptr == codec) {
|
| SkDebugf("ERROR: no codec found for <%s>\n", resource.fFullPath.c_str());
|
| resource.fStatus = DiffResource::kCouldNotDecode_Status;
|
| return false;
|
|
|