24.0524.05

1 files changed, 30 insertions, 9 deletions

diff --git a/CPP/Common/MyBuffer2.h b/CPP/Common/MyBuffer2.h
index 23394f8..1ec8ffb 100644
--- a/CPP/Common/MyBuffer2.h
+++ b/CPP/Common/MyBuffer2.h
@@ -65,13 +65,13 @@ class CAlignedBuffer1
 public:
   ~CAlignedBuffer1()
   {
-    ISzAlloc_Free(&g_AlignedAlloc, _data);
+    z7_AlignedFree(_data);
   }
 
   CAlignedBuffer1(size_t size)
   {
     _data = NULL;
-    _data = (Byte *)ISzAlloc_Alloc(&g_AlignedAlloc, size);
+    _data = (Byte *)z7_AlignedAlloc(size);
     if (!_data)
       throw 1;
   }
@@ -92,21 +92,23 @@ public:
   CAlignedBuffer(): _data(NULL), _size(0) {}
   ~CAlignedBuffer()
   {
-    ISzAlloc_Free(&g_AlignedAlloc, _data);
+    z7_AlignedFree(_data);
   }
 
+  /*
   CAlignedBuffer(size_t size): _size(0)
   {
     _data = NULL;
-    _data = (Byte *)ISzAlloc_Alloc(&g_AlignedAlloc, size);
+    _data = (Byte *)z7_AlignedAlloc(size);
     if (!_data)
       throw 1;
     _size = size;
   }
+  */
 
   void Free()
   {
-    ISzAlloc_Free(&g_AlignedAlloc, _data);
+    z7_AlignedFree(_data);
     _data = NULL;
     _size = 0;
   }
@@ -120,10 +122,10 @@ public:
   {
     if (!_data || size != _size)
     {
-      ISzAlloc_Free(&g_AlignedAlloc, _data);
+      z7_AlignedFree(_data);
       _size = 0;
       _data = NULL;
-      _data = (Byte *)ISzAlloc_Alloc(&g_AlignedAlloc, size);
+      _data = (Byte *)z7_AlignedAlloc(size);
       if (_data)
         _size = size;
     }
@@ -133,10 +135,29 @@ public:
   {
     if (!_data || size > _size)
     {
-      ISzAlloc_Free(&g_AlignedAlloc, _data);
+      z7_AlignedFree(_data);
       _size = 0;
       _data = NULL;
-      _data = (Byte *)ISzAlloc_Alloc(&g_AlignedAlloc, size);
+      _data = (Byte *)z7_AlignedAlloc(size);
+      if (_data)
+        _size = size;
+    }
+  }
+
+  // (size <= size_max)
+  void AllocAtLeast_max(size_t size, size_t size_max)
+  {
+    if (!_data || size > _size)
+    {
+      z7_AlignedFree(_data);
+      _size = 0;
+      _data = NULL;
+      if (size_max < size) size_max = size; // optional check
+      const size_t delta = size / 2;
+      size += delta;
+      if (size < delta || size > size_max)
+        size = size_max;
+      _data = (Byte *)z7_AlignedAlloc(size);
       if (_data)
         _size = size;
     }