diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-07 20:55:58 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-08 12:29:29 +0000 |
commit | 51e2d23521f99254f09fcc459e7b41600cb9f76d (patch) | |
tree | aa168fcf1f4e764e4806cd71937546348cb968f2 /vcl/source/gdi/bmpacc.cxx | |
parent | 1479190c8690f1f72b0bcd62e8a4c81ddbb6b206 (diff) |
coverity#1267681 Dereference before null check
Change-Id: I629b12d53ef3bbadeb43e9555a8499252c1a1800
Diffstat (limited to 'vcl/source/gdi/bmpacc.cxx')
-rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 7ad73870f664..33e5038a529f 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -426,7 +426,7 @@ BitmapWriteAccess::~BitmapWriteAccess() void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc ) { - DBG_ASSERT( ( nY >= 0 ) && ( nY < mpBuffer->mnHeight ), "y-coordinate in destination out of range!" ); + 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!" ); @@ -446,7 +446,7 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, { const sal_uLong nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat ); - DBG_ASSERT( ( nY >= 0 ) && ( nY < mpBuffer->mnHeight ), "y-coordinate in destination out of range!" ); + assert(nY >= 0 && nY < mpBuffer->mnHeight && "y-coordinate in destination out of range!"); DBG_ASSERT( ( HasPalette() && nFormat <= BMP_FORMAT_8BIT_PAL ) || ( !HasPalette() && nFormat > BMP_FORMAT_8BIT_PAL ), "No copying possible between palette and non palette scanlines!" ); |