[Libreoffice-commits] core.git: vcl/source

Caolán McNamara caolanm at redhat.com
Fri Oct 21 08:13:42 UTC 2016


 vcl/source/gdi/CommonSalLayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5c0265a78a5bb2633a42ff820a5837ef62cc91f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 21 09:04:49 2016 +0100

    coverity#1374090 Unintentional integer overflow
    
    and
    
    coverity#1374091 Unintentional integer overflow
    
    Change-Id: Ia36b1feafc44e6ea65c55c9ffc661256276d9b29

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 8432e91..96762f1 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -101,8 +101,8 @@ static hb_font_t* createHbFont(hb_face_t* pHbFace)
 
 static void scaleHbFont(hb_font_t* pHbFont, const FontSelectPattern& aFontSelData)
 {
-    uint64_t nXScale = aFontSelData.mnWidth << 6;
-    uint64_t nYScale = aFontSelData.mnHeight << 6;
+    unsigned int nXScale = aFontSelData.mnWidth << 6;
+    unsigned int nYScale = aFontSelData.mnHeight << 6;
 
 #if defined(_WIN32)
     // HACK to get stretched/shrunken text. TODO: Get rid of HACK


More information about the Libreoffice-commits mailing list