| Index: src/utils/win/SkDWrite.cpp
|
| diff --git a/src/utils/win/SkDWrite.cpp b/src/utils/win/SkDWrite.cpp
|
| index 363ac438d99334bf4287ca100325d9a208678108..2254961d146cb1f5f80d20be0d2606a2377f995f 100644
|
| --- a/src/utils/win/SkDWrite.cpp
|
| +++ b/src/utils/win/SkDWrite.cpp
|
| @@ -12,7 +12,7 @@
|
|
|
| #include <dwrite.h>
|
|
|
| -static IDWriteFactory* gDWriteFactory = NULL;
|
| +static IDWriteFactory* gDWriteFactory = nullptr;
|
|
|
| static void release_dwrite_factory() {
|
| if (gDWriteFactory) {
|
| @@ -52,7 +52,7 @@ IDWriteFactory* sk_get_dwrite_factory() {
|
|
|
| /** Converts a utf8 string to a WCHAR string. */
|
| HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name) {
|
| - int wlen = MultiByteToWideChar(CP_UTF8, 0, skname, -1, NULL, 0);
|
| + int wlen = MultiByteToWideChar(CP_UTF8, 0, skname, -1, nullptr, 0);
|
| if (0 == wlen) {
|
| HRM(HRESULT_FROM_WIN32(GetLastError()),
|
| "Could not get length for wchar to utf-8 conversion.");
|
| @@ -67,7 +67,7 @@ HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name) {
|
|
|
| /** Converts a WCHAR string to a utf8 string. */
|
| HRESULT sk_wchar_to_skstring(WCHAR* name, int nameLen, SkString* skname) {
|
| - int len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, NULL, 0, NULL, NULL);
|
| + int len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, nullptr, 0, nullptr, nullptr);
|
| if (0 == len) {
|
| if (nameLen <= 0) {
|
| skname->reset();
|
| @@ -78,7 +78,7 @@ HRESULT sk_wchar_to_skstring(WCHAR* name, int nameLen, SkString* skname) {
|
| }
|
| skname->resize(len);
|
|
|
| - len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, skname->writable_str(), len, NULL, NULL);
|
| + len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, skname->writable_str(), len, nullptr, nullptr);
|
| if (0 == len) {
|
| HRM(HRESULT_FROM_WIN32(GetLastError()), "Could not convert utf-8 to wchar.");
|
| }
|
|
|