changeset 7547:567e027a3ea1 v7.4.1074

commit https://github.com/vim/vim/commit/5fa4d448fb717874b6619bcda62e42190702997c Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 10 13:25:55 2016 +0100 patch 7.4.1074 Problem: Warning from VX2015 compiler. Solution: Add a type cast. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Sun, 10 Jan 2016 13:30:05 +0100
parents deff32fcc77a
children 77aac880d9e8
files src/gui_dwrite.cpp src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -686,7 +686,7 @@ DWriteContext::DrawText(HDC hdc, const W
 
 	if (SUCCEEDED(hr))
 	{
-	    DWRITE_TEXT_RANGE textRange = { 0, len };
+	    DWRITE_TEXT_RANGE textRange = { 0, (UINT32)len };
 	    textLayout->SetFontWeight(mFontWeight, textRange);
 	    textLayout->SetFontStyle(mFontStyle, textRange);
 	}
--- 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,