1 files changed, 77 insertions, 65 deletions
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
index fcf2804ef2..f9d991b32f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
@@ -23,77 +23,89 @@
 #include "../barcode.h"
 #include "BC_DataMatrixVersion.h"
 #include "BC_DataMatrixDataBlock.h"
-CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock()
-{
+CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {}
+CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords,
+                                                 CFX_ByteArray* codewords) {
+  m_codewords.Copy(*codewords);
+  m_numDataCodewords = numDataCodewords;
 }
-CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray *codewords)
-{
-    m_codewords.Copy(*codewords);
-    m_numDataCodewords = numDataCodewords;
-}
-CFX_PtrArray *CBC_DataMatrixDataBlock::GetDataBlocks(CFX_ByteArray* rawCodewords, CBC_DataMatrixVersion *version, int32_t &e)
-{
-    ECBlocks *ecBlocks = version->GetECBlocks();
-    int32_t totalBlocks = 0;
-    const CFX_PtrArray &ecBlockArray = ecBlocks->GetECBlocks();
-    int32_t i;
-    for (i = 0; i < ecBlockArray.GetSize(); i++) {
-        totalBlocks += ((ECB*)ecBlockArray[i])->GetCount();
+CFX_PtrArray* CBC_DataMatrixDataBlock::GetDataBlocks(
+    CFX_ByteArray* rawCodewords,
+    CBC_DataMatrixVersion* version,
+    int32_t& e) {
+  ECBlocks* ecBlocks = version->GetECBlocks();
+  int32_t totalBlocks = 0;
+  const CFX_PtrArray& ecBlockArray = ecBlocks->GetECBlocks();
+  int32_t i;
+  for (i = 0; i < ecBlockArray.GetSize(); i++) {
+    totalBlocks += ((ECB*)ecBlockArray[i])->GetCount();
+  }
+  CBC_AutoPtr<CFX_PtrArray> result(FX_NEW CFX_PtrArray());
+  result->SetSize(totalBlocks);
+  int32_t numResultBlocks = 0;
+  int32_t j;
+  for (j = 0; j < ecBlockArray.GetSize(); j++) {
+    for (i = 0; i < ((ECB*)ecBlockArray[j])->GetCount(); i++) {
+      int32_t numDataCodewords = ((ECB*)ecBlockArray[j])->GetDataCodewords();
+      int32_t numBlockCodewords = ecBlocks->GetECCodewords() + numDataCodewords;
+      CFX_ByteArray codewords;
+      codewords.SetSize(numBlockCodewords);
+      (*result)[numResultBlocks++] =
+          FX_NEW CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
+      codewords.SetSize(0);
     }
-    CBC_AutoPtr<CFX_PtrArray>result(FX_NEW CFX_PtrArray());
-    result->SetSize(totalBlocks);
-    int32_t numResultBlocks = 0;
+  }
+  int32_t longerBlocksTotalCodewords =
+      ((CBC_DataMatrixDataBlock*)(*result)[0])->GetCodewords()->GetSize();
+  int32_t longerBlocksNumDataCodewords =
+      longerBlocksTotalCodewords - ecBlocks->GetECCodewords();
+  int32_t shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
+  int32_t rawCodewordsOffset = 0;
+  for (i = 0; i < shorterBlocksNumDataCodewords; i++) {
     int32_t j;
-    for (j = 0; j < ecBlockArray.GetSize(); j++) {
-        for (i = 0; i < ((ECB*)ecBlockArray[j])->GetCount(); i++) {
-            int32_t numDataCodewords = ((ECB*)ecBlockArray[j])->GetDataCodewords();
-            int32_t numBlockCodewords = ecBlocks->GetECCodewords() + numDataCodewords;
-            CFX_ByteArray codewords;
-            codewords.SetSize(numBlockCodewords);
-            (*result)[numResultBlocks++] = FX_NEW CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
-            codewords.SetSize(0);
-        }
-    }
-    int32_t longerBlocksTotalCodewords = ((CBC_DataMatrixDataBlock*)(*result)[0])->GetCodewords()->GetSize();
-    int32_t longerBlocksNumDataCodewords = longerBlocksTotalCodewords - ecBlocks->GetECCodewords();
-    int32_t shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
-    int32_t rawCodewordsOffset = 0;
-    for (i = 0; i < shorterBlocksNumDataCodewords; i++) {
-        int32_t j;
-        for (j = 0; j < numResultBlocks; j++) {
-            if (rawCodewordsOffset < rawCodewords->GetSize()) {
-                ((CBC_DataMatrixDataBlock*)(*result)[j])->GetCodewords()->operator [](i) = (*rawCodewords)[rawCodewordsOffset++];
-            }
-        }
+    for (j = 0; j < numResultBlocks; j++) {
+      if (rawCodewordsOffset < rawCodewords->GetSize()) {
+        ((CBC_DataMatrixDataBlock*)(*result)[j])
+            ->GetCodewords()
+            ->
+            operator[](i) = (*rawCodewords)[rawCodewordsOffset++];
+      }
     }
-    FX_BOOL specialVersion = version->GetVersionNumber() == 24;
-    int32_t numLongerBlocks = specialVersion ? 8 : numResultBlocks;
-    for (j = 0; j < numLongerBlocks; j++) {
-        if (rawCodewordsOffset < rawCodewords->GetSize()) {
-            ((CBC_DataMatrixDataBlock*)(*result)[j])->GetCodewords()->operator [](longerBlocksNumDataCodewords - 1) = (*rawCodewords)[rawCodewordsOffset++];
-        }
+  }
+  FX_BOOL specialVersion = version->GetVersionNumber() == 24;
+  int32_t numLongerBlocks = specialVersion ? 8 : numResultBlocks;
+  for (j = 0; j < numLongerBlocks; j++) {
+    if (rawCodewordsOffset < rawCodewords->GetSize()) {
+      ((CBC_DataMatrixDataBlock*)(*result)[j])
+          ->GetCodewords()
+          ->
+          operator[](longerBlocksNumDataCodewords - 1) =
+          (*rawCodewords)[rawCodewordsOffset++];
     }
-    int32_t max = ((CBC_DataMatrixDataBlock*)(*result)[0])->GetCodewords()->GetSize();
-    for (i = longerBlocksNumDataCodewords; i < max; i++) {
-        int32_t j;
-        for (j = 0; j < numResultBlocks; j++) {
-            int32_t iOffset = specialVersion && j > 7 ? i - 1 : i;
-            if (rawCodewordsOffset < rawCodewords->GetSize()) {
-                ((CBC_DataMatrixDataBlock*)(*result)[j])->GetCodewords()->operator [](iOffset) = (*rawCodewords)[rawCodewordsOffset++];
-            }
-        }
-    }
-    if (rawCodewordsOffset != rawCodewords->GetSize()) {
-        e = BCExceptionIllegalArgument;
-        return NULL;
+  }
+  int32_t max =
+      ((CBC_DataMatrixDataBlock*)(*result)[0])->GetCodewords()->GetSize();
+  for (i = longerBlocksNumDataCodewords; i < max; i++) {
+    int32_t j;
+    for (j = 0; j < numResultBlocks; j++) {
+      int32_t iOffset = specialVersion && j > 7 ? i - 1 : i;
+      if (rawCodewordsOffset < rawCodewords->GetSize()) {
+        ((CBC_DataMatrixDataBlock*)(*result)[j])
+            ->GetCodewords()
+            ->
+            operator[](iOffset) = (*rawCodewords)[rawCodewordsOffset++];
+      }
     }
-    return result.release();
+  }
+  if (rawCodewordsOffset != rawCodewords->GetSize()) {
+    e = BCExceptionIllegalArgument;
+    return NULL;
+  }
+  return result.release();
 }
-int32_t CBC_DataMatrixDataBlock::GetNumDataCodewords()
-{
-    return m_numDataCodewords;
+int32_t CBC_DataMatrixDataBlock::GetNumDataCodewords() {
+  return m_numDataCodewords;
 }
-CFX_ByteArray *CBC_DataMatrixDataBlock::GetCodewords()
-{
-    return &m_codewords;
+CFX_ByteArray* CBC_DataMatrixDataBlock::GetCodewords() {
+  return &m_codewords;
 }