Kaydet (Commit) 5d32a4ac authored tarafından Caolán McNamara's avatar Caolán McNamara

reduce scope, etc, don't loop endlessly

Change-Id: I86e4e94392527b5faf5d9cdb4251853f35813f4e
üst a890a769
......@@ -628,8 +628,6 @@ void CCIDecompressor::StartDecompression( SvStream & rIStream )
bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine )
{
sal_uInt16 i;
sal_uInt8 * pDst;
bool b2D;
if ( nEOLCount >= 5 ) // RTC (Return To Controller)
......@@ -678,8 +676,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget
delete[] pLastLine;
nLastLineSize = ( nTargetBits + 7 ) >> 3;
pLastLine = new sal_uInt8[ nLastLineSize ];
pDst = pLastLine;
for ( i = 0; i < nLastLineSize; i++ ) *( pDst++ ) = 0x00;
memset(pLastLine, 0, nLastLineSize);
}
}
// conditionally align start of line to next byte:
......@@ -706,9 +703,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget
// if we're in 2D mode we have to remember the line:
if ( nOptions & CCI_OPTION_2D && bStatus )
{
sal_uInt8 *pSrc = pTarget;
pDst = pLastLine;
for ( i = 0; i < nLastLineSize; i++ ) *(pDst++)=*(pSrc++);
memcpy(pLastLine, pTarget, nLastLineSize);
}
// #i122984#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment