Author: hdu
Date: Thu May 15 11:08:41 2014
New Revision: 1594862
URL: http://svn.apache.org/r1594862
Log:
#i124422# fix comparisons between pointers and bools or integers
comparing pointers with bools or integers is not a good idea and
clang>=3.4 or xcode>=5.1 now report errors for such code. The
errors break the build and so they have to be fixed.
Modified:
openoffice/trunk/main/filter/source/graphicfilter/ipbm/ipbm.cxx
openoffice/trunk/main/filter/source/graphicfilter/ipcd/ipcd.cxx
openoffice/trunk/main/filter/source/graphicfilter/ipcx/ipcx.cxx
openoffice/trunk/main/filter/source/graphicfilter/iras/iras.cxx
openoffice/trunk/main/filter/source/graphicfilter/itga/itga.cxx
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipbm/ipbm.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipbm/ipbm.cxx?rev=1594862&r1=1594861&r2=1594862&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipbm/ipbm.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipbm/ipbm.cxx Thu May 15
11:08:41 2014
@@ -107,7 +107,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
{
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff,
0xff ) );
@@ -122,7 +123,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
else
maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
mnCol = (sal_uInt16)mnMaxVal + 1;
if ( mnCol > 256 )
@@ -137,7 +139,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
break;
case 2 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
break;
}
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipcd/ipcd.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipcd/ipcd.cxx?rev=1594862&r1=1594861&r2=1594862&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipcd/ipcd.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipcd/ipcd.cxx Thu May 15
11:08:41 2014
@@ -155,7 +155,8 @@ sal_Bool PCDReader::ReadPCD( SvStream &
nBMPHeight = nWidth;
}
aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
- if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ mpAcc = aBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
ReadImage( 5 ,65 );
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipcx/ipcx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipcx/ipcx.cxx?rev=1594862&r1=1594861&r2=1594862&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipcx/ipcx.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipcx/ipcx.cxx Thu May 15
11:08:41 2014
@@ -114,7 +114,8 @@ sal_Bool PCXReader::ReadPCX( SvStream &
if ( nStatus )
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
- if ( ( pAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ pAcc = aBmp.AcquireWriteAccess();
+ if ( !pAcc )
return sal_False;
if ( nDestBitsPerPixel <= 8 )
Modified: openoffice/trunk/main/filter/source/graphicfilter/iras/iras.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/iras/iras.cxx?rev=1594862&r1=1594861&r2=1594862&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/iras/iras.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/iras/iras.cxx Thu May 15
11:08:41 2014
@@ -103,7 +103,8 @@ sal_Bool RASReader::ReadRAS( SvStream &
return sal_False;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
Modified: openoffice/trunk/main/filter/source/graphicfilter/itga/itga.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itga/itga.cxx?rev=1594862&r1=1594861&r2=1594862&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/itga/itga.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itga/itga.cxx Thu May 15
11:08:41 2014
@@ -685,7 +685,7 @@ sal_Bool TGAReader::ImplReadPalette()
mpFileHeader->nColorMapEntrySize = 0x3f; //
patch for the following switch routine
}
mpColorMap = new sal_uInt32[ nColors ]; // we will
always index dwords
- if ( mpColorMap == sal_False )
+ if ( !mpColorMap ) // NOTE: check for new-result==NULL because
exceptions are disabled in this module
return sal_False;
// out of memory %&!$&/!"�$
switch( mpFileHeader->nColorMapEntrySize )
