[Libreoffice-commits] .: 6 commits - canvas/inc canvas/source sal/inc vcl/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Jan 31 21:08:01 PST 2012
canvas/inc/canvas/vclwrapper.hxx | 2 --
canvas/source/cairo/cairo_xlib_cairo.cxx | 3 ++-
sal/inc/sal/log-areas.dox | 1 +
vcl/source/gdi/virdev.cxx | 26 ++++++++++++++++----------
4 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit 4ecc4a91e1199e061a4561f2eaf577085064658f
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 13:37:24 2012 +0100
remove duplicate include
diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index cf42e15..f6d5b3a 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.hxx
@@ -30,10 +30,8 @@
#define INCLUDED_CANVAS_VCLWRAPPER_HXX
#include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-
namespace canvas
{
namespace vcltools
commit b9accbafa13b0ffb8855d3ae732b397f6120a3cb
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 11:51:18 2012 +0100
the bug number is not from public bugzilla
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 6cde626..3165d35 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -168,7 +168,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
- // #110958# Enable alpha channel
+ // Enable alpha channel
mnAlphaDepth = sal::static_int_cast<sal_Int8>(nAlphaBitCount);
}
commit 4f6a5040db04a59498d2ef2b729659a94140c23b
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 10:52:10 2012 +0100
the depth argument must be >= 0
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index e084eda..df14fce 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include <utility>
#include <tools/prex.h>
#include <X11/extensions/Xrender.h>
@@ -267,7 +268,7 @@ namespace cairo
aSystemGraphicsData.pXRenderFormat = getRenderFormat();
return boost::shared_ptr<VirtualDevice>(
- new VirtualDevice( &aSystemGraphicsData, getDepth() ));
+ new VirtualDevice( &aSystemGraphicsData, std::max( getDepth(), 0 ) ));
}
/**
commit 767098b0ca717b6649223940af907593723bc927
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 10:52:38 2012 +0100
add vcl.gdi log area
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d0cbaee..074f1b2 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -19,6 +19,7 @@ certain functionality.
@section VCL
+ at li vcl.gdi - the GDI part of VCL: devices, bitmaps, etc.
@li vcl.gtk - Gtk+ 2/3 plugin
@section Writer
commit ec505d879eaf59815dfc912c2dda525fbf5f2340
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 11:42:23 2012 +0100
OSL_TRACE -> SAL_INFO
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 3f6acf3..6cde626 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -137,7 +137,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
{
SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
"VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
- OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
+ SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
}
@@ -150,7 +150,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
{
SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
"VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
- OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
+ SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
}
@@ -163,7 +163,8 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
{
SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
"VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
- OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
+ SAL_INFO( "vcl.gdi",
+ "VirtualDevice::VirtualDevice( " << nBitCount << ", " << nAlphaBitCount << " )" );
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
@@ -177,7 +178,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
- OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
+ SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData );
}
@@ -186,7 +187,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo
VirtualDevice::~VirtualDevice()
{
- OSL_TRACE( "VirtualDevice::~VirtualDevice()" );
+ SAL_INFO( "vcl.gdi", "VirtualDevice::~VirtualDevice()" );
ImplSVData* pSVData = ImplGetSVData();
@@ -211,7 +212,9 @@ VirtualDevice::~VirtualDevice()
sal_Bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase )
{
- OSL_TRACE( "VirtualDevice::ImplSetOutputSizePixel( %ld, %ld, %d )", rNewSize.Width(), rNewSize.Height(), (int)bErase );
+ SAL_INFO( "vcl.gdi",
+ "VirtualDevice::ImplSetOutputSizePixel( " << rNewSize.Width() << ", "
+ << rNewSize.Height() << ", " << bErase << " )" );
if ( !mpVirDev )
return sal_False;
commit 55f00b76a9878480cdeb1528371eafe3fd85412e
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 31 10:49:16 2012 +0100
it seems this is not true in all cases
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 008ecb9..3f6acf3 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -48,9 +48,6 @@ using namespace ::com::sun::star::uno;
void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
{
- DBG_ASSERT( nBitCount <= 1,
- "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
-
if ( nDX < 1 )
nDX = 1;
@@ -138,6 +135,8 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
+ SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
@@ -149,6 +148,8 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
+ SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
@@ -160,6 +161,8 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
+ SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
OSL_TRACE( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
More information about the Libreoffice-commits
mailing list