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

Markus Mohrhard markus.mohrhard at collabora.co.uk
Mon Nov 3 20:00:23 PST 2014


 vcl/opengl/gdiimpl.cxx |    4 ++--
 vcl/opengl/salbmp.cxx  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f64d7290f5b7a1687febad770ee7499862e2f367
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Nov 4 05:01:07 2014 +0100

    fix unused parameter warnings
    
    Change-Id: Id7d41ea2bb904d22da2d2e782f139eca87890684

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 4ee5f95..b54f7db 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -416,7 +416,7 @@ void OpenGLSalGraphicsImpl::DrawTexture( GLuint nTexture, const Size& rSize, con
     glUseProgram( 0 );
 }
 
-void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint nTexture, GLuint nMask, const SalTwoRect& pPosAry )
+void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint nTexture, GLuint nMask, const SalTwoRect& /*pPosAry*/ )
 {
     if( mnMaskedTextureProgram == 0 )
     {
@@ -441,7 +441,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint nTexture, GLuint nMask,
     glUseProgram( 0 );
 }
 
-void OpenGLSalGraphicsImpl::DrawMask( GLuint nMask, SalColor nMaskColor, const SalTwoRect& pPosAry )
+void OpenGLSalGraphicsImpl::DrawMask( GLuint nMask, SalColor nMaskColor, const SalTwoRect& /*pPosAry*/ )
 {
     if( mnMaskProgram == 0 )
     {
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 12ef31c..32a0126 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -529,7 +529,7 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ )
 #endif
 }
 
-bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag )
+bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 /*nScaleFlag*/ )
 {
     SAL_INFO( "vcl.opengl", "::Scale" );
     mnWidth *= rScaleX;


More information about the Libreoffice-commits mailing list