summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-05 13:20:02 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-05 13:20:02 +0200
commitf653a6bcff48161b56eeb3a584011aab6665f1e7 (patch)
treee9d3fc72fde608631c5ec170972818f1dba34006
parent711f02da6559a3557a9d626d5923c6ea17bd1477 (diff)
patch 8.1.1273: compiler warning in direct write codev8.1.1273
Problem: Compiler warning in direct write code. Solution: Add a type cast.
-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 3c477d0527..8767dc1af9 100644
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -949,7 +949,7 @@ DWriteContext::SetDrawingMode(DrawingMode mode)
if (mDrawing)
{
hr = mRT->EndDraw();
- if (hr == D2DERR_RECREATE_TARGET)
+ if (hr == (HRESULT)D2DERR_RECREATE_TARGET)
{
hr = S_OK;
DiscardDeviceResources();
diff --git a/src/version.c b/src/version.c
index db12cd3916..c8038f36f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1273,
+/**/
1272,
/**/
1271,