openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject svn commit: r1560262 - /openoffice/trunk/main/vcl/source/gdi/dibtools.cxx
Date Wed, 22 Jan 2014 06:16:21 GMT
Author: hanya
Date: Wed Jan 22 06:16:21 2014
New Revision: 1560262

URL: http://svn.apache.org/r1560262
Log:
#i106063# avoid additional seek for true color DIB

The position in the stream is already at the end of color palette.

Modified:
    openoffice/trunk/main/vcl/source/gdi/dibtools.cxx

Modified: openoffice/trunk/main/vcl/source/gdi/dibtools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/dibtools.cxx?rev=1560262&r1=1560261&r2=1560262&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/dibtools.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/dibtools.cxx Wed Jan 22 06:16:21 2014
@@ -419,12 +419,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DI
     // Read data
 	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);
 	}
 	else
@@ -460,12 +454,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DI
 			const long nHeight(rHeader.nHeight);
 			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);
 			long nY(bTopDown ? 0 : nHeight - 1);
 			long nCount(nHeight);



Mime
View raw message