summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-10-22 15:31:16 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-10-22 16:03:20 +0200
commit87cb3a7c9609a298980e7384633aa383d69eca34 (patch)
tree6e3560805900f5fa3c12b84fefdd7f7221781067 /package
parent8b292a29a4dbfef15eb0475b71d33330bb55d3b2 (diff)
unusedcode: Remove Deflater::setLevel
Which makes bSetParams always false; remove that too, together with nLevel. Change-Id: I94a4ec14b2b2c498d749ef72c1b6b118bba37076
Diffstat (limited to 'package')
-rw-r--r--package/source/zipapi/Deflater.cxx77
1 files changed, 16 insertions, 61 deletions
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 96d43fc980b3..a76362ff268a 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -59,8 +59,6 @@ void Deflater::init (sal_Int32 nLevelArg, sal_Int32 nStrategyArg, bool bNowrap)
Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap)
: bFinish(false)
, bFinished(false)
-, bSetParams(false)
-, nLevel(nSetLevel)
, nStrategy(DEFAULT_STRATEGY)
, nOffset(0)
, nLength(0)
@@ -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 nResult;
- if (bSetParams)
- {
- pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset;
- pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset;
- pStream->avail_in = nLength;
- pStream->avail_out = nNewLength;
+ pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset;
+ pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset;
+ pStream->avail_in = nLength;
+ pStream->avail_out = nNewLength;
#if !defined Z_PREFIX
- nResult = deflateParams(pStream, nLevel, nStrategy);
+ nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else
- nResult = z_deflateParams(pStream, nLevel, nStrategy);
+ nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#endif
- 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
+ switch (nResult)
{
- pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset;
- pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset;
- pStream->avail_in = nLength;
- pStream->avail_out = nNewLength;
-
-#if !defined Z_PREFIX
- nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
-#else
- 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;
- }
+ case Z_STREAM_END:
+ bFinished = true;
+ case Z_OK:
+ nOffset += nLength - pStream->avail_in;
+ nLength = pStream->avail_in;
+ return nNewLength - pStream->avail_out;
+ default:
+ return 0;
}
}
@@ -134,18 +100,7 @@ void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffe
nOffset = nNewOffset;
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( )
{
return nLength <=0;