From 87f0182accdfb092f97f6d1560412931406ab2e1 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 9 Aug 2018 13:55:11 +1000 Subject: Backport: Avoid some casts. Backport of changeset 7072:557c1fa29581. --- win32/ScintillaWin.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 3f1fe7271..f81c89173 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1729,8 +1729,9 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam (wParam == SC_TECHNOLOGY_DIRECTWRITERETAIN) || (wParam == SC_TECHNOLOGY_DIRECTWRITEDC) || (wParam == SC_TECHNOLOGY_DIRECTWRITE)) { - if (technology != static_cast(wParam)) { - if (static_cast(wParam) > SC_TECHNOLOGY_DEFAULT) { + const int technologyNew = static_cast(wParam); + if (technology != technologyNew) { + if (technologyNew > SC_TECHNOLOGY_DEFAULT) { #if defined(USE_D2D) if (!LoadD2D()) // Failed to load Direct2D or DirectWrite so no effect @@ -1742,7 +1743,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam #if defined(USE_D2D) DropRenderTarget(); #endif - technology = static_cast(wParam); + technology = technologyNew; // Invalidate all cached information including layout. DropGraphics(true); InvalidateStyleRedraw(); -- cgit v1.2.3