[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[David Tardon]

 vcl/source/gdi/dibtools.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 290e8e787cc807297725dd41ce7f75817f159c26
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jan 22 15:14:08 2016 +0100

    absolute seek is clearer
    
    Change-Id: Iec8ff121e630bc6f63f935af248edce4dd572428
    (cherry picked from commit 4c241896ffab41da0cc1bcbf7e3401f205da28a1)
    Reviewed-on: https://gerrit.libreoffice.org/21787
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 59db04c..030cf57 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -832,8 +832,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
             aCodec.Read( rIStm, pData, nUncodedSize );
             aCodec.EndCompression();
 
-            // skip unread bytes from coded buffer
-            rIStm.SeekRel( nCodedSize - ( rIStm.Tell() - nCodedPos ) );
+            // Seek behind the encoded block. There might have been bytes left or the codec might have read more than necessary.
+            rIStm.Seek(nCodedSize + nCodedPos);
 
             // set decoded bytes to memory stream,
             // from which we will read the bitmap data