writerfilter/source/dmapper/GraphicImport.cxx | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
New commits:
commit 35df0d64727f975a0073aa3b0b0de0a903b77b64
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Tue Jul 3 19:45:26 2018 +0200
m_nHeaderLength is always 0
ever since
commit 3716b144265dda695d7dd447dbe692a3f84c588e
Date: Mon Aug 8 15:38:59 2016 +0200
loplugin:constantparam
and because (m_nPosition < m_nHeaderLength) is always false,
m_pBMPHeader is unused too.
Change-Id: I481e37ba75dfe4523ea49d10f94a35b045334a8d
Reviewed-on: https://gerrit.libreoffice.org/56897
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 0f828c22cd12..1e135f43c22a 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -76,9 +76,6 @@ class XInputStreamHelper : public
cppu::WeakImplHelper<io::XInputStream>
const sal_uInt8* m_pBuffer;
const sal_Int32 m_nLength;
sal_Int32 m_nPosition;
-
- const sal_uInt8* m_pBMPHeader; //default BMP-header
- sal_Int32 m_nHeaderLength;
public:
XInputStreamHelper(const sal_uInt8* buf, size_t len);
@@ -94,10 +91,6 @@ XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf,
size_t len) :
m_nLength( len ),
m_nPosition( 0 )
{
- static const sal_uInt8 aHeader[] =
- {0x42, 0x4d, 0xe6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
0x00, 0x00, 0x00 };
- m_pBMPHeader = aHeader;
- m_nHeaderLength = 0;
}
sal_Int32 XInputStreamHelper::readBytes( uno::Sequence<sal_Int8>& aData,
sal_Int32 nBytesToRead )
@@ -110,24 +103,16 @@ sal_Int32 XInputStreamHelper::readSomeBytes(
uno::Sequence<sal_Int8>& aData, sal
sal_Int32 nRet = 0;
if( nMaxBytesToRead > 0 )
{
- if( nMaxBytesToRead > (m_nLength + m_nHeaderLength) - m_nPosition )
- nRet = (m_nLength + m_nHeaderLength) - m_nPosition;
+ if( nMaxBytesToRead > m_nLength - m_nPosition )
+ nRet = m_nLength - m_nPosition;
else
nRet = nMaxBytesToRead;
aData.realloc( nRet );
sal_Int8* pData = aData.getArray();
sal_Int32 nHeaderRead = 0;
- if( m_nPosition < m_nHeaderLength)
- {
- //copy header content first
- nHeaderRead = m_nHeaderLength - m_nPosition;
- memcpy( pData, m_pBMPHeader + (m_nPosition ), nHeaderRead );
- nRet -= nHeaderRead;
- m_nPosition += nHeaderRead;
- }
if( nRet )
{
- memcpy( pData + nHeaderRead, m_pBuffer + (m_nPosition -
m_nHeaderLength), nRet );
+ memcpy( pData + nHeaderRead, m_pBuffer + m_nPosition, nRet );
m_nPosition += nRet;
}
}
@@ -137,7 +122,7 @@ sal_Int32 XInputStreamHelper::readSomeBytes(
uno::Sequence<sal_Int8>& aData, sal
void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip )
{
- if( nBytesToSkip < 0 || m_nPosition + nBytesToSkip > (m_nLength +
m_nHeaderLength))
+ if( nBytesToSkip < 0 || m_nPosition + nBytesToSkip > m_nLength)
throw io::BufferSizeExceededException();
m_nPosition += nBytesToSkip;
}
@@ -145,7 +130,7 @@ void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip )
sal_Int32 XInputStreamHelper::available( )
{
- return ( m_nLength + m_nHeaderLength ) - m_nPosition;
+ return m_nLength - m_nPosition;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
