Merge branch 'master' into 816

1 files changed, 57 insertions, 0 deletions

diff --git a/other-licenses/7zstub/src/CPP/7zip/Common/UniqBlocks.cpp b/other-licenses/7zstub/src/CPP/7zip/Common/UniqBlocks.cpp
new file mode 100644
index 000000000..5baf1a495
--- /dev/null
+++ b/other-licenses/7zstub/src/CPP/7zip/Common/UniqBlocks.cpp
@@ -0,0 +1,57 @@
+// UniqBlocks.cpp

+

+#include "StdAfx.h"

+

+#include <string.h>

+

+#include "UniqBlocks.h"

+

+unsigned CUniqBlocks::AddUniq(const Byte *data, size_t size)

+{

+  unsigned left = 0, right = Sorted.Size();

+  while (left != right)

+  {

+    unsigned mid = (left + right) / 2;

+    unsigned index = Sorted[mid];

+    const CByteBuffer &buf = Bufs[index];

+    size_t sizeMid = buf.Size();

+    if (size < sizeMid)

+      right = mid;

+    else if (size > sizeMid)

+      left = mid + 1;

+    else

+    {

+      if (size == 0)

+        return index;

+      int cmp = memcmp(data, buf, size);

+      if (cmp == 0)

+        return index;

+      if (cmp < 0)

+        right = mid;

+      else

+        left = mid + 1;

+    }

+  }

+  unsigned index = Bufs.Size();

+  Sorted.Insert(left, index);

+  Bufs.AddNew().CopyFrom(data, size);

+  return index;

+}

+

+UInt64 CUniqBlocks::GetTotalSizeInBytes() const

+{

+  UInt64 size = 0;

+  FOR_VECTOR (i, Bufs)

+    size += Bufs[i].Size();

+  return size;

+}

+

+void CUniqBlocks::GetReverseMap()

+{

+  unsigned num = Sorted.Size();

+  BufIndexToSortedIndex.ClearAndSetSize(num);

+  unsigned *p = &BufIndexToSortedIndex[0];

+  const unsigned *sorted = &Sorted[0];

+  for (unsigned i = 0; i < num; i++)

+    p[sorted[i]] = i;

+}