diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 20:11:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-17 06:38:57 +0000 |
| commit | 9c79945ca62b18213728cdd23d9f390304aee1de (patch) | |
| tree | 94bb9cc30cbb5bb5508875d80fcf975b673fe0ac /vcl/source/gdi/bmpacc.cxx | |
| parent | 29e91d5eedd2bf20504ce9ada625d33fec19dc9e (diff) | |
convert DBG_ASSERT in vcl
Change-Id: I732fb1a789f90ca7a7f393cc41a6afe84fecf3d3
Reviewed-on: https://gerrit.libreoffice.org/26200
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/gdi/bmpacc.cxx')
| -rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 3bc0a55895b7..8357784ab757 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -50,7 +50,7 @@ void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap ) { std::shared_ptr<ImpBitmap> xImpBmp = rBitmap.ImplGetImpBitmap(); - DBG_ASSERT( xImpBmp, "Forbidden Access to empty bitmap!" ); + SAL_WARN_IF( !xImpBmp, "vcl", "Forbidden Access to empty bitmap!" ); if( xImpBmp ) { @@ -404,8 +404,8 @@ BitmapWriteAccess::~BitmapWriteAccess() void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc ) { assert(nY >= 0 && nY < mpBuffer->mnHeight && "y-coordinate in destination out of range!"); - DBG_ASSERT( nY < rReadAcc.Height(), "y-coordinate in source out of range!" ); - DBG_ASSERT( ( HasPalette() && rReadAcc.HasPalette() ) || ( !HasPalette() && !rReadAcc.HasPalette() ), "No copying possible between palette bitmap and TC bitmap!" ); + SAL_WARN_IF( nY >= rReadAcc.Height(), "vcl", "y-coordinate in source out of range!" ); + SAL_WARN_IF( ( !HasPalette() || !rReadAcc.HasPalette() ) && ( HasPalette() || rReadAcc.HasPalette() ), "vcl", "No copying possible between palette bitmap and TC bitmap!" ); if( ( GetScanlineFormat() == rReadAcc.GetScanlineFormat() ) && ( GetScanlineSize() >= rReadAcc.GetScanlineSize() ) ) @@ -481,7 +481,7 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, void BitmapWriteAccess::CopyBuffer( const BitmapReadAccess& rReadAcc ) { - DBG_ASSERT( ( HasPalette() && rReadAcc.HasPalette() ) || ( !HasPalette() && !rReadAcc.HasPalette() ), "No copying possible between palette bitmap and TC bitmap!" ); + SAL_WARN_IF( ( !HasPalette() || !rReadAcc.HasPalette() ) && ( HasPalette() || rReadAcc.HasPalette() ), "vcl", "No copying possible between palette bitmap and TC bitmap!" ); if( ( GetScanlineFormat() == rReadAcc.GetScanlineFormat() ) && ( GetScanlineSize() == rReadAcc.GetScanlineSize() ) ) |