Kaydet (Commit) b6599114 authored tarafından Tsutomu Uchino's avatar Tsutomu Uchino Kaydeden (comit) Caolán McNamara

Resolves: #i106063# avoid additional seek for true color DIB

The position in the stream is already at the end of color palette.
(cherry picked from commit 352ca2f6)

Change-Id: I1696c1b6780407ab579b6215ab13a327ae09fc32
üst 8c4edbb6
...@@ -414,12 +414,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r ...@@ -414,12 +414,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
// Read data // Read data
if(bNative) if(bNative)
{ {
// true color DIB's can have a (optimization) palette
if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
{
rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3));
}
rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth); rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
} }
else else
...@@ -455,12 +449,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r ...@@ -455,12 +449,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
const long nHeight(rHeader.nHeight); const long nHeight(rHeader.nHeight);
sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth]; sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
// true color DIB's can have a (optimization) palette
if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
{
rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3));
}
const long nI(bTopDown ? 1 : -1); const long nI(bTopDown ? 1 : -1);
long nY(bTopDown ? 0 : nHeight - 1); long nY(bTopDown ? 0 : nHeight - 1);
long nCount(nHeight); long nCount(nHeight);
......
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