1 files changed, 16 insertions, 7 deletions
diff --git a/CPP/7zip/Compress/PpmdEncoder.h b/CPP/7zip/Compress/PpmdEncoder.h
index ed8b3713..fb74cf57 100755
--- a/CPP/7zip/Compress/PpmdEncoder.h
+++ b/CPP/7zip/Compress/PpmdEncoder.h
@@ -1,5 +1,4 @@
 // PpmdEncoder.h
-// 2009-03-11 : Igor Pavlov : Public domain
 
 #ifndef __COMPRESS_PPMD_ENCODER_H
 #define __COMPRESS_PPMD_ENCODER_H
@@ -15,6 +14,21 @@
 namespace NCompress {
 namespace NPpmd {
 
+struct CEncProps
+{
+  UInt32 MemSize;
+  UInt32 ReduceSize;
+  int Order;
+  
+  CEncProps()
+  {
+    MemSize = (UInt32)(Int32)-1;
+    ReduceSize = (UInt32)(Int32)-1;
+    Order = -1;
+  }
+  void Normalize(int level);
+};
+
 class CEncoder :
   public ICompressCoder,
   public ICompressSetCoderProperties,
@@ -25,20 +39,15 @@ class CEncoder :
   CByteOutBufWrap _outStream;
   CPpmd7z_RangeEnc _rangeEnc;
   CPpmd7 _ppmd;
-
-  UInt32 _usedMemSize;
-  Byte _order;
-
+  CEncProps _props;
 public:
   MY_UNKNOWN_IMP2(
       ICompressSetCoderProperties,
       ICompressWriteCoderProperties)
-
   STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
       const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
   STDMETHOD(SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps);
   STDMETHOD(WriteCoderProperties)(ISequentialOutStream *outStream);
-
   CEncoder();
   ~CEncoder();
 };