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

zero a few more things out

Browse Source 
Change-Id: Ief743978876885745431c59a0f56f065cbd61ace
This commit is contained in:
Caolán McNamara 2014-04-17 12:28:01 +01:00
parent a69df73d3d
commit 5535d6ee7d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
filter/source/graphicfilter/itiff/itiff.cxx
View File

@ -282,13 +282,14 @@ sal_uLong TIFFReader::ReadIntData()
double TIFFReader::ReadDoubleData() double TIFFReader::ReadDoubleData()
{ {
sal_uInt32 nulong;
double nd; double nd;
if ( nDataType == 5 ) if ( nDataType == 5 )
{ {
sal_uInt32 nulong(0);
pTIFF->ReadUInt32( nulong ); pTIFF->ReadUInt32( nulong );
nd = (double)nulong; nd = (double)nulong;
nulong = 0;
pTIFF->ReadUInt32( nulong ); pTIFF->ReadUInt32( nulong );
if ( nulong != 0 ) if ( nulong != 0 )
nd /= (double)nulong; nd /= (double)nulong;
@ -298,8 +299,6 @@ double TIFFReader::ReadDoubleData()
return nd; return nd;
} }
void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
{ {
if ( bStatus == sal_False ) if ( bStatus == sal_False )
@ -644,7 +643,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
else if ( nCompression == 32773 ) else if ( nCompression == 32773 )
{ {
sal_uLong nStrip,nRecCount,nRowBytesLeft,ny,np,i; sal_uLong nStrip,nRecCount,nRowBytesLeft,ny,np,i;
sal_uInt8 * pdst, nRecHeader, nRecData; sal_uInt8 * pdst;
nStrip = 0; nStrip = 0;
if ( nStrip >= nNumStripOffsets ) if ( nStrip >= nNumStripOffsets )
return sal_False; return sal_False;
@ -664,6 +663,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
pdst=pMap[ np ]; pdst=pMap[ np ];
do do
{ {
sal_uInt8 nRecHeader(0);
pTIFF->ReadUChar( nRecHeader ); pTIFF->ReadUChar( nRecHeader );
if ((nRecHeader&0x80)==0) if ((nRecHeader&0x80)==0)
{ {
@ -685,6 +685,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
// return; // return;
} }
sal_uInt8 nRecData(0);
pTIFF->ReadUChar( nRecData ); pTIFF->ReadUChar( nRecData );
for ( i = 0; i < nRecCount; i++ ) for ( i = 0; i < nRecCount; i++ )
*(pdst++) = nRecData; *(pdst++) = nRecData;
@ -1122,8 +1123,8 @@ void TIFFReader::MakePalCol( void )
void TIFFReader::ReadHeader() void TIFFReader::ReadHeader()
{ {
sal_uInt8 nbyte1, nbyte2; sal_uInt8 nbyte1(0), nbyte2(0);
sal_uInt16 nushort; sal_uInt16 nushort(0);
pTIFF->ReadUChar( nbyte1 ); pTIFF->ReadUChar( nbyte1 );
if ( nbyte1 == 'I' ) if ( nbyte1 == 'I' )
@ -1152,10 +1153,10 @@ bool TIFFReader::HasAlphaChannel() const
bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{ {
sal_uInt16 i, nNumTags, nTagType; sal_uInt16 i, nNumTags(0), nTagType(0);
sal_uInt64 nMaxPos; sal_uInt64 nMaxPos;
sal_uLong nPos; sal_uLong nPos;
sal_uInt32 nFirstIfd, nDataLen; sal_uInt32 nFirstIfd(0), nDataLen;
bStatus = sal_True; bStatus = sal_True;
nLastPercent = 0; nLastPercent = 0;