[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - canvas/source

[David Ostrovsky]

 canvas/source/directx/dx_spritecanvashelper.cxx |    4 ++--
 canvas/source/directx/dx_winstuff.hxx           |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 13d75be492897b078546c8175c9ee22290d8d20e
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Feb 20 15:17:42 2016 +0100

    werror: declaration hides previous declaration
    
    Change-Id: I0f8422a4f8c27ec253d917985d2593d8d87bb5f0
    Reviewed-on: https://gerrit.libreoffice.org/22685
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit d375cafef68e8be9d0d35cbb535b8481a3913ace)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 0d629b4..021f827 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -49,8 +49,13 @@ typedef IDirect3DSurface9 surface_type;
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
+#pragma warning(push, 1)
+#pragma warning(disable: 4458)
+
 #include <gdiplus.h>
 
+#pragma warning(pop)
+
 #undef max
 #undef min
 
commit 01b908543edbfa69266aef4023f65b5f4a75b272
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Feb 20 18:44:37 2016 +0100

    werror: declaration hides previous declaration
    
    Change-Id: Ia0fe8847f2a58fbccb25ecc6237f3b14a08da076
    Reviewed-on: https://gerrit.libreoffice.org/22688
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit fbe9f840d541eab1a47a457c00fef00441f52364)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index ff2be01..66ea028 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -269,8 +269,8 @@ namespace dxcanvas
         ::basegfx::computeSetDifference( aUncoveredAreas,
                                          rUpdateArea.maTotalBounds,
                                          ::basegfx::B2DRange( rDestRect ) );
-        for( const auto& rUpdateArea : aUncoveredAreas )
-            repaintBackground( rUpdateArea, maScrapRect, mpBackBuffer );
+        for( const auto& rUncoveredArea : aUncoveredAreas )
+            repaintBackground( rUncoveredArea, maScrapRect, mpBackBuffer );
 
         // TODO(E1): Use numeric_cast to catch overflow here
         ::basegfx::B2IRange aActualArea( 0, 0,