mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1398817 Unintended sign extension

Browse Source 
and

coverity#1398818 Unintended sign extension

Change-Id: Id8eaffa6e19dd36dc59d7d63fabb398aefdcf433
This commit is contained in:
Caolán McNamara
2017-01-17 09:14:06 +00:00
parent 2ccc311712
commit d1b088b84a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
svx/source/xoutdev/xattrbmp.cxx
View File

@@ -73,7 +73,7 @@ void XOBitmap::Bitmap2Array()
ScopedVclPtrInstance< VirtualDevice > pVDev; ScopedVclPtrInstance< VirtualDevice > pVDev;
bool bPixelColor = false; bool bPixelColor = false;
const Bitmap aBitmap( GetBitmap() ); const Bitmap aBitmap( GetBitmap() );
const sal_uInt16 nLines = 8; // type dependent const sal_Int32 nLines = 8; // type dependent
if( !pPixelArray ) if( !pPixelArray )
pPixelArray.reset( new sal_uInt16[ nLines * nLines ] ); pPixelArray.reset( new sal_uInt16[ nLines * nLines ] );
@@ -83,9 +83,9 @@ void XOBitmap::Bitmap2Array()
aPixelColor = aBckgrColor = pVDev->GetPixel( Point() ); aPixelColor = aBckgrColor = pVDev->GetPixel( Point() );
// create array and determine foreground and background color // create array and determine foreground and background color
for( sal_uInt16 i = 0; i < nLines; i++ ) for (sal_Int32 i = 0; i < nLines; ++i)
{ {
for( sal_uInt16 j = 0; j < nLines; j++ ) for (sal_Int32 j = 0; j < nLines; ++j)
{ {
if ( pVDev->GetPixel( Point( j, i ) ) == aBckgrColor ) if ( pVDev->GetPixel( Point( j, i ) ) == aBckgrColor )
pPixelArray[ j + i * nLines ] = 0; pPixelArray[ j + i * nLines ] = 0;
@@ -105,18 +105,18 @@ void XOBitmap::Bitmap2Array()
/// convert array, fore- and background color into a bitmap /// convert array, fore- and background color into a bitmap
void XOBitmap::Array2Bitmap() void XOBitmap::Array2Bitmap()
{ {
ScopedVclPtrInstance< VirtualDevice > pVDev; if (!pPixelArray)
sal_uInt16 nLines = 8; // type dependent
if( !pPixelArray )
return; return;
ScopedVclPtrInstance< VirtualDevice > pVDev;
const sal_Int32 nLines = 8; // type dependent
pVDev->SetOutputSizePixel( Size( nLines, nLines ) ); pVDev->SetOutputSizePixel( Size( nLines, nLines ) );
// create bitmap // create bitmap
for( sal_uInt16 i = 0; i < nLines; i++ ) for (sal_Int32 i = 0; i < nLines; ++i)
{ {
for( sal_uInt16 j = 0; j < nLines; j++ ) for (sal_Int32 j = 0; j < nLines; ++j)
{ {
if( pPixelArray[ j + i * nLines ] == 0 ) if( pPixelArray[ j + i * nLines ] == 0 )
pVDev->DrawPixel( Point( j, i ), aBckgrColor ); pVDev->DrawPixel( Point( j, i ), aBckgrColor );