diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-10 13:25:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-10 13:25:55 +0100 |
| commit | 5fa4d448fb717874b6619bcda62e42190702997c (patch) | |
| tree | ede8c520b57147dfd48d060ec71e426d5462bf1d /src | |
| parent | 28fb79db6b52d1154e8dc63d227673648c2fce15 (diff) | |
| download | vim-git-5fa4d448fb717874b6619bcda62e42190702997c.tar.gz | |
patch 7.4.1074v7.4.1074
Problem: Warning from VX2015 compiler.
Solution: Add a type cast. (Mike Williams)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_dwrite.cpp | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp index d4c43a37d..08b81c447 100644 --- a/src/gui_dwrite.cpp +++ b/src/gui_dwrite.cpp @@ -686,7 +686,7 @@ DWriteContext::DrawText(HDC hdc, const WCHAR* text, int len, if (SUCCEEDED(hr)) { - DWRITE_TEXT_RANGE textRange = { 0, len }; + DWRITE_TEXT_RANGE textRange = { 0, (UINT32)len }; textLayout->SetFontWeight(mFontWeight, textRange); textLayout->SetFontStyle(mFontStyle, textRange); } diff --git a/src/version.c b/src/version.c index 46e5aa7da..d1b5124a9 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1074, +/**/ 1073, /**/ 1072, |