4.52 beta

2 files changed, 4 insertions, 16 deletions

diff --git a/CPP/7zip/Archive/Cab/CabBlockInStream.h b/CPP/7zip/Archive/Cab/CabBlockInStream.h
index 46e15222..b8b5d8b9 100755
--- a/CPP/7zip/Archive/Cab/CabBlockInStream.h
+++ b/CPP/7zip/Archive/Cab/CabBlockInStream.h
@@ -17,7 +17,6 @@ class CCabBlockInStream:
   Byte *_buffer;
   UInt32 _pos;
   UInt32 _size;
-  int _align;
 
 public:
   UInt32 TotalPackSize;
@@ -25,24 +24,13 @@ public:
   bool DataError;
   bool MsZip;
 
-  CCabBlockInStream(): _buffer(0), ReservedSize(0), MsZip(false), DataError(false), _align(0), TotalPackSize(0) {}
+  CCabBlockInStream(): _buffer(0), ReservedSize(0), MsZip(false), DataError(false), TotalPackSize(0) {}
   ~CCabBlockInStream();
   bool Create();
   void SetStream(ISequentialInStream *stream) {  _stream = stream; }
 
-  void InitForNewFolder()
-  {
-    _align = 0;
-    TotalPackSize = 0;
-  }
-  
-  void InitForNewBlock()
-  {
-    _size = 0;
-    _align = (_align + (int)TotalPackSize) & 1;
-  }
-
-  int GetAlign() const { return _align; }
+  void InitForNewFolder() { TotalPackSize = 0; }
+  void InitForNewBlock() { _size = 0; }
 
   MY_UNKNOWN_IMP
 
diff --git a/CPP/7zip/Archive/Cab/CabHandler.cpp b/CPP/7zip/Archive/Cab/CabHandler.cpp
index 1c0e2feb..2ce9d9ce 100755
--- a/CPP/7zip/Archive/Cab/CabHandler.cpp
+++ b/CPP/7zip/Archive/Cab/CabHandler.cpp
@@ -769,7 +769,7 @@ STDMETHODIMP CHandler::Extract(const UInt32* indices, UInt32 numItems,
             res = deflateDecoder->Code(cabBlockInStream, outStream, NULL, &unpackRemain, NULL);
             break;
           case NHeader::NCompressionMethodMajor::kLZX:
-            lzxDecoderSpec->SetKeepHistory(keepHistory, cabBlockInStreamSpec->GetAlign());
+            lzxDecoderSpec->SetKeepHistory(keepHistory);
             res = lzxDecoder->Code(cabBlockInStream, outStream, NULL, &unpackRemain, NULL);
             break;
           case NHeader::NCompressionMethodMajor::kQuantum: