Resolved conflicts

cielavenir · Feb 9, 2025 · a589f24 · a589f24
1 parent 437e463
commit a589f24
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 17 deletions.
diff --git a/CPP/7zip/Archive/LizardHandler.cpp b/CPP/7zip/Archive/LizardHandler.cpp
@@ -51,8 +51,6 @@ class CHandler:
 
   UInt64 _packSize;
   UInt64 _unpackSize;
-  UInt64 _numStreams;
-  UInt64 _numBlocks;
 
   CSingleMethodProps _props;
 

diff --git a/CPP/7zip/Archive/Lz4Handler.cpp b/CPP/7zip/Archive/Lz4Handler.cpp
@@ -51,8 +51,6 @@ class CHandler:
 
   UInt64 _packSize;
   UInt64 _unpackSize;
-  UInt64 _numStreams;
-  UInt64 _numBlocks;
 
   CSingleMethodProps _props;
 

diff --git a/CPP/7zip/Archive/Lz5Handler.cpp b/CPP/7zip/Archive/Lz5Handler.cpp
@@ -51,8 +51,6 @@ class CHandler:
 
   UInt64 _packSize;
   UInt64 _unpackSize;
-  UInt64 _numStreams;
-  UInt64 _numBlocks;
 
   CSingleMethodProps _props;
 

diff --git a/CPP/7zip/Archive/LzHandler.cpp b/CPP/7zip/Archive/LzHandler.cpp
@@ -305,7 +305,7 @@ class CCompressProgressInfoImp:
   MY_UNKNOWN_IMP1(ICompressProgressInfo)
 
 public:
-  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) noexcept;
+  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) noexcept OVERRIDE;
   void Init(IArchiveOpenCallback *callback) { Callback = callback; }
 
   virtual ~CCompressProgressInfoImp() = default;

diff --git a/CPP/7zip/Compress/LzhamRegister.cpp b/CPP/7zip/Compress/LzhamRegister.cpp
@@ -429,7 +429,7 @@ namespace NCompress
       {
          lzham_compress_state_ptr _state;
          CProps _props;
-         bool _dictSizeSet;
+         // bool _dictSizeSet;
          int _num_threads;
 
          Byte *_inBuf;
@@ -465,7 +465,7 @@ namespace NCompress
 
       CEncoder::CEncoder() :
          _state(NULL),
-         _dictSizeSet(false),
+         // _dictSizeSet(false),
          _num_threads(-1),
          _inBuf(NULL),
          _outBuf(NULL),

diff --git a/CPP/7zip/Compress/ZstdDecoder.h b/CPP/7zip/Compress/ZstdDecoder.h
@@ -109,6 +109,10 @@ class CDecoder : public ICompressCoder,
   HRESULT CodeResume(ISequentialOutStream *outStream, const UInt64 *outSize,
                      ICompressProgressInfo *progress);
 
+ #ifndef Z7_NO_READ_FROM_CODER_ZSTD
+  UInt64 GetInputProcessedSize() const { return _inProcessed; }
+ #endif
+
   CDecoder();
   virtual ~CDecoder();
 };

diff --git a/CPP/Common/Blake3Reg.cpp b/CPP/Common/Blake3Reg.cpp
@@ -22,7 +22,6 @@ class CBLAKE3Hasher:
   public CMyUnknownImp
 {
   blake3_hasher _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CBLAKE3Hasher() { blake3_hasher_init(&_ctx); }

diff --git a/CPP/Common/Md2Reg.cpp b/CPP/Common/Md2Reg.cpp
@@ -22,7 +22,6 @@ class CMD2Hasher:
   public CMyUnknownImp
 {
   MD2_CTX _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CMD2Hasher() { MD2_Init(&_ctx); }

diff --git a/CPP/Common/Md4Reg.cpp b/CPP/Common/Md4Reg.cpp
@@ -22,7 +22,6 @@ class CMD4Hasher:
   public CMyUnknownImp
 {
   MD4_CTX _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CMD4Hasher() { MD4_Init(&_ctx); }

diff --git a/CPP/Common/Md5Reg.cpp b/CPP/Common/Md5Reg.cpp
@@ -22,7 +22,6 @@ class CMD5Hasher:
   public CMyUnknownImp
 {
   MD5_CTX _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CMD5Hasher() { MD5_Init(&_ctx); }

diff --git a/CPP/Common/Sha384Reg.cpp b/CPP/Common/Sha384Reg.cpp
@@ -22,7 +22,6 @@ class CSHA384Hasher:
   public CMyUnknownImp
 {
   SHA384_CTX _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CSHA384Hasher() { SHA384_Init(&_ctx); }

diff --git a/CPP/Common/Sha512Reg.cpp b/CPP/Common/Sha512Reg.cpp
@@ -22,7 +22,6 @@ class CSHA512Hasher:
   public CMyUnknownImp
 {
   SHA512_CTX _ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CSHA512Hasher() { SHA512_Init(&_ctx); }

diff --git a/CPP/Common/XXH32Reg.cpp b/CPP/Common/XXH32Reg.cpp
@@ -21,7 +21,6 @@ class CXXH32Hasher:
   public CMyUnknownImp
 {
   XXH32_state_t *_ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CXXH32Hasher() { _ctx = XXH32_createState(); }

diff --git a/CPP/Common/XXH64Reg.cpp b/CPP/Common/XXH64Reg.cpp
@@ -21,7 +21,6 @@ class CXXH64Hasher:
   public CMyUnknownImp
 {
   XXH64_state_t *_ctx;
-  Byte mtDummy[1 << 7];
 
 public:
   CXXH64Hasher() { _ctx = XXH64_createState(); }