[Libreoffice-commits] core.git: 2 commits - vcl/quartz

[Libreoffice Gerrit user]

 vcl/quartz/ctfonts.cxx |    2 +-
 vcl/quartz/salbmp.cxx  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d7e087608eba7dc6f966204f0e57e88c2ab37764
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 16 22:13:07 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 17 08:19:24 2018 +0200

    loplugin:redundantfcast
    
    Change-Id: Ife2d609403c753b917f29fa00bc5f5f1a520503d
    Reviewed-on: https://gerrit.libreoffice.org/59238
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index d586a120726a..a78b06550530 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -461,7 +461,7 @@ public:
             if(nIndex < mnPaletteCount)
                 return mrPalette[nIndex].GetColor();
             else
-                return Color(COL_BLACK);
+                return COL_BLACK;
         }
     virtual void WritePixel( Color nColor ) override
         {
@@ -511,7 +511,7 @@ public:
             if(nIndex < mnPaletteCount)
                 return mrPalette[nIndex].GetColor();
             else
-                return Color(COL_BLACK);
+                return COL_BLACK;
         }
     virtual void WritePixel( Color nColor ) override
         {
@@ -556,7 +556,7 @@ public:
             if(nIndex < mnPaletteCount)
                 return mrPalette[nIndex].GetColor();
             else
-                return Color(COL_BLACK);
+                return COL_BLACK;
         }
     virtual void WritePixel( Color nColor ) override
         {
commit 585482133b67d100c0480bfdd924035593985a97
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 16 22:12:22 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 17 08:19:13 2018 +0200

    loplugin:cstylecast
    
    Change-Id: I36ffe5952e4ca930ed51fa547611ce4c7a51e1d7
    Reviewed-on: https://gerrit.libreoffice.org/59237
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index af7cb12970d8..869ece86732f 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -62,7 +62,7 @@ CoreTextStyle::CoreTextStyle(const PhysicalFontFace& rPFF, const FontSelectPatte
     // handle font stretching if any
     if( (rFSP.mnWidth != 0) && (rFSP.mnWidth != rFSP.mnHeight) )
     {
-        mfFontStretch = (float)rFSP.mnWidth / rFSP.mnHeight;
+        mfFontStretch = float(rFSP.mnWidth) / rFSP.mnHeight;
         aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMakeScale(mfFontStretch, 1.0F));
     }