| Index: src/utils/win/SkIStream.cpp
|
| diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
|
| index dc9d1636d710301a2882fe8a3dac7a7ec0cd2e19..f1dbcb274ca8c775b56e89ee6418c59f0374420e 100644
|
| --- a/src/utils/win/SkIStream.cpp
|
| +++ b/src/utils/win/SkIStream.cpp
|
| @@ -22,7 +22,7 @@ SkBaseIStream::~SkBaseIStream() { }
|
| HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid
|
| , void ** ppvObject)
|
| {
|
| - if (NULL == ppvObject) {
|
| + if (nullptr == ppvObject) {
|
| return E_INVALIDARG;
|
| }
|
| if (iid == __uuidof(IUnknown)
|
| @@ -33,7 +33,7 @@ HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid
|
| AddRef();
|
| return S_OK;
|
| } else {
|
| - *ppvObject = NULL;
|
| + *ppvObject = nullptr;
|
| return E_NOINTERFACE;
|
| }
|
| }
|
| @@ -122,7 +122,7 @@ HRESULT SkIStream::CreateFromSkStream(SkStream* stream
|
| , bool deleteOnRelease
|
| , IStream ** ppStream)
|
| {
|
| - if (NULL == stream) {
|
| + if (nullptr == stream) {
|
| return E_INVALIDARG;
|
| }
|
| *ppStream = new SkIStream(stream, deleteOnRelease);
|
| @@ -208,7 +208,7 @@ HRESULT STDMETHODCALLTYPE SkIStream::Stat(STATSTG* pStatstg
|
| if (0 == (grfStatFlag & STATFLAG_NONAME)) {
|
| return STG_E_INVALIDFLAG;
|
| }
|
| - pStatstg->pwcsName = NULL;
|
| + pStatstg->pwcsName = nullptr;
|
| // FIXME: Should not depend on getLength
|
| // See https://code.google.com/p/skia/issues/detail?id=1570
|
| pStatstg->cbSize.QuadPart = this->fSkStream->getLength();
|
| @@ -268,7 +268,7 @@ HRESULT STDMETHODCALLTYPE SkWIStream::Stat(STATSTG* pStatstg
|
| if (0 == (grfStatFlag & STATFLAG_NONAME)) {
|
| return STG_E_INVALIDFLAG;
|
| }
|
| - pStatstg->pwcsName = NULL;
|
| + pStatstg->pwcsName = nullptr;
|
| pStatstg->cbSize.QuadPart = 0;
|
| pStatstg->clsid = CLSID_NULL;
|
| pStatstg->type = STGTY_STREAM;
|
|
|