Kaydet (Commit) 87cb3a7c authored tarafından Matúš Kukan's avatar Matúš Kukan

unusedcode: Remove Deflater::setLevel

Which makes bSetParams always false; remove that too, together with nLevel.

Change-Id: I94a4ec14b2b2c498d749ef72c1b6b118bba37076
üst 8b292a29
...@@ -35,8 +35,7 @@ protected: ...@@ -35,8 +35,7 @@ protected:
com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
bool bFinish; bool bFinish;
bool bFinished; bool bFinished;
bool bSetParams; sal_Int32 nStrategy;
sal_Int32 nLevel, nStrategy;
sal_Int64 nOffset, nLength; sal_Int64 nOffset, nLength;
z_stream* pStream; z_stream* pStream;
...@@ -47,7 +46,6 @@ public: ...@@ -47,7 +46,6 @@ public:
~Deflater(); ~Deflater();
Deflater(sal_Int32 nSetLevel, bool bNowrap); Deflater(sal_Int32 nSetLevel, bool bNowrap);
void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
void SAL_CALL setLevel( sal_Int32 nNewLevel );
bool SAL_CALL needsInput( ); bool SAL_CALL needsInput( );
void SAL_CALL finish( ); void SAL_CALL finish( );
bool SAL_CALL finished( ) { return bFinished;} bool SAL_CALL finished( ) { return bFinished;}
......
...@@ -59,8 +59,6 @@ void Deflater::init (sal_Int32 nLevelArg, sal_Int32 nStrategyArg, bool bNowrap) ...@@ -59,8 +59,6 @@ void Deflater::init (sal_Int32 nLevelArg, sal_Int32 nStrategyArg, bool bNowrap)
Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap) Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap)
: bFinish(false) : bFinish(false)
, bFinished(false) , bFinished(false)
, bSetParams(false)
, nLevel(nSetLevel)
, nStrategy(DEFAULT_STRATEGY) , nStrategy(DEFAULT_STRATEGY)
, nOffset(0) , nOffset(0)
, nLength(0) , nLength(0)
...@@ -71,58 +69,26 @@ Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap) ...@@ -71,58 +69,26 @@ Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap)
sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength) sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength)
{ {
sal_Int32 nResult; sal_Int32 nResult;
if (bSetParams) pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset;
{ pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset;
pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset; pStream->avail_in = nLength;
pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset; pStream->avail_out = nNewLength;
pStream->avail_in = nLength;
pStream->avail_out = nNewLength;
#if !defined Z_PREFIX #if !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy); nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else #else
nResult = z_deflateParams(pStream, nLevel, nStrategy); nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#endif #endif
switch (nResult) switch (nResult)
{
case Z_OK:
bSetParams = false;
nOffset += nLength - pStream->avail_in;
nLength = pStream->avail_in;
return nNewLength - pStream->avail_out;
case Z_BUF_ERROR:
bSetParams = false;
return 0;
default:
return 0;
}
}
else
{ {
pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset; case Z_STREAM_END:
pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset; bFinished = true;
pStream->avail_in = nLength; case Z_OK:
pStream->avail_out = nNewLength; nOffset += nLength - pStream->avail_in;
nLength = pStream->avail_in;
#if !defined Z_PREFIX return nNewLength - pStream->avail_out;
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); default:
#else return 0;
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#endif
switch (nResult)
{
case Z_STREAM_END:
bFinished = true;
case Z_OK:
nOffset += nLength - pStream->avail_in;
nLength = pStream->avail_in;
return nNewLength - pStream->avail_out;
case Z_BUF_ERROR:
bSetParams = false;
return 0;
default:
return 0;
}
} }
} }
...@@ -134,18 +100,7 @@ void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffe ...@@ -134,18 +100,7 @@ void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffe
nOffset = nNewOffset; nOffset = nNewOffset;
nLength = nNewLength; nLength = nNewLength;
} }
void SAL_CALL Deflater::setLevel( sal_Int32 nNewLevel )
{
if ((nNewLevel < 0 || nNewLevel > 9) && nNewLevel != DEFAULT_COMPRESSION)
{
// do error handling
}
if (nNewLevel != nLevel)
{
nLevel = nNewLevel;
bSetParams = true;
}
}
bool SAL_CALL Deflater::needsInput( ) bool SAL_CALL Deflater::needsInput( )
{ {
return nLength <=0; return nLength <=0;
......
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