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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Mar 21 12:12:58 UTC 2019


 vcl/opengl/scale.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5715c738fd9257360aa8bd6e3d39322dae193b26
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Mar 14 14:30:28 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Mar 21 13:12:39 2019 +0100

    add missing else in an if-else chain
    
    No functional change, but avoid the warning.
    
    Change-Id: Ia552c6199806a9e029800e9d65c0852baa370bd8
    Reviewed-on: https://gerrit.libreoffice.org/69270
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 6459933cb81b..ae7146b6d6bf 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -349,7 +349,7 @@ void OpenGLSalBitmap::ImplScale( const double& rScaleX, const double& rScaleY, B
     {
         ImplScaleFilter( xContext, rScaleX, rScaleY, GL_NEAREST );
     }
-    if( nScaleFlag == BmpScaleFlag::BiLinear )
+    else if( nScaleFlag == BmpScaleFlag::BiLinear )
     {
         ImplScaleFilter( xContext, rScaleX, rScaleY, GL_LINEAR );
     }
@@ -360,7 +360,7 @@ void OpenGLSalBitmap::ImplScale( const double& rScaleX, const double& rScaleY, B
         ImplScaleConvolution( xContext, rScaleX, rScaleY, aKernel );
     }
     else if( nScaleFlag == BmpScaleFlag::BestQuality && rScaleX <= 1 && rScaleY <= 1 )
-    { // Use are scaling for best quality, but only if downscaling.
+    { // Use area scaling for best quality, but only if downscaling.
         ImplScaleArea( xContext, rScaleX, rScaleY );
     }
     else if( nScaleFlag == BmpScaleFlag::Lanczos || nScaleFlag == BmpScaleFlag::BestQuality  )


More information about the Libreoffice-commits mailing list