[Libreoffice-commits] core.git: canvas/source

[Norbert Thiebaud]

 canvas/source/directx/dx_9rm.cxx                |    8 -------
 canvas/source/directx/dx_bitmap.cxx             |    8 -------
 canvas/source/directx/dx_spritecanvashelper.cxx |   14 ------------
 canvas/source/directx/dx_surfacebitmap.cxx      |   27 ------------------------
 canvas/source/directx/dx_surfacebitmap.hxx      |    3 --
 5 files changed, 60 deletions(-)

New commits:
commit d44821675e764780a52b79c066edb9195d0b0347
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Aug 11 13:44:17 2015 -0500

    remove imgdebug
    
    imgdbug.h ins included in canvs under some debugging flags
    but that header comes from
    http://billbaxter.com/projects/imdebug/
    and is nowhere to be found in our source. the original project
    has been dead for a long while.. the last 'news' was that it was
    migrating to the now defunc 'berlios' hosting site.
    
    Change-Id: Idd030164f4ef0b28973530df69323cb952e99169
    Reviewed-on: https://gerrit.libreoffice.org/17655
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 197f0a9..e84d6d822 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -58,14 +58,6 @@
                                    // has 3 vertices)
 
 
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-#  include <imdebug.h>
-#  undef min
-#  undef max
-# endif
-#endif
-
 using namespace ::com::sun::star;
 
 
diff --git a/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx
index 3f56721..a5561b7 100644
--- a/canvas/source/directx/dx_bitmap.cxx
+++ b/canvas/source/directx/dx_bitmap.cxx
@@ -27,14 +27,6 @@
 #include "dx_graphicsprovider.hxx"
 #include "dx_impltools.hxx"
 
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-#  include <imdebug.h>
-#  undef min
-#  undef max
-# endif
-#endif
-
 using namespace ::com::sun::star;
 
 namespace dxcanvas
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index ff485e7..9508fc7 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -32,14 +32,6 @@
 #include "dx_canvascustomsprite.hxx"
 #include "dx_spritecanvashelper.hxx"
 
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-#  include <imdebug.h>
-#  undef min
-#  undef max
-# endif
-#endif
-
 using namespace ::com::sun::star;
 
 namespace dxcanvas
@@ -181,12 +173,6 @@ namespace dxcanvas
             return false; // disposed, or otherwise dysfunctional
         }
 
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-        mpBackBuffer->imageDebugger();
-# endif
-#endif
-
         // store current output area (need to tunnel that to the
         // background, scroll, opaque and general sprite repaint
         // routines)
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx
index e5d827f..cf6e1ae 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -30,15 +30,6 @@
 #include "dx_surfacebitmap.hxx"
 #include "dx_surfacegraphics.hxx"
 
-
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-#  include <imdebug.h>
-#  undef min
-#  undef max
-# endif
-#endif
-
 using namespace ::com::sun::star;
 
 namespace dxcanvas
@@ -418,24 +409,6 @@ namespace dxcanvas
     }
 
 
-    // DXSurfaceBitmap::imageDebugger
-
-#if defined(DX_DEBUG_IMAGES)
-# if OSL_DEBUG_LEVEL > 0
-    void DXSurfaceBitmap::imageDebugger()
-    {
-        D3DLOCKED_RECT aLockedRect;
-        if( FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)) )
-            return;
-
-        imdebug("bgra w=%d h=%d %p", maSize.getX(),
-                maSize.getY(), aLockedRect.pBits);
-        mpSurface->UnlockRect();
-    }
-# endif
-#endif
-
-
     // DXSurfaceBitmap::getData
 
 
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index 37ae55f..6d1744e 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -82,9 +82,6 @@ namespace dxcanvas
             css::rendering::IntegerBitmapLayout&       bitmapLayout,
             const css::geometry::IntegerPoint2D&       pos );
 
-#ifdef DX_DEBUG_IMAGES
-        void imageDebugger();
-#endif
     private:
         void init();