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

[Tor Lillqvist]

 vcl/opengl/scale.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 33d7f3816aa02a1ad9b001e81fb62d21608fdf8e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 8 17:17:54 2015 +0200

    makeSomeOpenGLContextCurrent() asserts that mpContext is not null
    
    So no need to test after calling it.
    
    Change-Id: I122bd5c2de23568b1cd3e98aef3c61d2ca91dfe9

diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 56658e5..187174a 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -351,15 +351,7 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpSc
         nScaleFlag == BmpScaleFlag::BestQuality )
     {
         makeSomeOpenGLContextCurrent();
-        if( mpContext == nullptr )
-        {
-            VCL_GL_INFO( "Add ScaleOp to pending operations" );
-            maPendingOps.push_back( new ScaleOp( this, rScaleX, rScaleY, nScaleFlag ) );
-        }
-        else
-        {
-            ImplScale( rScaleX, rScaleY, nScaleFlag );
-        }
+        ImplScale( rScaleX, rScaleY, nScaleFlag );
         return true;
     }