summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-10 13:25:55 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-10 13:25:55 +0100
commit5fa4d448fb717874b6619bcda62e42190702997c (patch)
treeede8c520b57147dfd48d060ec71e426d5462bf1d
parent28fb79db6b52d1154e8dc63d227673648c2fce15 (diff)
patch 7.4.1074v7.4.1074
Problem: Warning from VX2015 compiler. Solution: Add a type cast. (Mike Williams)
-rw-r--r--src/gui_dwrite.cpp2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
index d4c43a37d6..08b81c4470 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 46e5aa7da2..d1b5124a95 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,