Remove barcode reading code.

We never read barcodes, we only write them. Remove code related to barcode
reading.

Review-Url: https://codereview.chromium.org/2071633002

157 files changed, 187 insertions, 14400 deletions

diff --git a/xfa/fwl/basewidget/cfx_barcode.cpp b/xfa/fwl/basewidget/cfx_barcode.cpp
index 795c834181..665317989a 100644
--- a/xfa/fwl/basewidget/cfx_barcode.cpp
+++ b/xfa/fwl/basewidget/cfx_barcode.cpp
@@ -18,7 +18,9 @@
 #include "xfa/fxbarcode/cbc_upca.h"
 #include "xfa/fxbarcode/utils.h"
 
-static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
+namespace {
+
+CBC_CodeBase* CreateBarCodeEngineObject(BC_TYPE type) {
   switch (type) {
     case BC_CODE39:
       return new CBC_Code39();
@@ -48,6 +50,8 @@ static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
   }
 }
 
+}  // namespace
+
 CFX_Barcode::CFX_Barcode() {}
 
 CFX_Barcode::~CFX_Barcode() {
@@ -55,7 +59,7 @@ CFX_Barcode::~CFX_Barcode() {
 }
 
 FX_BOOL CFX_Barcode::Create(BC_TYPE type) {
-  m_pBCEngine = FX_Barcode_CreateBarCodeEngineObject(type);
+  m_pBCEngine = CreateBarCodeEngineObject(type);
   return m_pBCEngine != NULL;
 }
 BC_TYPE CFX_Barcode::GetType() {
@@ -341,37 +345,3 @@ FX_BOOL CFX_Barcode::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
   }
   return m_pBCEngine->RenderBitmap(pOutBitmap, e);
 }
-
-CFX_WideString CFX_Barcode::Decode(uint8_t* buf,
-                                   int32_t width,
-                                   int32_t height,
-                                   int32_t& errorCode) {
-  for (BC_TYPE t = BC_CODE39; t <= BC_DATAMATRIX;
-       t = (BC_TYPE)((int32_t)t + 1)) {
-    CBC_CodeBase* pTmpEngine = FX_Barcode_CreateBarCodeEngineObject(t);
-    if (!pTmpEngine) {
-      continue;
-    }
-    CFX_WideString ret = pTmpEngine->Decode(buf, width, height, errorCode);
-    if (errorCode == BCExceptionNO) {
-      return ret;
-    }
-  }
-  errorCode = BCExceptionUnSupportedBarcode;
-  return CFX_WideString();
-}
-CFX_WideString CFX_Barcode::Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode) {
-  for (BC_TYPE t = BC_CODE39; t <= BC_DATAMATRIX;
-       t = (BC_TYPE)((int32_t)t + 1)) {
-    CBC_CodeBase* pTmpEngine = FX_Barcode_CreateBarCodeEngineObject(t);
-    if (!pTmpEngine) {
-      continue;
-    }
-    CFX_WideString ret = pTmpEngine->Decode(pBitmap, errorCode);
-    if (errorCode == BCExceptionNO) {
-      return ret;
-    }
-  }
-  errorCode = BCExceptionUnSupportedBarcode;
-  return CFX_WideString();
-}
diff --git a/xfa/fwl/basewidget/cfx_barcode.h b/xfa/fwl/basewidget/cfx_barcode.h
index fbe16306bd..2ba1f7f77d 100644
--- a/xfa/fwl/basewidget/cfx_barcode.h
+++ b/xfa/fwl/basewidget/cfx_barcode.h
@@ -30,11 +30,6 @@ class CFX_Barcode {
                        const CFX_Matrix* matrix,
                        int32_t& e);
   FX_BOOL RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e);
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& errorCode);
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode);
   FX_BOOL SetCharEncoding(BC_CHAR_ENCODING encoding);
   FX_BOOL SetModuleHeight(int32_t moduleHeight);
   FX_BOOL SetModuleWidth(int32_t moduleWidth);
diff --git a/xfa/fxbarcode/BC_Binarizer.cpp b/xfa/fxbarcode/BC_Binarizer.cpp
deleted file mode 100644
index d36d8fc59c..0000000000
--- a/xfa/fxbarcode/BC_Binarizer.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_Binarizer.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-
-CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource* source) {
-  m_source = source;
-}
-CBC_Binarizer::~CBC_Binarizer() {}
-CBC_LuminanceSource* CBC_Binarizer::GetLuminanceSource() {
-  return m_source;
-}
diff --git a/xfa/fxbarcode/BC_Binarizer.h b/xfa/fxbarcode/BC_Binarizer.h
deleted file mode 100644
index 8482c24f63..0000000000
--- a/xfa/fxbarcode/BC_Binarizer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_BINARIZER_H_
-#define XFA_FXBARCODE_BC_BINARIZER_H_
-
-#include <cstdint>
-
-class CBC_LuminanceSource;
-class CBC_CommonBitMatrix;
-class CBC_CommonBitArray;
-
-class CBC_Binarizer {
- public:
-  CBC_Binarizer(CBC_LuminanceSource* source);
-  virtual ~CBC_Binarizer();
-
-  CBC_LuminanceSource* GetLuminanceSource();
-  virtual CBC_CommonBitMatrix* GetBlackMatrix(int32_t& e) = 0;
-  virtual CBC_CommonBitArray* GetBlackRow(int32_t y,
-                                          CBC_CommonBitArray* row,
-                                          int32_t& e) = 0;
-
- private:
-  CBC_LuminanceSource* m_source;
-};
-
-#endif  // XFA_FXBARCODE_BC_BINARIZER_H_
diff --git a/xfa/fxbarcode/BC_BinaryBitmap.cpp b/xfa/fxbarcode/BC_BinaryBitmap.cpp
deleted file mode 100644
index d8e866236b..0000000000
--- a/xfa/fxbarcode/BC_BinaryBitmap.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_Binarizer.h"
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer)
-    : m_binarizer(binarizer), m_matrix(nullptr) {}
-CBC_BinaryBitmap::~CBC_BinaryBitmap() {
-  delete m_matrix;
-}
-int32_t CBC_BinaryBitmap::GetHeight() {
-  return m_binarizer->GetLuminanceSource()->GetHeight();
-}
-int32_t CBC_BinaryBitmap::GetWidth() {
-  return m_binarizer->GetLuminanceSource()->GetWidth();
-}
-CBC_CommonBitMatrix* CBC_BinaryBitmap::GetMatrix(int32_t& e) {
-  if (!m_matrix) {
-    m_matrix = m_binarizer->GetBlackMatrix(e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return m_matrix;
-}
-CBC_CommonBitArray* CBC_BinaryBitmap::GetBlackRow(int32_t y,
-                                                  CBC_CommonBitArray* row,
-                                                  int32_t& e) {
-  CBC_CommonBitArray* temp = m_binarizer->GetBlackRow(y, row, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return temp;
-}
-CBC_CommonBitMatrix* CBC_BinaryBitmap::GetBlackMatrix(int32_t& e) {
-  if (!m_matrix) {
-    m_matrix = m_binarizer->GetBlackMatrix(e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return m_matrix;
-}
diff --git a/xfa/fxbarcode/BC_BinaryBitmap.h b/xfa/fxbarcode/BC_BinaryBitmap.h
deleted file mode 100644
index 445b5af32b..0000000000
--- a/xfa/fxbarcode/BC_BinaryBitmap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_BINARYBITMAP_H_
-#define XFA_FXBARCODE_BC_BINARYBITMAP_H_
-
-#include <cstdint>
-
-class CBC_Binarizer;
-class CBC_CommonBitMatrix;
-class CBC_CommonBitArray;
-
-class CBC_BinaryBitmap {
- public:
-  CBC_BinaryBitmap(CBC_Binarizer* binarizer);
-  virtual ~CBC_BinaryBitmap();
-
-  int32_t GetWidth();
-  int32_t GetHeight();
-  CBC_CommonBitMatrix* GetMatrix(int32_t& e);
-  CBC_CommonBitArray* GetBlackRow(int32_t y,
-                                  CBC_CommonBitArray* row,
-                                  int32_t& e);
-  CBC_CommonBitMatrix* GetBlackMatrix(int32_t& e);
-
- private:
-  CBC_Binarizer* m_binarizer;
-  CBC_CommonBitMatrix* m_matrix;
-};
-
-#endif  // XFA_FXBARCODE_BC_BINARYBITMAP_H_
diff --git a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp
deleted file mode 100644
index 7cdf957ce0..0000000000
--- a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <memory>
-
-#include "core/fxcodec/codec/include/ccodec_progressivedecoder.h"
-#include "core/fxcodec/include/fx_codec.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/fxbarcode/utils.h"
-
-class CBC_Pause : public IFX_Pause {
- public:
-  // IFX_Pause
-  FX_BOOL NeedToPauseNow() override;
-};
-
-static CFX_DIBitmap* CreateDIBSource(IFX_FileRead* fileread) {
-  std::unique_ptr<CCodec_ModuleMgr> pCodecMgr(new CCodec_ModuleMgr());
-  std::unique_ptr<CCodec_ProgressiveDecoder> pImageCodec(
-      pCodecMgr->CreateProgressiveDecoder());
-  FXCODEC_STATUS status = FXCODEC_STATUS_DECODE_FINISH;
-  status = pImageCodec->LoadImageInfo(fileread, FXCODEC_IMAGE_UNKNOWN, nullptr,
-                                      false);
-  if (status != FXCODEC_STATUS_FRAME_READY)
-    return nullptr;
-
-  std::unique_ptr<CFX_DIBitmap> bitmap(new CFX_DIBitmap);
-  bitmap->Create(pImageCodec->GetWidth(), pImageCodec->GetHeight(), FXDIB_Argb);
-  bitmap->Clear(FXARGB_MAKE(0xFF, 0xFF, 0xFF, 0xFF));
-  CBC_Pause pause;
-  int32_t frames;
-  status = pImageCodec->GetFrames(frames, &pause);
-  while (status == FXCODEC_STATUS_FRAME_TOBECONTINUE)
-    status = pImageCodec->GetFrames(frames, &pause);
-
-  if (status != FXCODEC_STATUS_DECODE_READY)
-    return nullptr;
-
-  status = pImageCodec->StartDecode(bitmap.get(), 0, 0, bitmap->GetWidth(),
-                                    bitmap->GetHeight(), 0, FALSE);
-  if (status != FXCODEC_STATUS_DECODE_TOBECONTINUE)
-    return nullptr;
-
-  while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE)
-    status = pImageCodec->ContinueDecode(&pause);
-
-  return status == FXCODEC_STATUS_DECODE_FINISH ? bitmap.release() : nullptr;
-}
-
-CBC_BufferedImageLuminanceSource::CBC_BufferedImageLuminanceSource(
-    const CFX_WideString& filename)
-    : CBC_LuminanceSource(0, 0), m_filename(filename) {
-  m_height = 0;
-  m_width = 0;
-  m_bytesPerLine = 0;
-  m_top = 0;
-  m_left = 0;
-}
-
-void CBC_BufferedImageLuminanceSource::Init(int32_t& e) {
-  IFX_FileRead* fileread = FX_CreateFileRead(m_filename.c_str());
-  m_pBitmap = CreateDIBSource(fileread);
-  if (!m_pBitmap) {
-    e = BCExceptionLoadFile;
-    return;
-  }
-  m_pBitmap->ConvertFormat(FXDIB_Argb);
-  m_height = m_pBitmap->GetHeight();
-  m_width = m_pBitmap->GetWidth();
-  m_rgbData.SetSize(m_height * m_width);
-  m_bytesPerLine = m_width * 4;
-  m_top = 0;
-  m_left = 0;
-}
-
-CBC_BufferedImageLuminanceSource::CBC_BufferedImageLuminanceSource(
-    CFX_DIBitmap* pBitmap)
-    : CBC_LuminanceSource(0, 0) {
-  m_pBitmap = pBitmap->Clone();
-  m_pBitmap->ConvertFormat(FXDIB_Argb);
-  m_height = m_pBitmap->GetHeight();
-  m_width = m_pBitmap->GetWidth();
-  m_rgbData.SetSize(m_height * m_width);
-  m_bytesPerLine = m_width * 4;
-  m_top = 0;
-  m_left = 0;
-}
-
-CBC_BufferedImageLuminanceSource::~CBC_BufferedImageLuminanceSource() {
-  delete m_pBitmap;
-}
-
-CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetRow(int32_t y,
-                                                        CFX_ByteArray& row,
-                                                        int32_t& e) {
-  if (y < 0 || y >= m_height) {
-    e = BCExceptionRequestedRowIsOutSizeTheImage;
-    return nullptr;
-  }
-  int32_t width = m_width;
-  if (row.GetSize() == 0 || row.GetSize() < width) {
-    row.SetSize(width);
-  }
-  if (m_rgbData.GetSize() == 0 || m_rgbData.GetSize() < width) {
-    m_rgbData.SetSize(width);
-  }
-  int32_t* rowLine = (int32_t*)m_pBitmap->GetScanline(y);
-  int32_t x;
-  for (x = 0; x < width; x++) {
-    int32_t pixel = rowLine[x];
-    int32_t luminance = (306 * ((pixel >> 16) & 0xFF) +
-                         601 * ((pixel >> 8) & 0xFF) + 117 * (pixel & 0xFF)) >>
-                        10;
-    row[x] = (uint8_t)luminance;
-  }
-  return &row;
-}
-
-CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetMatrix() {
-  CFX_ByteArray* matrix = new CFX_ByteArray();
-  matrix->SetSize(m_bytesPerLine * m_height);
-  int32_t* rgb = (int32_t*)m_pBitmap->GetBuffer();
-  int32_t y;
-  for (y = 0; y < m_height; y++) {
-    int32_t offset = y * m_width;
-    int32_t x;
-    for (x = 0; x < m_width; x++) {
-      int32_t pixel = rgb[offset + x];
-      int32_t luminance =
-          (306 * ((pixel >> 16) & 0xFF) + 601 * ((pixel >> 8) & 0xFF) +
-           117 * (pixel & 0xFF)) >>
-          10;
-      (*matrix)[offset + x] = (uint8_t)luminance;
-    }
-  }
-  return matrix;
-}
-
-FX_BOOL CBC_Pause::NeedToPauseNow() {
-  return TRUE;
-}
diff --git a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
deleted file mode 100644
index da3682662d..0000000000
--- a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
-#define XFA_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxge/include/fx_dib.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-
-class CBC_BufferedImageLuminanceSource : public CBC_LuminanceSource {
- public:
-  explicit CBC_BufferedImageLuminanceSource(const CFX_WideString& filename);
-  explicit CBC_BufferedImageLuminanceSource(CFX_DIBitmap* pBitmap);
-  ~CBC_BufferedImageLuminanceSource() override;
-
-  // CBC_LuminanceSource
-  CFX_ByteArray* GetRow(int32_t y, CFX_ByteArray& row, int32_t& e) override;
-  CFX_ByteArray* GetMatrix() override;
-
-  virtual void Init(int32_t& e);
-
- private:
-  int32_t m_bytesPerLine;
-  int32_t m_left;
-  int32_t m_top;
-  CFX_Int32Array m_rgbData;
-  CFX_DIBitmap* m_pBitmap;
-  const CFX_WideString m_filename;
-};
-
-#endif  // XFA_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
diff --git a/xfa/fxbarcode/BC_Library.cpp b/xfa/fxbarcode/BC_Library.cpp
index 311dd511fd..b0b4186735 100644
--- a/xfa/fxbarcode/BC_Library.cpp
+++ b/xfa/fxbarcode/BC_Library.cpp
@@ -7,51 +7,28 @@
 #include <stdint.h>
 
 #include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
 #include "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h"
 #include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
 #include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDataMask.h"
 
 void BC_Library_Init() {
   CBC_QRCoderErrorCorrectionLevel::Initialize();
   CBC_QRCoderMode::Initialize();
   CBC_QRCoderVersion::Initialize();
-  CBC_QRDataMask::Initialize();
   CBC_ReedSolomonGF256::Initialize();
-  CBC_DataMatrixVersion::Initialize();
   CBC_SymbolInfo::Initialize();
   CBC_ErrorCorrection::Initialize();
   CBC_PDF417HighLevelEncoder::Initialize();
-
-  int32_t e = 0;
-  CBC_PDF417ECModulusGF::Initialize(e);
-  CBC_DecodedBitStreamPaser::Initialize();
-  CBC_PDF417CodewordDecoder::Initialize();
-  CBC_PDF417ECErrorCorrection::Initialize(e);
-  CBC_PDF417ScanningDecoder::Initialize();
 }
 void BC_Library_Destory() {
   CBC_QRCoderErrorCorrectionLevel::Finalize();
   CBC_QRCoderMode::Finalize();
   CBC_QRCoderVersion::Finalize();
-  CBC_QRDataMask::Finalize();
   CBC_ReedSolomonGF256::Finalize();
-  CBC_DataMatrixVersion::Finalize();
   CBC_SymbolInfo::Finalize();
   CBC_ErrorCorrection::Finalize();
   CBC_PDF417HighLevelEncoder::Finalize();
-  CBC_DecodedBitStreamPaser::Finalize();
-  CBC_PDF417CodewordDecoder::Finalize();
-  CBC_PDF417ECErrorCorrection::Finalize();
-  CBC_PDF417ECModulusGF::Finalize();
-  CBC_PDF417ScanningDecoder::Finalize();
 }
diff --git a/xfa/fxbarcode/BC_LuminanceSource.cpp b/xfa/fxbarcode/BC_LuminanceSource.cpp
deleted file mode 100644
index 0aaa096197..0000000000
--- a/xfa/fxbarcode/BC_LuminanceSource.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-
-CBC_LuminanceSource::CBC_LuminanceSource(int32_t width, int32_t height)
-    : m_width(width), m_height(height) {}
-CBC_LuminanceSource::~CBC_LuminanceSource() {}
-int32_t CBC_LuminanceSource::GetWidth() {
-  return m_width;
-}
-int32_t CBC_LuminanceSource::GetHeight() {
-  return m_height;
-}
diff --git a/xfa/fxbarcode/BC_LuminanceSource.h b/xfa/fxbarcode/BC_LuminanceSource.h
deleted file mode 100644
index 753c46979a..0000000000
--- a/xfa/fxbarcode/BC_LuminanceSource.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_LUMINANCESOURCE_H_
-#define XFA_FXBARCODE_BC_LUMINANCESOURCE_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_LuminanceSource {
- public:
-  CBC_LuminanceSource(int32_t width, int32_t height);
-  virtual ~CBC_LuminanceSource();
-  int32_t GetWidth();
-  int32_t GetHeight();
-
-  virtual CFX_ByteArray* GetRow(int32_t y, CFX_ByteArray& row, int32_t& e) = 0;
-  virtual CFX_ByteArray* GetMatrix() = 0;
-
- protected:
-  int32_t m_width;
-  int32_t m_height;
-};
-
-#endif  // XFA_FXBARCODE_BC_LUMINANCESOURCE_H_
diff --git a/xfa/fxbarcode/BC_Reader.cpp b/xfa/fxbarcode/BC_Reader.cpp
deleted file mode 100644
index 9391da1856..0000000000
--- a/xfa/fxbarcode/BC_Reader.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "xfa/fxbarcode/BC_Reader.h"
-
-CBC_Reader::CBC_Reader() {}
-CBC_Reader::~CBC_Reader() {}
diff --git a/xfa/fxbarcode/BC_Reader.h b/xfa/fxbarcode/BC_Reader.h
deleted file mode 100644
index 8daea1d3c1..0000000000
--- a/xfa/fxbarcode/BC_Reader.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_READER_H_
-#define XFA_FXBARCODE_BC_READER_H_
-
-#include "core/fxcrt/include/fx_string.h"
-
-class CBC_BinaryBitmap;
-
-class CBC_Reader {
- public:
-  CBC_Reader();
-  virtual ~CBC_Reader();
-  virtual CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) = 0;
-  virtual CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                                int32_t hints,
-                                int32_t& e) = 0;
-};
-
-#endif  // XFA_FXBARCODE_BC_READER_H_
diff --git a/xfa/fxbarcode/BC_ResultPoint.h b/xfa/fxbarcode/BC_ResultPoint.h
index e819fa5f6e..81e27848ca 100644
--- a/xfa/fxbarcode/BC_ResultPoint.h
+++ b/xfa/fxbarcode/BC_ResultPoint.h
@@ -22,7 +22,4 @@ class CBC_ResultPoint {
   FX_FLOAT m_y;
 };
 
-using CBC_ResultPointArray = CFX_ArrayTemplate<CBC_ResultPoint*>;
-using CBC_ResultPointArrayArray = CFX_ArrayTemplate<CBC_ResultPointArray*>;
-
 #endif  // XFA_FXBARCODE_BC_RESULTPOINT_H_
diff --git a/xfa/fxbarcode/BC_UtilRSS.cpp b/xfa/fxbarcode/BC_UtilRSS.cpp
deleted file mode 100644
index 19a8f97b19..0000000000
--- a/xfa/fxbarcode/BC_UtilRSS.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_UtilRSS.h"
-
-#include <memory>
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_UtilRSS::CBC_UtilRSS() {}
-CBC_UtilRSS::~CBC_UtilRSS() {}
-CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val,
-                                          int32_t n,
-                                          int32_t elements,
-                                          int32_t maxWidth,
-                                          FX_BOOL noNarrow) {
-  std::unique_ptr<CFX_Int32Array> widths(new CFX_Int32Array);
-  widths->SetSize(elements);
-  int32_t bar;
-  int32_t narrowMask = 0;
-  for (bar = 0; bar < elements - 1; bar++) {
-    narrowMask |= (1 << bar);
-    int32_t elmWidth = 1;
-    int32_t subVal;
-    while (TRUE) {
-      subVal = Combins(n - elmWidth - 1, elements - bar - 2);
-      if (noNarrow && (narrowMask == 0) &&
-          (n - elmWidth - (elements - bar - 1) >= elements - bar - 1)) {
-        subVal -= Combins(n - elmWidth - (elements - bar), elements - bar - 2);
-      }
-      if (elements - bar - 1 > 1) {
-        int32_t lessVal = 0;
-        for (int32_t mxwElement = n - elmWidth - (elements - bar - 2);
-             mxwElement > maxWidth; mxwElement--) {
-          lessVal += Combins(n - elmWidth - mxwElement - 1, elements - bar - 3);
-        }
-        subVal -= lessVal * (elements - 1 - bar);
-      } else if (n - elmWidth > maxWidth) {
-        subVal--;
-      }
-      val -= subVal;
-      if (val < 0) {
-        break;
-      }
-      elmWidth++;
-      narrowMask &= ~(1 << bar);
-    }
-    val += subVal;
-    n -= elmWidth;
-    (*widths)[bar] = elmWidth;
-  }
-  (*widths)[bar] = n;
-  return widths.release();
-}
-int32_t CBC_UtilRSS::GetRSSvalue(CFX_Int32Array& widths,
-                                 int32_t maxWidth,
-                                 FX_BOOL noNarrow) {
-  int32_t elements = widths.GetSize();
-  int32_t n = 0;
-  for (int32_t i = 0; i < elements; i++) {
-    n += widths[i];
-  }
-  int32_t val = 0;
-  int32_t narrowMask = 0;
-  for (int32_t bar = 0; bar < elements - 1; bar++) {
-    int32_t elmWidth;
-    for (elmWidth = 1, narrowMask |= (1 << bar); elmWidth < widths[bar];
-         elmWidth++, narrowMask &= ~(1 << bar)) {
-      int32_t subVal = Combins(n - elmWidth - 1, elements - bar - 2);
-      if (noNarrow && (narrowMask == 0) &&
-          (n - elmWidth - (elements - bar - 1) >= elements - bar - 1)) {
-        subVal -= Combins(n - elmWidth - (elements - bar), elements - bar - 2);
-      }
-      if (elements - bar - 1 > 1) {
-        int32_t lessVal = 0;
-        for (int32_t mxwElement = n - elmWidth - (elements - bar - 2);
-             mxwElement > maxWidth; mxwElement--) {
-          lessVal += Combins(n - elmWidth - mxwElement - 1, elements - bar - 3);
-        }
-        subVal -= lessVal * (elements - 1 - bar);
-      } else if (n - elmWidth > maxWidth) {
-        subVal--;
-      }
-      val += subVal;
-    }
-    n -= elmWidth;
-  }
-  return val;
-}
-int32_t CBC_UtilRSS::Combins(int32_t n, int32_t r) {
-  int32_t maxDenom;
-  int32_t minDenom;
-  if (n - r > r) {
-    minDenom = r;
-    maxDenom = n - r;
-  } else {
-    minDenom = n - r;
-    maxDenom = r;
-  }
-  int32_t val = 1;
-  int32_t j = 1;
-  for (int32_t i = n; i > maxDenom; i--) {
-    val *= i;
-    if (j <= minDenom) {
-      val /= j;
-      j++;
-    }
-  }
-  while (j <= minDenom) {
-    val /= j;
-    j++;
-  }
-  return val;
-}
-CFX_Int32Array* CBC_UtilRSS::Elements(CFX_Int32Array& eDist,
-                                      int32_t N,
-                                      int32_t K) {
-  CFX_Int32Array* widths = new CFX_Int32Array;
-  widths->SetSize(eDist.GetSize() + 2);
-  int32_t twoK = K << 1;
-  (*widths)[0] = 1;
-  int32_t i;
-  int32_t minEven = 10;
-  int32_t barSum = 1;
-  for (i = 1; i < twoK - 2; i += 2) {
-    (*widths)[i] = eDist[i - 1] - (*widths)[i - 1];
-    (*widths)[i + 1] = eDist[i] - (*widths)[i];
-    barSum += (*widths)[i] + (*widths)[i + 1];
-    if ((*widths)[i] < minEven) {
-      minEven = (*widths)[i];
-    }
-  }
-  (*widths)[twoK - 1] = N - barSum;
-  if ((*widths)[twoK - 1] < minEven) {
-    minEven = (*widths)[twoK - 1];
-  }
-  if (minEven > 1) {
-    for (i = 0; i < twoK; i += 2) {
-      (*widths)[i] += minEven - 1;
-      (*widths)[i + 1] -= minEven - 1;
-    }
-  }
-  return widths;
-}
diff --git a/xfa/fxbarcode/BC_UtilRSS.h b/xfa/fxbarcode/BC_UtilRSS.h
deleted file mode 100644
index f66f5279fe..0000000000
--- a/xfa/fxbarcode/BC_UtilRSS.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_UTILRSS_H_
-#define XFA_FXBARCODE_BC_UTILRSS_H_
-
-#include <cstdint>
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_UtilRSS {
- public:
-  virtual ~CBC_UtilRSS();
-  static int32_t GetRSSvalue(CFX_Int32Array& widths,
-                             int32_t maxWidth,
-                             FX_BOOL noNarrow);
-
- protected:
-  static CFX_Int32Array* GetRssWidths(int32_t val,
-                                      int32_t n,
-                                      int32_t elements,
-                                      int32_t maxWidth,
-                                      FX_BOOL noNarrow);
-  static int32_t Combins(int32_t n, int32_t r);
-  static CFX_Int32Array* Elements(CFX_Int32Array& eDist, int32_t N, int32_t K);
-
- private:
-  CBC_UtilRSS();
-};
-
-#endif  // XFA_FXBARCODE_BC_UTILRSS_H_
diff --git a/xfa/fxbarcode/cbc_codabar.cpp b/xfa/fxbarcode/cbc_codabar.cpp
index c2fe2a4a16..896342a245 100644
--- a/xfa/fxbarcode/cbc_codabar.cpp
+++ b/xfa/fxbarcode/cbc_codabar.cpp
@@ -21,14 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_codabar.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedCodaBarReader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h"
 
-CBC_Codabar::CBC_Codabar()
-    : CBC_OneCode(new CBC_OnedCodaBarReader, new CBC_OnedCodaBarWriter) {}
+CBC_Codabar::CBC_Codabar() : CBC_OneCode(new CBC_OnedCodaBarWriter) {}
 
 CBC_Codabar::~CBC_Codabar() {}
 
@@ -108,20 +103,3 @@ FX_BOOL CBC_Codabar::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_Codabar::GetType() {
   return BC_CODABAR;
 }
-
-CFX_WideString CBC_Codabar::Decode(uint8_t* buf,
-                                   int32_t width,
-                                   int32_t height,
-                                   int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_Codabar::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h
index a0eb07f74b..9f83d8bb53 100644
--- a/xfa/fxbarcode/cbc_codabar.h
+++ b/xfa/fxbarcode/cbc_codabar.h
@@ -21,11 +21,6 @@ class CBC_Codabar : public CBC_OneCode {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_code128.cpp b/xfa/fxbarcode/cbc_code128.cpp
index abae7a3594..8615cd40df 100644
--- a/xfa/fxbarcode/cbc_code128.cpp
+++ b/xfa/fxbarcode/cbc_code128.cpp
@@ -21,14 +21,10 @@
 
 #include "xfa/fxbarcode/cbc_code128.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode128Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCode128Writer.h"
 
 CBC_Code128::CBC_Code128(BC_TYPE type)
-    : CBC_OneCode(new CBC_OnedCode128Reader, new CBC_OnedCode128Writer(type)) {}
+    : CBC_OneCode(new CBC_OnedCode128Writer(type)) {}
 
 CBC_Code128::~CBC_Code128() {}
 
@@ -90,19 +86,3 @@ BC_TYPE CBC_Code128::GetType() {
   return BC_CODE128;
 }
 
-CFX_WideString CBC_Code128::Decode(uint8_t* buf,
-                                   int32_t width,
-                                   int32_t height,
-                                   int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_Code128::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h
index ddb779daa9..05ef125e1b 100644
--- a/xfa/fxbarcode/cbc_code128.h
+++ b/xfa/fxbarcode/cbc_code128.h
@@ -21,11 +21,6 @@ class CBC_Code128 : public CBC_OneCode {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_code39.cpp b/xfa/fxbarcode/cbc_code39.cpp
index 2b9852a074..bbf4123d42 100644
--- a/xfa/fxbarcode/cbc_code39.cpp
+++ b/xfa/fxbarcode/cbc_code39.cpp
@@ -21,22 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_code39.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode39Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCode39Writer.h"
 
-CBC_Code39::CBC_Code39()
-    : CBC_OneCode(new CBC_OnedCode39Reader, new CBC_OnedCode39Writer) {}
-
-CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit)
-    : CBC_OneCode(new CBC_OnedCode39Reader(usingCheckDigit),
-                  new CBC_OnedCode39Writer) {}
-
-CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode)
-    : CBC_OneCode(new CBC_OnedCode39Reader(usingCheckDigit, extendedMode),
-                  new CBC_OnedCode39Writer(extendedMode)) {}
+CBC_Code39::CBC_Code39() : CBC_OneCode(new CBC_OnedCode39Writer) {}
 
 CBC_Code39::~CBC_Code39() {}
 
@@ -94,23 +81,6 @@ BC_TYPE CBC_Code39::GetType() {
   return BC_CODE39;
 }
 
-CFX_WideString CBC_Code39::Decode(uint8_t* buf,
-                                  int32_t width,
-                                  int32_t height,
-                                  int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_Code39::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
-
 FX_BOOL CBC_Code39::SetTextLocation(BC_TEXT_LOC location) {
   if (m_pBCWriter)
     return static_cast<CBC_OnedCode39Writer*>(m_pBCWriter.get())
diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h
index 673975ba91..104ec4a217 100644
--- a/xfa/fxbarcode/cbc_code39.h
+++ b/xfa/fxbarcode/cbc_code39.h
@@ -15,19 +15,12 @@
 class CBC_Code39 : public CBC_OneCode {
  public:
   CBC_Code39();
-  explicit CBC_Code39(FX_BOOL usingCheckDigit);
-  CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);
   ~CBC_Code39() override;
 
   // CBC_OneCode:
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_codebase.cpp b/xfa/fxbarcode/cbc_codebase.cpp
index 7065c2eade..c7d4f19118 100644
--- a/xfa/fxbarcode/cbc_codebase.cpp
+++ b/xfa/fxbarcode/cbc_codebase.cpp
@@ -21,11 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_codebase.h"
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
 
-CBC_CodeBase::CBC_CodeBase(CBC_Reader* pReader, CBC_Writer* pWriter)
-    : m_pBCReader(pReader), m_pBCWriter(pWriter) {}
+CBC_CodeBase::CBC_CodeBase(CBC_Writer* pWriter) : m_pBCWriter(pWriter) {}
 
 CBC_CodeBase::~CBC_CodeBase() {}
 
diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h
index 1ecfe20b27..f13c15395f 100644
--- a/xfa/fxbarcode/cbc_codebase.h
+++ b/xfa/fxbarcode/cbc_codebase.h
@@ -20,7 +20,7 @@ class CFX_RenderDevice;
 
 class CBC_CodeBase {
  public:
-  CBC_CodeBase(CBC_Reader* pReader, CBC_Writer* pWriter);
+  explicit CBC_CodeBase(CBC_Writer* pWriter);
   virtual ~CBC_CodeBase();
 
   virtual BC_TYPE GetType() = 0;
@@ -31,11 +31,6 @@ class CBC_CodeBase {
                                const CFX_Matrix* matrix,
                                int32_t& e) = 0;
   virtual FX_BOOL RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) = 0;
-  virtual CFX_WideString Decode(uint8_t* buf,
-                                int32_t width,
-                                int32_t height,
-                                int32_t& e) = 0;
-  virtual CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) = 0;
 
   FX_BOOL SetCharEncoding(int32_t encoding);
   FX_BOOL SetModuleHeight(int32_t moduleHeight);
@@ -46,7 +41,6 @@ class CBC_CodeBase {
   void SetBarcodeColor(FX_ARGB foregroundColor);
 
  protected:
-  std::unique_ptr<CBC_Reader> m_pBCReader;
   std::unique_ptr<CBC_Writer> m_pBCWriter;
 };
 
diff --git a/xfa/fxbarcode/cbc_datamatrix.cpp b/xfa/fxbarcode/cbc_datamatrix.cpp
index 5e37b54253..3c86743b9f 100644
--- a/xfa/fxbarcode/cbc_datamatrix.cpp
+++ b/xfa/fxbarcode/cbc_datamatrix.cpp
@@ -21,16 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_datamatrix.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h"
 #include "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
 
-CBC_DataMatrix::CBC_DataMatrix()
-    : CBC_CodeBase(new CBC_DataMatrixReader, new CBC_DataMatrixWriter) {
-  static_cast<CBC_DataMatrixReader*>(m_pBCReader.get())->Init();
-}
+CBC_DataMatrix::CBC_DataMatrix() : CBC_CodeBase(new CBC_DataMatrixWriter) {}
 
 CBC_DataMatrix::~CBC_DataMatrix() {}
 
@@ -68,20 +61,3 @@ FX_BOOL CBC_DataMatrix::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_DataMatrix::GetType() {
   return BC_DATAMATRIX;
 }
-
-CFX_WideString CBC_DataMatrix::Decode(uint8_t* buf,
-                                      int32_t width,
-                                      int32_t height,
-                                      int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_DataMatrix::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString retStr = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(retStr.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h
index 392fa55b4b..8edd1a90f7 100644
--- a/xfa/fxbarcode/cbc_datamatrix.h
+++ b/xfa/fxbarcode/cbc_datamatrix.h
@@ -21,11 +21,6 @@ class CBC_DataMatrix : public CBC_CodeBase {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_ean13.cpp b/xfa/fxbarcode/cbc_ean13.cpp
index 0725083a1d..831f68ca8c 100644
--- a/xfa/fxbarcode/cbc_ean13.cpp
+++ b/xfa/fxbarcode/cbc_ean13.cpp
@@ -21,14 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_ean13.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
 
-CBC_EAN13::CBC_EAN13()
-    : CBC_OneCode(new CBC_OnedEAN13Reader, new CBC_OnedEAN13Writer) {}
+CBC_EAN13::CBC_EAN13() : CBC_OneCode(new CBC_OnedEAN13Writer) {}
 
 CBC_EAN13::~CBC_EAN13() {}
 
@@ -95,20 +90,3 @@ FX_BOOL CBC_EAN13::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_EAN13::GetType() {
   return BC_EAN13;
 }
-
-CFX_WideString CBC_EAN13::Decode(uint8_t* buf,
-                                 int32_t width,
-                                 int32_t height,
-                                 int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_EAN13::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h
index afe2cd9781..02497a7159 100644
--- a/xfa/fxbarcode/cbc_ean13.h
+++ b/xfa/fxbarcode/cbc_ean13.h
@@ -21,11 +21,6 @@ class CBC_EAN13 : public CBC_OneCode {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_ean8.cpp b/xfa/fxbarcode/cbc_ean8.cpp
index 7280c3770e..4635c6b55d 100644
--- a/xfa/fxbarcode/cbc_ean8.cpp
+++ b/xfa/fxbarcode/cbc_ean8.cpp
@@ -21,14 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_ean8.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN8Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h"
 
-CBC_EAN8::CBC_EAN8()
-    : CBC_OneCode(new CBC_OnedEAN8Reader, new CBC_OnedEAN8Writer) {}
+CBC_EAN8::CBC_EAN8() : CBC_OneCode(new CBC_OnedEAN8Writer) {}
 
 CBC_EAN8::~CBC_EAN8() {}
 
@@ -94,20 +89,3 @@ FX_BOOL CBC_EAN8::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_EAN8::GetType() {
   return BC_EAN8;
 }
-
-CFX_WideString CBC_EAN8::Decode(uint8_t* buf,
-                                int32_t width,
-                                int32_t height,
-                                int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_EAN8::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h
index dd948904fe..d82e9cd726 100644
--- a/xfa/fxbarcode/cbc_ean8.h
+++ b/xfa/fxbarcode/cbc_ean8.h
@@ -21,11 +21,6 @@ class CBC_EAN8 : public CBC_OneCode {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_onecode.cpp b/xfa/fxbarcode/cbc_onecode.cpp
index b435a59012..6fc68d88cd 100644
--- a/xfa/fxbarcode/cbc_onecode.cpp
+++ b/xfa/fxbarcode/cbc_onecode.cpp
@@ -23,8 +23,7 @@
 
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
 
-CBC_OneCode::CBC_OneCode(CBC_Reader* pReader, CBC_Writer* pWriter)
-    : CBC_CodeBase(pReader, pWriter) {}
+CBC_OneCode::CBC_OneCode(CBC_Writer* pWriter) : CBC_CodeBase(pWriter) {}
 
 CBC_OneCode::~CBC_OneCode() {}
 
diff --git a/xfa/fxbarcode/cbc_onecode.h b/xfa/fxbarcode/cbc_onecode.h
index a915f78a6d..20b9e12797 100644
--- a/xfa/fxbarcode/cbc_onecode.h
+++ b/xfa/fxbarcode/cbc_onecode.h
@@ -17,7 +17,7 @@ class CFX_RenderDevice;
 
 class CBC_OneCode : public CBC_CodeBase {
  public:
-  CBC_OneCode(CBC_Reader* pReader, CBC_Writer* pWriter);
+  explicit CBC_OneCode(CBC_Writer* pWriter);
   ~CBC_OneCode() override;
 
   virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents);
diff --git a/xfa/fxbarcode/cbc_pdf417i.cpp b/xfa/fxbarcode/cbc_pdf417i.cpp
index 005be943fe..2d9b9819a7 100644
--- a/xfa/fxbarcode/cbc_pdf417i.cpp
+++ b/xfa/fxbarcode/cbc_pdf417i.cpp
@@ -21,14 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_pdf417i.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Reader.h"
 #include "xfa/fxbarcode/pdf417/BC_PDF417Writer.h"
 
-CBC_PDF417I::CBC_PDF417I()
-    : CBC_CodeBase(new CBC_PDF417Reader, new CBC_PDF417Writer) {}
+CBC_PDF417I::CBC_PDF417I() : CBC_CodeBase(new CBC_PDF417Writer) {}
 
 CBC_PDF417I::~CBC_PDF417I() {}
 
@@ -76,20 +71,3 @@ FX_BOOL CBC_PDF417I::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_PDF417I::GetType() {
   return BC_PDF417;
 }
-
-CFX_WideString CBC_PDF417I::Decode(uint8_t* buf,
-                                   int32_t width,
-                                   int32_t height,
-                                   int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_PDF417I::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString bytestring = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(bytestring.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h
index 4fdf2f0e14..d69562d3e5 100644
--- a/xfa/fxbarcode/cbc_pdf417i.h
+++ b/xfa/fxbarcode/cbc_pdf417i.h
@@ -21,11 +21,6 @@ class CBC_PDF417I : public CBC_CodeBase {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_qrcode.cpp b/xfa/fxbarcode/cbc_qrcode.cpp
index 1e0703caab..db3cad0dda 100644
--- a/xfa/fxbarcode/cbc_qrcode.cpp
+++ b/xfa/fxbarcode/cbc_qrcode.cpp
@@ -21,16 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_qrcode.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCodeReader.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h"
 
-CBC_QRCode::CBC_QRCode()
-    : CBC_CodeBase(new CBC_QRCodeReader, new CBC_QRCodeWriter) {
-  static_cast<CBC_QRCodeReader*>(m_pBCReader.get())->Init();
-}
+CBC_QRCode::CBC_QRCode() : CBC_CodeBase(new CBC_QRCodeWriter) {}
 
 CBC_QRCode::~CBC_QRCode() {}
 
@@ -84,20 +77,3 @@ FX_BOOL CBC_QRCode::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
 BC_TYPE CBC_QRCode::GetType() {
   return BC_QR_CODE;
 }
-
-CFX_WideString CBC_QRCode::Decode(uint8_t* buf,
-                                  int32_t width,
-                                  int32_t height,
-                                  int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_QRCode::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString retStr = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, CFX_WideString());
-  return CFX_WideString::FromUTF8(retStr.AsStringC());
-}
diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h
index d14d872312..42fc50f22a 100644
--- a/xfa/fxbarcode/cbc_qrcode.h
+++ b/xfa/fxbarcode/cbc_qrcode.h
@@ -21,11 +21,6 @@ class CBC_QRCode : public CBC_CodeBase {
   FX_BOOL Encode(const CFX_WideStringC& contents,
                  FX_BOOL isDevice,
                  int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   FX_BOOL RenderDevice(CFX_RenderDevice* device,
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
diff --git a/xfa/fxbarcode/cbc_upca.cpp b/xfa/fxbarcode/cbc_upca.cpp
index ad0ec55003..8ed3e08eb9 100644
--- a/xfa/fxbarcode/cbc_upca.cpp
+++ b/xfa/fxbarcode/cbc_upca.cpp
@@ -21,16 +21,9 @@
 
 #include "xfa/fxbarcode/cbc_upca.h"
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/oned/BC_OnedUPCAReader.h"
 #include "xfa/fxbarcode/oned/BC_OnedUPCAWriter.h"
 
-CBC_UPCA::CBC_UPCA()
-    : CBC_OneCode(new CBC_OnedUPCAReader, new CBC_OnedUPCAWriter) {
-  static_cast<CBC_OnedUPCAReader*>(m_pBCReader.get())->Init();
-}
+CBC_UPCA::CBC_UPCA() : CBC_OneCode(new CBC_OnedUPCAWriter) {}
 
 CBC_UPCA::~CBC_UPCA() {}
 
@@ -97,23 +90,6 @@ FX_BOOL CBC_UPCA::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
   return TRUE;
 }
 
-CFX_WideString CBC_UPCA::Decode(uint8_t* buf,
-                                int32_t width,
-                                int32_t height,
-                                int32_t& e) {
-  CFX_WideString str;
-  return str;
-}
-
-CFX_WideString CBC_UPCA::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, L"");
-  return CFX_WideString::FromUTF8(str.AsStringC());
-}
-
 BC_TYPE CBC_UPCA::GetType() {
   return BC_UPCA;
 }
diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h
index cf45b89786..aa1afc44f7 100644
--- a/xfa/fxbarcode/cbc_upca.h
+++ b/xfa/fxbarcode/cbc_upca.h
@@ -25,11 +25,6 @@ class CBC_UPCA : public CBC_OneCode {
                        const CFX_Matrix* matrix,
                        int32_t& e) override;
   FX_BOOL RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) override;
-  CFX_WideString Decode(uint8_t* buf,
-                        int32_t width,
-                        int32_t height,
-                        int32_t& e) override;
-  CFX_WideString Decode(CFX_DIBitmap* pBitmap, int32_t& e) override;
   BC_TYPE GetType() override;
 
  private:
diff --git a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.cpp
deleted file mode 100644
index ebc5593bf2..0000000000
--- a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_CommonCharacterSetECI.h"
-#include "xfa/fxbarcode/common/BC_CommonECI.h"
-
-void CBC_CommonCharacterSetECI::initialize() {}
-CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI(
-    int32_t value,
-    CFX_ByteString encodingName)
-    : CBC_CommonECI(value), m_encodingName(encodingName) {}
-CBC_CommonCharacterSetECI::~CBC_CommonCharacterSetECI() {}
-CFX_ByteString CBC_CommonCharacterSetECI::GetEncodingName() {
-  return m_encodingName;
-}
-void CBC_CommonCharacterSetECI::AddCharacterSet(int32_t value,
-                                                CFX_ByteString encodingName) {}
-CBC_CommonCharacterSetECI* CBC_CommonCharacterSetECI::GetCharacterSetECIByValue(
-    int32_t value) {
-  return nullptr;
-}
-CBC_CommonCharacterSetECI* CBC_CommonCharacterSetECI::GetCharacterSetECIByName(
-    const CFX_ByteString& name) {
-  return nullptr;
-}
diff --git a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h
deleted file mode 100644
index a2fe0ed2fe..0000000000
--- a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
-
-#include "core/fxcrt/include/fx_string.h"
-#include "xfa/fxbarcode/common/BC_CommonECI.h"
-
-class CBC_CommonCharacterSetECI : public CBC_CommonECI {
- public:
-  CBC_CommonCharacterSetECI(int32_t value, CFX_ByteString encodingName);
-  ~CBC_CommonCharacterSetECI() override;
-
-  CFX_ByteString GetEncodingName();
-  static void AddCharacterSet(int32_t value, CFX_ByteString encodingName);
-  static CBC_CommonCharacterSetECI* GetCharacterSetECIByValue(int32_t value);
-  static CBC_CommonCharacterSetECI* GetCharacterSetECIByName(
-      const CFX_ByteString& name);
-
- private:
-  CFX_ByteString m_encodingName;
-  static void initialize();
-};
-
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp
deleted file mode 100644
index ee131e5359..0000000000
--- a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_CommonDecoderResult::CBC_CommonDecoderResult() {}
-void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes,
-                                   const CFX_ByteString& text,
-                                   const CFX_Int32Array& byteSegments,
-                                   CBC_QRCoderErrorCorrectionLevel* ecLevel,
-                                   int32_t& e) {
-  if (text.IsEmpty()) {
-    e = BCExceptionIllegalArgument;
-    return;
-  }
-  m_rawBytes.Copy(rawBytes);
-  m_text = text;
-  m_byteSegments.Copy(byteSegments);
-  m_ecLevel = ecLevel;
-  m_other = nullptr;
-}
-void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes,
-                                   const CFX_ByteString& text,
-                                   const CFX_ByteString& ecLevel,
-                                   int32_t& e) {
-  if (text.IsEmpty()) {
-    e = BCExceptionIllegalArgument;
-    return;
-  }
-  m_rawBytes.Copy(rawBytes);
-  m_text = text;
-  m_pdf417ecLevel = ecLevel;
-  m_other = nullptr;
-}
-void CBC_CommonDecoderResult::setOther(CBC_PDF417ResultMetadata* other) {
-  m_other = other;
-}
-CBC_CommonDecoderResult::~CBC_CommonDecoderResult() {
-  delete m_other;
-}
-const CFX_ByteArray& CBC_CommonDecoderResult::GetRawBytes() {
-  return m_rawBytes;
-}
-const CFX_Int32Array& CBC_CommonDecoderResult::GetByteSegments() {
-  return m_byteSegments;
-}
-const CFX_ByteString& CBC_CommonDecoderResult::GetText() {
-  return m_text;
-}
-CBC_QRCoderErrorCorrectionLevel* CBC_CommonDecoderResult::GetECLevel() {
-  return m_ecLevel;
-}
diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/fxbarcode/common/BC_CommonDecoderResult.h
deleted file mode 100644
index bcb65df9fa..0000000000
--- a/xfa/fxbarcode/common/BC_CommonDecoderResult.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_PDF417ResultMetadata;
-
-class CBC_CommonDecoderResult {
- public:
-  CBC_CommonDecoderResult();
-  virtual ~CBC_CommonDecoderResult();
-
-  const CFX_ByteArray& GetRawBytes();
-  const CFX_ByteString& GetText();
-  const CFX_Int32Array& GetByteSegments();
-  CBC_QRCoderErrorCorrectionLevel* GetECLevel();
-  virtual void Init(const CFX_ByteArray& rawBytes,
-                    const CFX_ByteString& text,
-                    const CFX_Int32Array& byteSegments,
-                    CBC_QRCoderErrorCorrectionLevel* ecLevel,
-                    int32_t& e);
-  virtual void Init(const CFX_ByteArray& rawBytes,
-                    const CFX_ByteString& text,
-                    const CFX_ByteString& ecLevel,
-                    int32_t& e);
-  void setOther(CBC_PDF417ResultMetadata* other);
-
- private:
-  CFX_ByteArray m_rawBytes;
-  CFX_ByteString m_text;
-  CFX_Int32Array m_byteSegments;
-  CBC_QRCoderErrorCorrectionLevel* m_ecLevel;
-  CFX_ByteString m_pdf417ecLevel;
-  CBC_PDF417ResultMetadata* m_other;
-};
-
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
diff --git a/xfa/fxbarcode/common/BC_CommonECI.cpp b/xfa/fxbarcode/common/BC_CommonECI.cpp
deleted file mode 100644
index 30d21310f4..0000000000
--- a/xfa/fxbarcode/common/BC_CommonECI.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_CommonCharacterSetECI.h"
-#include "xfa/fxbarcode/common/BC_CommonECI.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_CommonECI::CBC_CommonECI(int32_t value) {
-  m_value = value;
-}
-CBC_CommonECI::~CBC_CommonECI() {}
-int32_t CBC_CommonECI::GetValue() {
-  return m_value;
-}
-CBC_CommonECI* CBC_CommonECI::GetEICByValue(int32_t value, int32_t& e) {
-  if (value < 0 || value > 999999)
-    e = BCExceptionBadECI;
-  return nullptr;
-}
diff --git a/xfa/fxbarcode/common/BC_CommonECI.h b/xfa/fxbarcode/common/BC_CommonECI.h
deleted file mode 100644
index 5bc4c1485c..0000000000
--- a/xfa/fxbarcode/common/BC_CommonECI.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONECI_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONECI_H_
-
-#include <stdint.h>
-
-class CBC_CommonECI {
- public:
-  CBC_CommonECI(int32_t value);
-  virtual ~CBC_CommonECI();
-
-  virtual int32_t GetValue();
-
-  static CBC_CommonECI* GetEICByValue(int32_t value, int32_t& e);
-
- private:
-  int32_t m_value;
-};
-
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONECI_H_
diff --git a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
deleted file mode 100644
index 53f18cc21b..0000000000
--- a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_Binarizer.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t LUMINANCE_BITS = 5;
-const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
-const int32_t LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS;
-
-CBC_GlobalHistogramBinarizer::CBC_GlobalHistogramBinarizer(
-    CBC_LuminanceSource* source)
-    : CBC_Binarizer(source) {}
-CBC_GlobalHistogramBinarizer::~CBC_GlobalHistogramBinarizer() {}
-CBC_CommonBitArray* CBC_GlobalHistogramBinarizer::GetBlackRow(
-    int32_t y,
-    CBC_CommonBitArray* row,
-    int32_t& e) {
-  CBC_LuminanceSource* source = GetLuminanceSource();
-  int32_t width = source->GetWidth();
-  std::unique_ptr<CBC_CommonBitArray> result(new CBC_CommonBitArray(width));
-  InitArrays(width);
-  CFX_ByteArray* localLuminances = source->GetRow(y, m_luminance, e);
-  if (e != BCExceptionNO) {
-    return result.release();
-  }
-  CFX_Int32Array localBuckets;
-  localBuckets.Copy(m_buckets);
-  int32_t x;
-  for (x = 0; x < width; x++) {
-    int32_t pixel = (*localLuminances)[x] & 0xff;
-    localBuckets[pixel >> LUMINANCE_SHIFT]++;
-  }
-  int32_t blackPoint = EstimateBlackPoint(localBuckets, e);
-  if (e != BCExceptionNO) {
-    return result.release();
-  }
-  int32_t left = (*localLuminances)[0] & 0xff;
-  int32_t center = (*localLuminances)[1] & 0xff;
-  for (x = 1; x < width - 1; x++) {
-    int32_t right = (*localLuminances)[x + 1] & 0xff;
-    int32_t luminance = ((center << 2) - left - right) >> 1;
-    if (luminance < blackPoint) {
-      result->Set(x);
-    }
-    left = center;
-    center = right;
-  }
-  return result.release();
-}
-CBC_CommonBitMatrix* CBC_GlobalHistogramBinarizer::GetBlackMatrix(int32_t& e) {
-  CBC_LuminanceSource* source = GetLuminanceSource();
-  int32_t width = source->GetWidth();
-  int32_t height = source->GetHeight();
-  std::unique_ptr<CBC_CommonBitMatrix> matrix(new CBC_CommonBitMatrix());
-  matrix->Init(width, height);
-  InitArrays(width);
-  CFX_Int32Array localBuckets;
-  localBuckets.Copy(m_buckets);
-  int32_t y;
-  for (y = 1; y < 5; y++) {
-    int32_t row = height * y / 5;
-    CFX_ByteArray* localLuminances = source->GetRow(row, m_luminance, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    int32_t right = (width << 2) / 5;
-    int32_t x;
-    for (x = width / 5; x < right; x++) {
-      int32_t pixel = (*localLuminances)[x] & 0xff;
-      localBuckets[pixel >> LUMINANCE_SHIFT]++;
-    }
-  }
-  int32_t blackPoint = EstimateBlackPoint(localBuckets, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CFX_ByteArray> localLuminances(source->GetMatrix());
-  for (y = 0; y < height; y++) {
-    int32_t offset = y * width;
-    for (int32_t x = 0; x < width; x++) {
-      int32_t pixel = (*localLuminances)[offset + x] & 0xff;
-      if (pixel < blackPoint) {
-        matrix->Set(x, y);
-      }
-    }
-  }
-  return matrix.release();
-}
-void CBC_GlobalHistogramBinarizer::InitArrays(int32_t luminanceSize) {
-  if (m_luminance.GetSize() < luminanceSize) {
-    m_luminance.SetSize(luminanceSize);
-  }
-  if (m_buckets.GetSize() <= 0) {
-    m_buckets.SetSize(LUMINANCE_BUCKETS);
-  } else {
-    int32_t x;
-    for (x = 0; x < LUMINANCE_BUCKETS; x++) {
-      m_buckets[x] = 0;
-    }
-  }
-}
-int32_t CBC_GlobalHistogramBinarizer::EstimateBlackPoint(
-    CFX_Int32Array& buckets,
-    int32_t& e) {
-  int32_t numBuckets = buckets.GetSize();
-  int32_t maxBucketCount = 0;
-  int32_t firstPeak = 0;
-  int32_t firstPeakSize = 0;
-  int32_t x;
-  for (x = 0; x < numBuckets; x++) {
-    if (buckets[x] > firstPeakSize) {
-      firstPeak = x;
-      firstPeakSize = buckets[x];
-    }
-    if (buckets[x] > maxBucketCount) {
-      maxBucketCount = buckets[x];
-    }
-  }
-  int32_t secondPeak = 0;
-  int32_t secondPeakScore = 0;
-  for (x = 0; x < numBuckets; x++) {
-    int32_t distanceToBiggest = x - firstPeak;
-    int32_t score = buckets[x] * distanceToBiggest * distanceToBiggest;
-    if (score > secondPeakScore) {
-      secondPeak = x;
-      secondPeakScore = score;
-    }
-  }
-  if (firstPeak > secondPeak) {
-    int32_t temp = firstPeak;
-    firstPeak = secondPeak;
-    secondPeak = temp;
-  }
-  if (secondPeak - firstPeak <= numBuckets >> 4) {
-    e = BCExceptionRead;
-    return 0;
-  }
-  int32_t bestValley = secondPeak - 1;
-  int32_t bestValleyScore = -1;
-  for (x = secondPeak - 1; x > firstPeak; x--) {
-    int32_t fromFirst = x - firstPeak;
-    int32_t score = fromFirst * fromFirst * (secondPeak - x) *
-                    (maxBucketCount - buckets[x]);
-    if (score > bestValleyScore) {
-      bestValley = x;
-      bestValleyScore = score;
-    }
-  }
-  return bestValley << LUMINANCE_SHIFT;
-}
diff --git a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h
deleted file mode 100644
index 786e8e0a53..0000000000
--- a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
-#define XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_Binarizer.h"
-
-class CBC_CommonBitArray;
-class CBC_CommonBitMatrix;
-class CBC_LuminanceSource;
-
-class CBC_GlobalHistogramBinarizer : public CBC_Binarizer {
- public:
-  CBC_GlobalHistogramBinarizer(CBC_LuminanceSource* source);
-  ~CBC_GlobalHistogramBinarizer() override;
-
-  void InitArrays(int32_t luminanceSize);
-
-  // CBC_Binarizer
-  CBC_CommonBitMatrix* GetBlackMatrix(int32_t& e) override;
-  CBC_CommonBitArray* GetBlackRow(int32_t y,
-                                  CBC_CommonBitArray* row,
-                                  int32_t& e) override;
-
-  static int32_t EstimateBlackPoint(CFX_Int32Array& buckets, int32_t& e);
-
- private:
-  CFX_ByteArray m_luminance;
-  CFX_Int32Array m_buckets;
-};
-
-#endif  // XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
diff --git a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.cpp
deleted file mode 100644
index 45ffd63858..0000000000
--- a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_WhiteRectangleDetector.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(
-    CBC_CommonBitMatrix* image) {
-  m_image = image;
-  m_height = image->GetHeight();
-  m_width = image->GetWidth();
-  m_leftInit = (m_width - INIT_SIZE) >> 1;
-  m_rightInit = (m_width + INIT_SIZE) >> 1;
-  m_upInit = (m_height - INIT_SIZE) >> 1;
-  m_downInit = (m_height + INIT_SIZE) >> 1;
-}
-void CBC_WhiteRectangleDetector::Init(int32_t& e) {
-  if (m_upInit < 0 || m_leftInit < 0 || m_downInit >= m_height ||
-      m_rightInit >= m_width) {
-    e = BCExceptionNotFound;
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-  }
-}
-CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(
-    CBC_CommonBitMatrix* image,
-    int32_t initSize,
-    int32_t x,
-    int32_t y) {
-  m_image = image;
-  m_height = image->GetHeight();
-  m_width = image->GetWidth();
-  int32_t halfsize = initSize >> 1;
-  m_leftInit = x - halfsize;
-  m_rightInit = x + halfsize;
-  m_upInit = y - halfsize;
-  m_downInit = y + halfsize;
-}
-
-CBC_WhiteRectangleDetector::~CBC_WhiteRectangleDetector() {}
-
-CFX_ArrayTemplate<CBC_ResultPoint*>* CBC_WhiteRectangleDetector::Detect(
-    int32_t& e) {
-  int32_t left = m_leftInit;
-  int32_t right = m_rightInit;
-  int32_t up = m_upInit;
-  int32_t down = m_downInit;
-  FX_BOOL sizeExceeded = FALSE;
-  FX_BOOL aBlackPointFoundOnBorder = TRUE;
-  FX_BOOL atLeastOneBlackPointFoundOnBorder = FALSE;
-  while (aBlackPointFoundOnBorder) {
-    aBlackPointFoundOnBorder = FALSE;
-    FX_BOOL rightBorderNotWhite = TRUE;
-    while (rightBorderNotWhite && right < m_width) {
-      rightBorderNotWhite = ContainsBlackPoint(up, down, right, FALSE);
-      if (rightBorderNotWhite) {
-        right++;
-        aBlackPointFoundOnBorder = TRUE;
-      }
-    }
-    if (right >= m_width) {
-      sizeExceeded = TRUE;
-      break;
-    }
-    FX_BOOL bottomBorderNotWhite = TRUE;
-    while (bottomBorderNotWhite && down < m_height) {
-      bottomBorderNotWhite = ContainsBlackPoint(left, right, down, TRUE);
-      if (bottomBorderNotWhite) {
-        down++;
-        aBlackPointFoundOnBorder = TRUE;
-      }
-    }
-    if (down >= m_height) {
-      sizeExceeded = TRUE;
-      break;
-    }
-    FX_BOOL leftBorderNotWhite = TRUE;
-    while (leftBorderNotWhite && left >= 0) {
-      leftBorderNotWhite = ContainsBlackPoint(up, down, left, FALSE);
-      if (leftBorderNotWhite) {
-        left--;
-        aBlackPointFoundOnBorder = TRUE;
-      }
-    }
-    if (left < 0) {
-      sizeExceeded = TRUE;
-      break;
-    }
-    FX_BOOL topBorderNotWhite = TRUE;
-    while (topBorderNotWhite && up >= 0) {
-      topBorderNotWhite = ContainsBlackPoint(left, right, up, TRUE);
-      if (topBorderNotWhite) {
-        up--;
-        aBlackPointFoundOnBorder = TRUE;
-      }
-    }
-    if (up < 0) {
-      sizeExceeded = TRUE;
-      break;
-    }
-    if (aBlackPointFoundOnBorder) {
-      atLeastOneBlackPointFoundOnBorder = TRUE;
-    }
-  }
-  if (!sizeExceeded && atLeastOneBlackPointFoundOnBorder) {
-    int32_t maxSize = right - left;
-    std::unique_ptr<CBC_ResultPoint> z;
-    for (int32_t i = 1; i < maxSize; i++) {
-      z.reset(GetBlackPointOnSegment((FX_FLOAT)left, (FX_FLOAT)(down - i),
-                                     (FX_FLOAT)(left + i), (FX_FLOAT)(down)));
-      if (z)
-        break;
-    }
-    if (!z.get()) {
-      e = BCExceptionNotFound;
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    std::unique_ptr<CBC_ResultPoint> t;
-    for (int32_t j = 1; j < maxSize; j++) {
-      t.reset(GetBlackPointOnSegment((FX_FLOAT)left, (FX_FLOAT)(up + j),
-                                     (FX_FLOAT)(left + j), (FX_FLOAT)up));
-      if (t)
-        break;
-    }
-    if (!t.get()) {
-      e = BCExceptionNotFound;
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    std::unique_ptr<CBC_ResultPoint> x;
-    for (int32_t k = 1; k < maxSize; k++) {
-      x.reset(GetBlackPointOnSegment((FX_FLOAT)right, (FX_FLOAT)(up + k),
-                                     (FX_FLOAT)(right - k), (FX_FLOAT)up));
-      if (x)
-        break;
-    }
-    if (!x.get()) {
-      e = BCExceptionNotFound;
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    std::unique_ptr<CBC_ResultPoint> y;
-    for (int32_t m = 1; m < maxSize; m++) {
-      y.reset(GetBlackPointOnSegment((FX_FLOAT)right, (FX_FLOAT)(down - m),
-                                     (FX_FLOAT)(right - m), (FX_FLOAT)down));
-      if (y)
-        break;
-    }
-    if (!y.get()) {
-      e = BCExceptionNotFound;
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    return CenterEdges(y.get(), z.get(), x.get(), t.get());
-  }
-
-  e = BCExceptionNotFound;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return nullptr;
-}
-
-int32_t CBC_WhiteRectangleDetector::Round(FX_FLOAT d) {
-  return (int32_t)(d + 0.5f);
-}
-CBC_ResultPoint* CBC_WhiteRectangleDetector::GetBlackPointOnSegment(
-    FX_FLOAT aX,
-    FX_FLOAT aY,
-    FX_FLOAT bX,
-    FX_FLOAT bY) {
-  int32_t dist = DistanceL2(aX, aY, bX, bY);
-  float xStep = (bX - aX) / dist;
-  float yStep = (bY - aY) / dist;
-  for (int32_t i = 0; i < dist; i++) {
-    int32_t x = Round(aX + i * xStep);
-    int32_t y = Round(aY + i * yStep);
-    if (m_image->Get(x, y)) {
-      return new CBC_ResultPoint((FX_FLOAT)x, (FX_FLOAT)y);
-    }
-  }
-  return nullptr;
-}
-int32_t CBC_WhiteRectangleDetector::DistanceL2(FX_FLOAT aX,
-                                               FX_FLOAT aY,
-                                               FX_FLOAT bX,
-                                               FX_FLOAT bY) {
-  float xDiff = aX - bX;
-  float yDiff = aY - bY;
-  return Round((float)sqrt(xDiff * xDiff + yDiff * yDiff));
-}
-
-CFX_ArrayTemplate<CBC_ResultPoint*>* CBC_WhiteRectangleDetector::CenterEdges(
-    CBC_ResultPoint* y,
-    CBC_ResultPoint* z,
-    CBC_ResultPoint* x,
-    CBC_ResultPoint* t) const {
-  CFX_ArrayTemplate<CBC_ResultPoint*>* result =
-      new CFX_ArrayTemplate<CBC_ResultPoint*>();
-  result->SetSize(4);
-
-  float yi = y->GetX();
-  float yj = y->GetY();
-  float zi = z->GetX();
-  float zj = z->GetY();
-  float xi = x->GetX();
-  float xj = x->GetY();
-  float ti = t->GetX();
-  float tj = t->GetY();
-
-  if (yi < m_width / 2) {
-    (*result)[0] = new CBC_ResultPoint(ti - CORR, tj + CORR);
-    (*result)[1] = new CBC_ResultPoint(zi + CORR, zj + CORR);
-    (*result)[2] = new CBC_ResultPoint(xi - CORR, xj - CORR);
-    (*result)[3] = new CBC_ResultPoint(yi + CORR, yj - CORR);
-    return result;
-  }
-
-  (*result)[0] = new CBC_ResultPoint(ti + CORR, tj + CORR);
-  (*result)[1] = new CBC_ResultPoint(zi + CORR, zj - CORR);
-  (*result)[2] = new CBC_ResultPoint(xi - CORR, xj + CORR);
-  (*result)[3] = new CBC_ResultPoint(yi - CORR, yj - CORR);
-  return result;
-}
-
-FX_BOOL CBC_WhiteRectangleDetector::ContainsBlackPoint(int32_t a,
-                                                       int32_t b,
-                                                       int32_t fixed,
-                                                       FX_BOOL horizontal) {
-  if (horizontal) {
-    for (int32_t x = a; x <= b; x++) {
-      if (m_image->Get(x, fixed)) {
-        return TRUE;
-      }
-    }
-  } else {
-    for (int32_t y = a; y <= b; y++) {
-      if (m_image->Get(fixed, y)) {
-        return TRUE;
-      }
-    }
-  }
-  return FALSE;
-}
diff --git a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h
deleted file mode 100644
index 427d7b85ca..0000000000
--- a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
-#define XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_ResultPoint;
-
-class CBC_WhiteRectangleDetector {
- public:
-  explicit CBC_WhiteRectangleDetector(CBC_CommonBitMatrix* image);
-  CBC_WhiteRectangleDetector(CBC_CommonBitMatrix* image,
-                             int32_t initSize,
-                             int32_t x,
-                             int32_t y);
-  virtual ~CBC_WhiteRectangleDetector();
-
-  virtual void Init(int32_t& e);
-
-  CFX_ArrayTemplate<CBC_ResultPoint*>* Detect(int32_t& e);
-
- private:
-  int32_t Round(FX_FLOAT d);
-  CBC_ResultPoint* GetBlackPointOnSegment(FX_FLOAT aX,
-                                          FX_FLOAT aY,
-                                          FX_FLOAT bX,
-                                          FX_FLOAT bY);
-  int32_t DistanceL2(FX_FLOAT aX, FX_FLOAT aY, FX_FLOAT bX, FX_FLOAT bY);
-  CFX_ArrayTemplate<CBC_ResultPoint*>* CenterEdges(CBC_ResultPoint* y,
-                                                   CBC_ResultPoint* z,
-                                                   CBC_ResultPoint* x,
-                                                   CBC_ResultPoint* t) const;
-
-  FX_BOOL ContainsBlackPoint(int32_t a,
-                             int32_t b,
-                             int32_t fixed,
-                             FX_BOOL horizontal);
-
-  static const int32_t INIT_SIZE = 30;
-  static const int32_t CORR = 1;
-
-  CBC_CommonBitMatrix* m_image;
-  int32_t m_height;
-  int32_t m_width;
-  int32_t m_leftInit;
-  int32_t m_rightInit;
-  int32_t m_downInit;
-  int32_t m_upInit;
-};
-
-#endif  // XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
deleted file mode 100644
index 8788afbda8..0000000000
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
-
-#include <memory>
-#include <utility>
-
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
-
-CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) {
-  m_field = field;
-}
-CBC_ReedSolomonDecoder::~CBC_ReedSolomonDecoder() {}
-void CBC_ReedSolomonDecoder::Decode(CFX_Int32Array* received,
-                                    int32_t twoS,
-                                    int32_t& e) {
-  CBC_ReedSolomonGF256Poly poly;
-  poly.Init(m_field, received, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  CFX_Int32Array syndromeCoefficients;
-  syndromeCoefficients.SetSize(twoS);
-  FX_BOOL dataMatrix = FALSE;
-  FX_BOOL noError = TRUE;
-  for (int32_t i = 0; i < twoS; i++) {
-    int32_t eval = poly.EvaluateAt(m_field->Exp(dataMatrix ? i + 1 : i));
-    syndromeCoefficients[twoS - 1 - i] = eval;
-    if (eval != 0) {
-      noError = FALSE;
-    }
-  }
-  if (noError) {
-    return;
-  }
-  CBC_ReedSolomonGF256Poly syndrome;
-  syndrome.Init(m_field, &syndromeCoefficients, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> temp(
-      m_field->BuildMonomial(twoS, 1, e));
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  std::unique_ptr<CFX_ArrayTemplate<CBC_ReedSolomonGF256Poly*>> sigmaOmega(
-      RunEuclideanAlgorithm(temp.get(), &syndrome, twoS, e));
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> sigma((*sigmaOmega)[0]);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> omega((*sigmaOmega)[1]);
-  std::unique_ptr<CFX_Int32Array> errorLocations(
-      FindErrorLocations(sigma.get(), e));
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  std::unique_ptr<CFX_Int32Array> errorMagnitudes(
-      FindErrorMagnitudes(omega.get(), errorLocations.get(), dataMatrix, e));
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  for (int32_t k = 0; k < errorLocations->GetSize(); k++) {
-    int32_t position =
-        received->GetSize() - 1 - m_field->Log((*errorLocations)[k], e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (position < 0) {
-      e = BCExceptionBadErrorLocation;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    (*received)[position] = CBC_ReedSolomonGF256::AddOrSubtract(
-        (*received)[position], (*errorMagnitudes)[k]);
-  }
-}
-
-CFX_ArrayTemplate<CBC_ReedSolomonGF256Poly*>*
-CBC_ReedSolomonDecoder::RunEuclideanAlgorithm(CBC_ReedSolomonGF256Poly* a,
-                                              CBC_ReedSolomonGF256Poly* b,
-                                              int32_t R,
-                                              int32_t& e) {
-  if (a->GetDegree() < b->GetDegree()) {
-    CBC_ReedSolomonGF256Poly* temp = a;
-    a = b;
-    b = temp;
-  }
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> rLast(a->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> r(b->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> sLast(m_field->GetOne()->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> s(m_field->GetZero()->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> tLast(m_field->GetZero()->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> t(m_field->GetOne()->Clone(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  while (r->GetDegree() >= R / 2) {
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> rLastLast = std::move(rLast);
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> sLastLast = std::move(sLast);
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> tLastlast = std::move(tLast);
-    rLast = std::move(r);
-    sLast = std::move(s);
-    tLast = std::move(t);
-    if (rLast->IsZero()) {
-      e = BCExceptionR_I_1IsZero;
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    r.reset(rLastLast->Clone(e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> q(m_field->GetZero()->Clone(e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    int32_t denominatorLeadingTerm = rLast->GetCoefficients(rLast->GetDegree());
-    int32_t dltInverse = m_field->Inverse(denominatorLeadingTerm, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    while (r->GetDegree() >= rLast->GetDegree() && !(r->IsZero())) {
-      int32_t degreeDiff = r->GetDegree() - rLast->GetDegree();
-      int32_t scale =
-          m_field->Multiply(r->GetCoefficients(r->GetDegree()), dltInverse);
-      std::unique_ptr<CBC_ReedSolomonGF256Poly> build(
-          m_field->BuildMonomial(degreeDiff, scale, e));
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      q.reset(q->AddOrSubtract(build.get(), e));
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      std::unique_ptr<CBC_ReedSolomonGF256Poly> multiply(
-          rLast->MultiplyByMonomial(degreeDiff, scale, e));
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      r.reset(r->AddOrSubtract(multiply.get(), e));
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    }
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> temp1(
-        q->Multiply(sLast.get(), e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    s.reset(temp1->AddOrSubtract(sLastLast.get(), e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    std::unique_ptr<CBC_ReedSolomonGF256Poly> temp5(
-        q->Multiply(tLast.get(), e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    t.reset(temp5->AddOrSubtract(tLastlast.get(), e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  int32_t sigmaTildeAtZero = t->GetCoefficients(0);
-  if (sigmaTildeAtZero == 0) {
-    e = BCExceptionIsZero;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  int32_t inverse = m_field->Inverse(sigmaTildeAtZero, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> sigma(t->Multiply(inverse, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_ReedSolomonGF256Poly> omega(r->Multiply(inverse, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CFX_ArrayTemplate<CBC_ReedSolomonGF256Poly*>* temp =
-      new CFX_ArrayTemplate<CBC_ReedSolomonGF256Poly*>();
-  temp->Add(sigma.release());
-  temp->Add(omega.release());
-  return temp;
-}
-CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorLocations(
-    CBC_ReedSolomonGF256Poly* errorLocator,
-    int32_t& e) {
-  int32_t numErrors = errorLocator->GetDegree();
-  if (numErrors == 1) {
-    std::unique_ptr<CFX_Int32Array> temp(new CFX_Int32Array);
-    temp->Add(errorLocator->GetCoefficients(1));
-    return temp.release();
-  }
-  CFX_Int32Array* tempT = new CFX_Int32Array;
-  tempT->SetSize(numErrors);
-  std::unique_ptr<CFX_Int32Array> result(tempT);
-  int32_t ie = 0;
-  for (int32_t i = 1; i < 256 && ie < numErrors; i++) {
-    if (errorLocator->EvaluateAt(i) == 0) {
-      (*result)[ie] = m_field->Inverse(i, ie);
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      ie++;
-    }
-  }
-  if (ie != numErrors) {
-    e = BCExceptionDegreeNotMatchRoots;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return result.release();
-}
-CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorMagnitudes(
-    CBC_ReedSolomonGF256Poly* errorEvaluator,
-    CFX_Int32Array* errorLocations,
-    FX_BOOL dataMatrix,
-    int32_t& e) {
-  int32_t s = errorLocations->GetSize();
-  CFX_Int32Array* tempArray = new CFX_Int32Array;
-  tempArray->SetSize(s);
-  std::unique_ptr<CFX_Int32Array> result(tempArray);
-  for (int32_t i = 0; i < s; i++) {
-    int32_t xiInverse = m_field->Inverse(errorLocations->operator[](i), e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    int32_t denominator = 1;
-    for (int32_t j = 0; j < s; j++) {
-      if (i != j) {
-        denominator = m_field->Multiply(
-            denominator, CBC_ReedSolomonGF256::AddOrSubtract(
-                             1, m_field->Multiply(errorLocations->operator[](j),
-                                                  xiInverse)));
-      }
-    }
-    int32_t temp = m_field->Inverse(denominator, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    (*result)[i] =
-        m_field->Multiply(errorEvaluator->EvaluateAt(xiInverse), temp);
-  }
-  return result.release();
-}
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
deleted file mode 100644
index d42af6a27a..0000000000
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
-#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_ReedSolomonGF256;
-class CBC_ReedSolomonGF256Poly;
-
-class CBC_ReedSolomonDecoder {
- public:
-  CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field);
-  virtual ~CBC_ReedSolomonDecoder();
-
-  void Decode(CFX_Int32Array* received, int32_t twoS, int32_t& e);
-  CFX_ArrayTemplate<CBC_ReedSolomonGF256Poly*>* RunEuclideanAlgorithm(
-      CBC_ReedSolomonGF256Poly* a,
-      CBC_ReedSolomonGF256Poly* b,
-      int32_t R,
-      int32_t& e);
-  CFX_Int32Array* FindErrorLocations(CBC_ReedSolomonGF256Poly* errorLocator,
-                                     int32_t& e);
-  CFX_Int32Array* FindErrorMagnitudes(CBC_ReedSolomonGF256Poly* errorEvaluator,
-                                      CFX_Int32Array* errorLocations,
-                                      FX_BOOL dataMatrix,
-                                      int32_t& e);
-
- private:
-  CBC_ReedSolomonGF256* m_field;
-};
-
-#endif  // XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
deleted file mode 100644
index 10d5a843e2..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() {
-  m_mappingBitMatrix = nullptr;
-  m_version = nullptr;
-  m_readMappingMatrix = nullptr;
-}
-void CBC_DataMatrixBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix,
-                                         int32_t& e) {
-  int32_t dimension = bitMatrix->GetHeight();
-  if (dimension < 8 || dimension > 144 || (dimension & 0x01) != 0) {
-    e = BCExceptionFormatException;
-    return;
-  }
-  m_version = ReadVersion(bitMatrix, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  m_mappingBitMatrix = ExtractDataRegion(bitMatrix, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  m_readMappingMatrix = new CBC_CommonBitMatrix();
-  m_readMappingMatrix->Init(m_mappingBitMatrix->GetWidth(),
-                            m_mappingBitMatrix->GetHeight());
-}
-CBC_DataMatrixBitMatrixParser::~CBC_DataMatrixBitMatrixParser() {
-  delete m_mappingBitMatrix;
-  delete m_readMappingMatrix;
-}
-CBC_DataMatrixVersion* CBC_DataMatrixBitMatrixParser::GetVersion() {
-  return m_version;
-}
-CBC_DataMatrixVersion* CBC_DataMatrixBitMatrixParser::ReadVersion(
-    CBC_CommonBitMatrix* bitMatrix,
-    int32_t& e) {
-  int32_t rows = bitMatrix->GetHeight();
-  int32_t columns = bitMatrix->GetWidth();
-  CBC_DataMatrixVersion* temp =
-      CBC_DataMatrixVersion::GetVersionForDimensions(rows, columns, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return temp;
-}
-CFX_ByteArray* CBC_DataMatrixBitMatrixParser::ReadCodewords(int32_t& e) {
-  std::unique_ptr<CFX_ByteArray> result(new CFX_ByteArray());
-  result->SetSize(m_version->GetTotalCodewords());
-  int32_t resultOffset = 0;
-  int32_t row = 4;
-  int32_t column = 0;
-  int32_t numRows = m_mappingBitMatrix->GetHeight();
-  int32_t numColumns = m_mappingBitMatrix->GetWidth();
-  FX_BOOL corner1Read = FALSE;
-  FX_BOOL corner2Read = FALSE;
-  FX_BOOL corner3Read = FALSE;
-  FX_BOOL corner4Read = FALSE;
-  do {
-    if ((row == numRows) && (column == 0) && !corner1Read) {
-      (*result)[resultOffset++] = (uint8_t)ReadCorner1(numRows, numColumns);
-      row -= 2;
-      column += 2;
-      corner1Read = TRUE;
-    } else if ((row == numRows - 2) && (column == 0) &&
-               ((numColumns & 0x03) != 0) && !corner2Read) {
-      (*result)[resultOffset++] = (uint8_t)ReadCorner2(numRows, numColumns);
-      row -= 2;
-      column += 2;
-      corner2Read = TRUE;
-    } else if ((row == numRows + 4) && (column == 2) &&
-               ((numColumns & 0x07) == 0) && !corner3Read) {
-      (*result)[resultOffset++] = (uint8_t)ReadCorner3(numRows, numColumns);
-      row -= 2;
-      column += 2;
-      corner3Read = TRUE;
-    } else if ((row == numRows - 2) && (column == 0) &&
-               ((numColumns & 0x07) == 4) && !corner4Read) {
-      (*result)[resultOffset++] = (uint8_t)ReadCorner4(numRows, numColumns);
-      row -= 2;
-      column += 2;
-      corner4Read = TRUE;
-    } else {
-      do {
-        if ((row < numRows) && (column >= 0) &&
-            !m_readMappingMatrix->Get(column, row)) {
-          if (resultOffset < (*result).GetSize()) {
-            (*result)[resultOffset++] =
-                (uint8_t)ReadUtah(row, column, numRows, numColumns);
-          }
-        }
-        row -= 2;
-        column += 2;
-      } while ((row >= 0) && (column < numColumns));
-      row += 1;
-      column += 3;
-      do {
-        if ((row >= 0) && (column < numColumns) &&
-            !m_readMappingMatrix->Get(column, row)) {
-          if (resultOffset < (*result).GetSize()) {
-            (*result)[resultOffset++] =
-                (uint8_t)ReadUtah(row, column, numRows, numColumns);
-          }
-        }
-        row += 2;
-        column -= 2;
-      } while ((row < numRows) && (column >= 0));
-      row += 3;
-      column += 1;
-    }
-  } while ((row < numRows) || (column < numColumns));
-  if (resultOffset != m_version->GetTotalCodewords()) {
-    e = BCExceptionFormatException;
-    return nullptr;
-  }
-  return result.release();
-}
-FX_BOOL CBC_DataMatrixBitMatrixParser::ReadModule(int32_t row,
-                                                  int32_t column,
-                                                  int32_t numRows,
-                                                  int32_t numColumns) {
-  if (row < 0) {
-    row += numRows;
-    column += 4 - ((numRows + 4) & 0x07);
-  }
-  if (column < 0) {
-    column += numColumns;
-    row += 4 - ((numColumns + 4) & 0x07);
-  }
-  m_readMappingMatrix->Set(column, row);
-  return m_mappingBitMatrix->Get(column, row);
-}
-int32_t CBC_DataMatrixBitMatrixParser::ReadUtah(int32_t row,
-                                                int32_t column,
-                                                int32_t numRows,
-                                                int32_t numColumns) {
-  int32_t currentByte = 0;
-  if (ReadModule(row - 2, column - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row - 2, column - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row - 1, column - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row - 1, column - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row - 1, column, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row, column - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row, column - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(row, column, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  return currentByte;
-}
-int32_t CBC_DataMatrixBitMatrixParser::ReadCorner1(int32_t numRows,
-                                                   int32_t numColumns) {
-  int32_t currentByte = 0;
-  if (ReadModule(numRows - 1, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 1, 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 1, 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(2, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(3, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  return currentByte;
-}
-int32_t CBC_DataMatrixBitMatrixParser::ReadCorner2(int32_t numRows,
-                                                   int32_t numColumns) {
-  int32_t currentByte = 0;
-  if (ReadModule(numRows - 3, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 2, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 1, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 4, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 3, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  return currentByte;
-}
-int32_t CBC_DataMatrixBitMatrixParser::ReadCorner3(int32_t numRows,
-                                                   int32_t numColumns) {
-  int32_t currentByte = 0;
-  if (ReadModule(numRows - 1, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 1, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 3, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 3, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  return currentByte;
-}
-int32_t CBC_DataMatrixBitMatrixParser::ReadCorner4(int32_t numRows,
-                                                   int32_t numColumns) {
-  int32_t currentByte = 0;
-  if (ReadModule(numRows - 3, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 2, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(numRows - 1, 0, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 2, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(0, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(1, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(2, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  currentByte <<= 1;
-  if (ReadModule(3, numColumns - 1, numRows, numColumns)) {
-    currentByte |= 1;
-  }
-  return currentByte;
-}
-CBC_CommonBitMatrix* CBC_DataMatrixBitMatrixParser::ExtractDataRegion(
-    CBC_CommonBitMatrix* bitMatrix,
-    int32_t& e) {
-  int32_t symbolSizeRows = m_version->GetSymbolSizeRows();
-  int32_t symbolSizeColumns = m_version->GetSymbolSizeColumns();
-  if (bitMatrix->GetHeight() != symbolSizeRows) {
-    e = BCExceptionCanNotCallGetDimensionOnNonSquareMatrix;
-    return nullptr;
-  }
-  int32_t dataRegionSizeRows = m_version->GetDataRegionSizeRows();
-  int32_t dataRegionSizeColumns = m_version->GetDataRegionSizeColumns();
-  int32_t numDataRegionsRow = symbolSizeRows / dataRegionSizeRows;
-  int32_t numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
-  int32_t sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
-  int32_t sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
-  CBC_CommonBitMatrix* bitMatrixWithoutAlignment = new CBC_CommonBitMatrix();
-  bitMatrixWithoutAlignment->Init(sizeDataRegionColumn, sizeDataRegionRow);
-  int32_t dataRegionRow;
-  for (dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {
-    int32_t dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;
-    int32_t dataRegionColumn;
-    for (dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn;
-         ++dataRegionColumn) {
-      int32_t dataRegionColumnOffset = dataRegionColumn * dataRegionSizeColumns;
-      int32_t i;
-      for (i = 0; i < dataRegionSizeRows; ++i) {
-        int32_t readRowOffset =
-            dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;
-        int32_t writeRowOffset = dataRegionRowOffset + i;
-        int32_t j;
-        for (j = 0; j < dataRegionSizeColumns; ++j) {
-          int32_t readColumnOffset =
-              dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;
-          if (bitMatrix->Get(readColumnOffset, readRowOffset)) {
-            int32_t writeColumnOffset = dataRegionColumnOffset + j;
-            bitMatrixWithoutAlignment->Set(writeColumnOffset, writeRowOffset);
-          }
-        }
-      }
-    }
-  }
-  return bitMatrixWithoutAlignment;
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
deleted file mode 100644
index 63540041e3..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_DataMatrixVersion;
-
-class CBC_DataMatrixBitMatrixParser {
- public:
-  CBC_DataMatrixBitMatrixParser();
-  virtual ~CBC_DataMatrixBitMatrixParser();
-
-  CBC_DataMatrixVersion* GetVersion();
-  CFX_ByteArray* ReadCodewords(int32_t& e);
-  FX_BOOL ReadModule(int32_t row,
-                     int32_t column,
-                     int32_t numRows,
-                     int32_t numColumns);
-  int32_t ReadUtah(int32_t row,
-                   int32_t column,
-                   int32_t numRows,
-                   int32_t numColumns);
-  int32_t ReadCorner1(int32_t numRows, int32_t numColumns);
-  int32_t ReadCorner2(int32_t numRows, int32_t numColumns);
-  int32_t ReadCorner3(int32_t numRows, int32_t numColumns);
-  int32_t ReadCorner4(int32_t numRows, int32_t numColumns);
-  CBC_CommonBitMatrix* ExtractDataRegion(CBC_CommonBitMatrix* bitMatrix,
-                                         int32_t& e);
-  virtual void Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e);
-
- private:
-  static CBC_DataMatrixVersion* ReadVersion(CBC_CommonBitMatrix* bitMatrix,
-                                            int32_t& e);
-  CBC_CommonBitMatrix* m_mappingBitMatrix;
-  CBC_CommonBitMatrix* m_readMappingMatrix;
-  CBC_DataMatrixVersion* m_version;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
deleted file mode 100644
index e468cc42c3..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {}
-CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords,
-                                                 CFX_ByteArray* codewords) {
-  m_codewords.Copy(*codewords);
-  m_numDataCodewords = numDataCodewords;
-}
-CFX_ArrayTemplate<CBC_DataMatrixDataBlock*>*
-CBC_DataMatrixDataBlock::GetDataBlocks(CFX_ByteArray* rawCodewords,
-                                       CBC_DataMatrixVersion* version,
-                                       int32_t& e) {
-  ECBlocks* ecBlocks = version->GetECBlocks();
-  int32_t totalBlocks = 0;
-  const CFX_ArrayTemplate<ECB*>& ecBlockArray = ecBlocks->GetECBlocks();
-  for (int32_t i = 0; i < ecBlockArray.GetSize(); i++) {
-    totalBlocks += ecBlockArray[i]->GetCount();
-  }
-  std::unique_ptr<CFX_ArrayTemplate<CBC_DataMatrixDataBlock*>> result(
-      new CFX_ArrayTemplate<CBC_DataMatrixDataBlock*>());
-  result->SetSize(totalBlocks);
-  int32_t numResultBlocks = 0;
-  for (int32_t j = 0; j < ecBlockArray.GetSize(); j++) {
-    for (int32_t i = 0; i < ecBlockArray[j]->GetCount(); i++) {
-      int32_t numDataCodewords = ecBlockArray[j]->GetDataCodewords();
-      int32_t numBlockCodewords = ecBlocks->GetECCodewords() + numDataCodewords;
-      CFX_ByteArray codewords;
-      codewords.SetSize(numBlockCodewords);
-      (*result)[numResultBlocks++] =
-          new CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
-      codewords.SetSize(0);
-    }
-  }
-  int32_t longerBlocksNumDataCodewords =
-      (*result)[0]->GetCodewords()->GetSize() - ecBlocks->GetECCodewords();
-  int32_t rawCodewordsOffset = 0;
-  for (int32_t i = 0; i < longerBlocksNumDataCodewords - 1; i++) {
-    for (int32_t j = 0; j < numResultBlocks; j++) {
-      if (rawCodewordsOffset < rawCodewords->GetSize()) {
-        (*result)[j]->GetCodewords()->operator[](i) =
-            (*rawCodewords)[rawCodewordsOffset++];
-      }
-    }
-  }
-  const bool specialVersion = version->GetVersionNumber() == 24;
-  int32_t numLongerBlocks = specialVersion ? 8 : numResultBlocks;
-  for (int32_t j = 0; j < numLongerBlocks; j++) {
-    if (rawCodewordsOffset < rawCodewords->GetSize()) {
-      (*result)[j]->GetCodewords()->operator[](longerBlocksNumDataCodewords -
-                                               1) =
-          (*rawCodewords)[rawCodewordsOffset++];
-    }
-  }
-  for (int32_t i = longerBlocksNumDataCodewords;
-       i < (*result)[0]->GetCodewords()->GetSize(); i++) {
-    for (int32_t j = 0; j < numResultBlocks; j++) {
-      int32_t iOffset = specialVersion && j > 7 ? i - 1 : i;
-      if (rawCodewordsOffset < rawCodewords->GetSize()) {
-        (*result)[j]->GetCodewords()->operator[](iOffset) =
-            (*rawCodewords)[rawCodewordsOffset++];
-      }
-    }
-  }
-  if (rawCodewordsOffset != rawCodewords->GetSize()) {
-    e = BCExceptionIllegalArgument;
-    return nullptr;
-  }
-  return result.release();
-}
-
-int32_t CBC_DataMatrixDataBlock::GetNumDataCodewords() {
-  return m_numDataCodewords;
-}
-CFX_ByteArray* CBC_DataMatrixDataBlock::GetCodewords() {
-  return &m_codewords;
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
deleted file mode 100644
index 782e5ed319..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_DataMatrixVersion;
-
-class CBC_DataMatrixDataBlock final {
- public:
-  ~CBC_DataMatrixDataBlock();
-
-  int32_t GetNumDataCodewords();
-  CFX_ByteArray* GetCodewords();
-
-  static CFX_ArrayTemplate<CBC_DataMatrixDataBlock*>* GetDataBlocks(
-      CFX_ByteArray* rawCodewords,
-      CBC_DataMatrixVersion* version,
-      int32_t& e);
-
- private:
-  CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords);
-
-  int32_t m_numDataCodewords;
-  CFX_ByteArray m_codewords;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
deleted file mode 100644
index 292a1de2f7..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_CommonBitSource.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h"
-
-const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = {
-    '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-    'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};
-const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_SHIFT2_SET_CHARS[] = {
-    '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*',  '+', ',', '-', '.',
-    '/', ':', ';', '<', '=', '>', '?',  '@', '[', '\\', ']', '^', '_'};
-const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::TEXT_BASIC_SET_CHARS[] = {
-    '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
-const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::TEXT_SHIFT3_SET_CHARS[] = {
-    '\'', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-    'K',  'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V',  'W', 'X', 'Y', 'Z', '{', '|', '}', '~', 127};
-const int32_t CBC_DataMatrixDecodedBitStreamParser::PAD_ENCODE = 0;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::ASCII_ENCODE = 1;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::C40_ENCODE = 2;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::TEXT_ENCODE = 3;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::ANSIX12_ENCODE = 4;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::EDIFACT_ENCODE = 5;
-const int32_t CBC_DataMatrixDecodedBitStreamParser::BASE256_ENCODE = 6;
-CBC_DataMatrixDecodedBitStreamParser::CBC_DataMatrixDecodedBitStreamParser() {}
-CBC_DataMatrixDecodedBitStreamParser::~CBC_DataMatrixDecodedBitStreamParser() {}
-
-CBC_CommonDecoderResult* CBC_DataMatrixDecodedBitStreamParser::Decode(
-    CFX_ByteArray& bytes,
-    int32_t& e) {
-  CBC_CommonBitSource bits(&bytes);
-  CFX_ByteString result;
-  CFX_ByteString resultTrailer;
-  CFX_Int32Array byteSegments;
-  int32_t mode = ASCII_ENCODE;
-  do {
-    if (mode == 1) {
-      mode = DecodeAsciiSegment(&bits, result, resultTrailer, e);
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    } else {
-      switch (mode) {
-        case 2:
-          DecodeC40Segment(&bits, result, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          break;
-        case 3:
-          DecodeTextSegment(&bits, result, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          break;
-        case 4:
-          DecodeAnsiX12Segment(&bits, result, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          break;
-        case 5:
-          DecodeEdifactSegment(&bits, result, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          break;
-        case 6:
-          DecodeBase256Segment(&bits, result, byteSegments, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          break;
-        default:
-          e = BCExceptionFormatException;
-          return nullptr;
-      }
-      mode = ASCII_ENCODE;
-    }
-  } while (mode != PAD_ENCODE && bits.Available() > 0);
-  if (resultTrailer.GetLength() > 0) {
-    result += resultTrailer;
-  }
-  CBC_CommonDecoderResult* tempCp = new CBC_CommonDecoderResult();
-  tempCp->Init(bytes, result, byteSegments, nullptr, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return tempCp;
-}
-
-int32_t CBC_DataMatrixDecodedBitStreamParser::DecodeAsciiSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    CFX_ByteString& resultTrailer,
-    int32_t& e) {
-  FX_CHAR buffer[128];
-  FX_BOOL upperShift = FALSE;
-  do {
-    int32_t oneByte = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    if (oneByte == 0) {
-      e = BCExceptionFormatException;
-      return 0;
-    } else if (oneByte <= 128) {
-      oneByte = upperShift ? oneByte + 128 : oneByte;
-      upperShift = FALSE;
-      result += ((FX_CHAR)(oneByte - 1));
-      return ASCII_ENCODE;
-    } else if (oneByte == 129) {
-      return PAD_ENCODE;
-    } else if (oneByte <= 229) {
-      int32_t value = oneByte - 130;
-      FXSYS_itoa(value, buffer, 10);
-      if (value < 10) {
-        result += '0';
-        buffer[1] = '\0';
-      } else {
-        buffer[2] = '\0';
-      }
-      result += buffer;
-    } else if (oneByte == 230) {
-      return C40_ENCODE;
-    } else if (oneByte == 231) {
-      return BASE256_ENCODE;
-    } else if (oneByte == 232 || oneByte == 233 || oneByte == 234) {
-    } else if (oneByte == 235) {
-      upperShift = TRUE;
-    } else if (oneByte == 236) {
-      result += "[)>";
-      result += 0x1E;
-      result += "05";
-      result += 0x1D;
-      resultTrailer.Insert(0, 0x1E);
-      resultTrailer.Insert(0 + 1, 0x04);
-    } else if (oneByte == 237) {
-      result += "[)>";
-      result += 0x1E;
-      result += "06";
-      result += 0x1D;
-      resultTrailer.Insert(0, 0x1E);
-      resultTrailer.Insert(0 + 1, 0x04);
-    } else if (oneByte == 238) {
-      return ANSIX12_ENCODE;
-    } else if (oneByte == 239) {
-      return TEXT_ENCODE;
-    } else if (oneByte == 240) {
-      return EDIFACT_ENCODE;
-    } else if (oneByte == 241) {
-    } else if (oneByte >= 242) {
-      if (oneByte == 254 && bits->Available() == 0) {
-      } else {
-        e = BCExceptionFormatException;
-        return 0;
-      }
-    }
-  } while (bits->Available() > 0);
-  return ASCII_ENCODE;
-}
-void CBC_DataMatrixDecodedBitStreamParser::DecodeC40Segment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t& e) {
-  FX_BOOL upperShift = FALSE;
-  CFX_Int32Array cValues;
-  cValues.SetSize(3);
-  do {
-    if (bits->Available() == 8) {
-      return;
-    }
-    int32_t firstByte = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (firstByte == 254) {
-      return;
-    }
-    int32_t tempp = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    ParseTwoBytes(firstByte, tempp, cValues);
-    int32_t shift = 0;
-    int32_t i;
-    for (i = 0; i < 3; i++) {
-      int32_t cValue = cValues[i];
-      switch (shift) {
-        case 0:
-          if (cValue < 3) {
-            shift = cValue + 1;
-          } else if (cValue < 27) {
-            FX_CHAR c40char = C40_BASIC_SET_CHARS[cValue];
-            if (upperShift) {
-              result += (FX_CHAR)(c40char + 128);
-              upperShift = FALSE;
-            } else {
-              result += c40char;
-            }
-          } else {
-            e = BCExceptionFormatException;
-            return;
-          }
-          break;
-        case 1:
-          if (upperShift) {
-            result += (FX_CHAR)(cValue + 128);
-            upperShift = FALSE;
-          } else {
-            result += cValue;
-          }
-          shift = 0;
-          break;
-        case 2:
-          if (cValue < 27) {
-            FX_CHAR c40char = C40_SHIFT2_SET_CHARS[cValue];
-            if (upperShift) {
-              result += (FX_CHAR)(c40char + 128);
-              upperShift = FALSE;
-            } else {
-              result += c40char;
-            }
-          } else if (cValue == 27) {
-            e = BCExceptionFormatException;
-            return;
-          } else if (cValue == 30) {
-            upperShift = TRUE;
-          } else {
-            e = BCExceptionFormatException;
-            return;
-          }
-          shift = 0;
-          break;
-        case 3:
-          if (upperShift) {
-            result += (FX_CHAR)(cValue + 224);
-            upperShift = FALSE;
-          } else {
-            result += (FX_CHAR)(cValue + 96);
-          }
-          shift = 0;
-          break;
-        default:
-          // Should never be reached.
-          e = BCExceptionFormatException;
-          return;
-      }
-    }
-  } while (bits->Available() > 0);
-}
-void CBC_DataMatrixDecodedBitStreamParser::DecodeTextSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t& e) {
-  FX_BOOL upperShift = FALSE;
-  CFX_Int32Array cValues;
-  cValues.SetSize(3);
-  int32_t shift = 0;
-  do {
-    if (bits->Available() == 8) {
-      return;
-    }
-    int32_t firstByte = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (firstByte == 254) {
-      return;
-    }
-    int32_t inTp = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    ParseTwoBytes(firstByte, inTp, cValues);
-    for (int32_t i = 0; i < 3; i++) {
-      int32_t cValue = cValues[i];
-      switch (shift) {
-        case 0:
-          if (cValue < 3) {
-            shift = cValue + 1;
-          } else if (cValue < 40) {
-            FX_CHAR textChar = TEXT_BASIC_SET_CHARS[cValue];
-            if (upperShift) {
-              result += (FX_CHAR)(textChar + 128);
-              upperShift = FALSE;
-            } else {
-              result += textChar;
-            }
-          } else {
-            e = BCExceptionFormatException;
-            return;
-          }
-          break;
-        case 1:
-          if (upperShift) {
-            result += (FX_CHAR)(cValue + 128);
-            upperShift = FALSE;
-          } else {
-            result += cValue;
-          }
-          shift = 0;
-          break;
-        case 2:
-          if (cValue < 27) {
-            FX_CHAR c40char = C40_SHIFT2_SET_CHARS[cValue];
-            if (upperShift) {
-              result += (FX_CHAR)(c40char + 128);
-              upperShift = FALSE;
-            } else {
-              result += c40char;
-            }
-          } else if (cValue == 27) {
-            e = BCExceptionFormatException;
-            return;
-          } else if (cValue == 30) {
-            upperShift = TRUE;
-          } else {
-            e = BCExceptionFormatException;
-            return;
-          }
-          shift = 0;
-          break;
-        case 3:
-          if (cValue < 19) {
-            FX_CHAR textChar = TEXT_SHIFT3_SET_CHARS[cValue];
-            if (upperShift) {
-              result += (FX_CHAR)(textChar + 128);
-              upperShift = FALSE;
-            } else {
-              result += textChar;
-            }
-            shift = 0;
-          } else {
-            e = BCExceptionFormatException;
-            return;
-          }
-          break;
-        default:
-          // Should never be reached.
-          e = BCExceptionFormatException;
-          return;
-      }
-    }
-  } while (bits->Available() > 0);
-}
-void CBC_DataMatrixDecodedBitStreamParser::DecodeAnsiX12Segment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t& e) {
-  CFX_Int32Array cValues;
-  cValues.SetSize(3);
-  do {
-    if (bits->Available() == 8) {
-      return;
-    }
-    int32_t firstByte = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (firstByte == 254) {
-      return;
-    }
-    int32_t iTemp1 = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    ParseTwoBytes(firstByte, iTemp1, cValues);
-    int32_t i;
-    for (i = 0; i < 3; i++) {
-      int32_t cValue = cValues[i];
-      if (cValue == 0) {
-        BC_FX_ByteString_Append(result, 1, '\r');
-      } else if (cValue == 1) {
-        BC_FX_ByteString_Append(result, 1, '*');
-      } else if (cValue == 2) {
-        BC_FX_ByteString_Append(result, 1, '>');
-      } else if (cValue == 3) {
-        BC_FX_ByteString_Append(result, 1, ' ');
-      } else if (cValue < 14) {
-        BC_FX_ByteString_Append(result, 1, (FX_CHAR)(cValue + 44));
-      } else if (cValue < 40) {
-        BC_FX_ByteString_Append(result, 1, (FX_CHAR)(cValue + 51));
-      } else {
-        e = BCExceptionFormatException;
-        return;
-      }
-    }
-  } while (bits->Available() > 0);
-}
-void CBC_DataMatrixDecodedBitStreamParser::ParseTwoBytes(
-    int32_t firstByte,
-    int32_t secondByte,
-    CFX_Int32Array& result) {
-  int32_t fullBitValue = (firstByte << 8) + secondByte - 1;
-  int32_t temp = fullBitValue / 1600;
-  result[0] = temp;
-  fullBitValue -= temp * 1600;
-  temp = fullBitValue / 40;
-  result[1] = temp;
-  result[2] = fullBitValue - temp * 40;
-}
-
-void CBC_DataMatrixDecodedBitStreamParser::DecodeEdifactSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t& e) {
-  FX_CHAR buffer[128];
-  FX_BOOL unlatch = FALSE;
-  do {
-    if (bits->Available() <= 16)
-      return;
-
-    for (int32_t i = 0; i < 4; i++) {
-      int32_t edifactValue = bits->ReadBits(6, e);
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-      if (edifactValue == 0x1F)
-        unlatch = TRUE;
-
-      if (!unlatch) {
-        if ((edifactValue & 32) == 0)
-          edifactValue |= 64;
-        result += FXSYS_itoa(edifactValue, buffer, 10);
-      }
-    }
-  } while (!unlatch && bits->Available() > 0);
-}
-
-void CBC_DataMatrixDecodedBitStreamParser::DecodeBase256Segment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    CFX_Int32Array& byteSegments,
-    int32_t& e) {
-  int32_t codewordPosition = 1 + bits->getByteOffset();
-  int32_t iTmp = bits->ReadBits(8, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  int32_t d1 = Unrandomize255State(iTmp, codewordPosition++);
-  int32_t count;
-  if (d1 == 0) {
-    count = bits->Available() / 8;
-  } else if (d1 < 250) {
-    count = d1;
-  } else {
-    int32_t iTmp3 = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    count = 250 * (d1 - 249) + Unrandomize255State(iTmp3, codewordPosition++);
-  }
-  if (count < 0) {
-    e = BCExceptionFormatException;
-    return;
-  }
-  CFX_ByteArray* bytes = new CFX_ByteArray();
-  bytes->SetSize(count);
-  int32_t i;
-  for (i = 0; i < count; i++) {
-    if (bits->Available() < 8) {
-      e = BCExceptionFormatException;
-      delete bytes;
-      return;
-    }
-    int32_t iTemp5 = bits->ReadBits(8, e);
-    if (e != BCExceptionNO) {
-      delete bytes;
-      return;
-    }
-    bytes->SetAt(i, Unrandomize255State(iTemp5, codewordPosition++));
-  }
-  BC_FX_ByteString_Append(result, *bytes);
-  delete bytes;
-}
-uint8_t CBC_DataMatrixDecodedBitStreamParser::Unrandomize255State(
-    int32_t randomizedBase256Codeword,
-    int32_t base256CodewordPosition) {
-  int32_t pseudoRandomNumber = ((149 * base256CodewordPosition) % 255) + 1;
-  int32_t tempVariable = randomizedBase256Codeword - pseudoRandomNumber;
-  return (uint8_t)(tempVariable >= 0 ? tempVariable : tempVariable + 256);
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
deleted file mode 100644
index 4ff6776826..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
-
-class CBC_CommonDecoderResult;
-class CBC_CommonBitSource;
-
-class CBC_DataMatrixDecodedBitStreamParser {
- public:
-  CBC_DataMatrixDecodedBitStreamParser();
-  virtual ~CBC_DataMatrixDecodedBitStreamParser();
-
-  static CBC_CommonDecoderResult* Decode(CFX_ByteArray& bytes, int32_t& e);
-
- private:
-  static int32_t DecodeAsciiSegment(CBC_CommonBitSource* bits,
-                                    CFX_ByteString& result,
-                                    CFX_ByteString& resultTrailer,
-                                    int32_t& e);
-  static void DecodeC40Segment(CBC_CommonBitSource* bits,
-                               CFX_ByteString& result,
-                               int32_t& e);
-  static void DecodeTextSegment(CBC_CommonBitSource* bits,
-                                CFX_ByteString& result,
-                                int32_t& e);
-  static void DecodeAnsiX12Segment(CBC_CommonBitSource* bits,
-                                   CFX_ByteString& result,
-                                   int32_t& e);
-  static void ParseTwoBytes(int32_t firstByte,
-                            int32_t secondByte,
-                            CFX_Int32Array& result);
-  static void DecodeEdifactSegment(CBC_CommonBitSource* bits,
-                                   CFX_ByteString& result,
-                                   int32_t& e);
-  static void DecodeBase256Segment(CBC_CommonBitSource* bits,
-                                   CFX_ByteString& result,
-                                   CFX_Int32Array& byteSegments,
-                                   int32_t& e);
-  static uint8_t Unrandomize255State(int32_t randomizedBase256Codeword,
-                                     int32_t base256CodewordPosition);
-
-  static const FX_CHAR C40_BASIC_SET_CHARS[];
-  static const FX_CHAR C40_SHIFT2_SET_CHARS[];
-
-  static const FX_CHAR TEXT_BASIC_SET_CHARS[];
-  static const FX_CHAR TEXT_SHIFT3_SET_CHARS[];
-  static const int32_t PAD_ENCODE;
-  static const int32_t ASCII_ENCODE;
-  static const int32_t C40_ENCODE;
-  static const int32_t TEXT_ENCODE;
-  static const int32_t ANSIX12_ENCODE;
-  static const int32_t EDIFACT_ENCODE;
-  static const int32_t BASE256_ENCODE;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
deleted file mode 100644
index 5bfd51b09a..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
-
-CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() {
-  m_rsDecoder = nullptr;
-}
-void CBC_DataMatrixDecoder::Init() {
-  m_rsDecoder =
-      new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
-}
-CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() {
-  delete m_rsDecoder;
-}
-
-CBC_CommonDecoderResult* CBC_DataMatrixDecoder::Decode(
-    CBC_CommonBitMatrix* bits,
-    int32_t& e) {
-  CBC_DataMatrixBitMatrixParser parser;
-  parser.Init(bits, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_DataMatrixVersion* version = parser.GetVersion();
-  std::unique_ptr<CFX_ByteArray> codewords(parser.ReadCodewords(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CFX_ArrayTemplate<CBC_DataMatrixDataBlock*>* dataBlocks =
-      CBC_DataMatrixDataBlock::GetDataBlocks(codewords.get(), version, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t dataBlocksCount = dataBlocks->GetSize();
-  int32_t totalBytes = 0;
-  for (int32_t i = 0; i < dataBlocksCount; i++) {
-    totalBytes += (*dataBlocks)[i]->GetNumDataCodewords();
-  }
-  CFX_ByteArray resultBytes;
-  resultBytes.SetSize(totalBytes);
-  for (int32_t j = 0; j < dataBlocksCount; j++) {
-    CFX_ByteArray* codewordBytes = (*dataBlocks)[j]->GetCodewords();
-    int32_t numDataCodewords = (*dataBlocks)[j]->GetNumDataCodewords();
-    CorrectErrors(*codewordBytes, numDataCodewords, e);
-    if (e != BCExceptionNO) {
-      for (int32_t i = 0; i < dataBlocks->GetSize(); i++) {
-        delete (*dataBlocks)[i];
-      }
-      delete dataBlocks;
-      return nullptr;
-    }
-    for (int32_t i = 0; i < numDataCodewords; i++) {
-      resultBytes[i * dataBlocksCount + j] = (*codewordBytes)[i];
-    }
-  }
-  for (int32_t i = 0; i < (dataBlocks->GetSize()); i++) {
-    delete (*dataBlocks)[i];
-  }
-  delete dataBlocks;
-  CBC_CommonDecoderResult* resultR =
-      CBC_DataMatrixDecodedBitStreamParser::Decode(resultBytes, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return resultR;
-}
-
-void CBC_DataMatrixDecoder::CorrectErrors(CFX_ByteArray& codewordBytes,
-                                          int32_t numDataCodewords,
-                                          int32_t& e) {
-  int32_t numCodewords = codewordBytes.GetSize();
-  CFX_Int32Array codewordsInts;
-  codewordsInts.SetSize(numCodewords);
-  int32_t i;
-  for (i = 0; i < numCodewords; i++) {
-    codewordsInts[i] = codewordBytes[i] & 0xFF;
-  }
-  int32_t numECCodewords = codewordBytes.GetSize() - numDataCodewords;
-  m_rsDecoder->Decode(&codewordsInts, numECCodewords, e);
-  if (e != BCExceptionNO) {
-    e = BCExceptionChecksumException;
-    return;
-  }
-  for (i = 0; i < numDataCodewords; i++) {
-    codewordBytes[i] = (uint8_t)codewordsInts[i];
-  }
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
deleted file mode 100644
index 38d3fe5bf7..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_ReedSolomonDecoder;
-class CBC_CommonDecoderResult;
-class CBC_CommonBitMatrix;
-
-class CBC_DataMatrixDecoder {
- public:
-  CBC_DataMatrixDecoder();
-  virtual ~CBC_DataMatrixDecoder();
-
-  CBC_CommonDecoderResult* Decode(CBC_CommonBitMatrix* bits, int32_t& e);
-
-  virtual void Init();
-
- private:
-  void CorrectErrors(CFX_ByteArray& codewordBytes,
-                     int32_t numDataCodewords,
-                     int32_t& e);
-  CBC_ReedSolomonDecoder* m_rsDecoder;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
deleted file mode 100644
index d34515310e..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
-
-#include <algorithm>
-#include <memory>
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_WhiteRectangleDetector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRGridSampler.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
-CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
-    : m_image(image), m_rectangleDetector(nullptr) {}
-void CBC_DataMatrixDetector::Init(int32_t& e) {
-  m_rectangleDetector = new CBC_WhiteRectangleDetector(m_image);
-  m_rectangleDetector->Init(e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-}
-CBC_DataMatrixDetector::~CBC_DataMatrixDetector() {
-  delete m_rectangleDetector;
-}
-
-CBC_QRDetectorResult* CBC_DataMatrixDetector::Detect(int32_t& e) {
-  CFX_ArrayTemplate<CBC_ResultPoint*>* cornerPoints =
-      m_rectangleDetector->Detect(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_ResultPoint* pointA = (*cornerPoints)[0];
-  CBC_ResultPoint* pointB = (*cornerPoints)[1];
-  CBC_ResultPoint* pointC = (*cornerPoints)[2];
-  CBC_ResultPoint* pointD = (*cornerPoints)[3];
-  delete cornerPoints;
-
-  CFX_ArrayTemplate<CBC_ResultPointsAndTransitions*> transitions;
-  transitions.Add(TransitionsBetween(pointA, pointB));
-  transitions.Add(TransitionsBetween(pointA, pointC));
-  transitions.Add(TransitionsBetween(pointB, pointD));
-  transitions.Add(TransitionsBetween(pointC, pointD));
-  std::sort(transitions.GetData(),
-            transitions.GetData() + transitions.GetSize(),
-            [](const CBC_ResultPointsAndTransitions* a,
-               const CBC_ResultPointsAndTransitions* b) {
-              return a->GetTransitions() < b->GetTransitions();
-            });
-  delete transitions[2];
-  delete transitions[3];
-
-  CBC_ResultPointsAndTransitions* lSideOne = transitions[0];
-  CBC_ResultPointsAndTransitions* lSideTwo = transitions[1];
-  CFX_MapPtrTemplate<CBC_ResultPoint*, int32_t> pointCount;
-  Increment(pointCount, lSideOne->GetFrom());
-  Increment(pointCount, lSideOne->GetTo());
-  Increment(pointCount, lSideTwo->GetFrom());
-  Increment(pointCount, lSideTwo->GetTo());
-  delete transitions[1];
-  delete transitions[0];
-  transitions.RemoveAll();
-  CBC_ResultPoint* maybeTopLeft = nullptr;
-  CBC_ResultPoint* bottomLeft = nullptr;
-  CBC_ResultPoint* maybeBottomRight = nullptr;
-  FX_POSITION itBegin = pointCount.GetStartPosition();
-  while (itBegin) {
-    CBC_ResultPoint* key = 0;
-    int32_t value = 0;
-    pointCount.GetNextAssoc(itBegin, key, value);
-    if (value == 2) {
-      bottomLeft = key;
-    } else {
-      if (maybeBottomRight) {
-        maybeTopLeft = key;
-      } else {
-        maybeBottomRight = key;
-      }
-    }
-  }
-  if (!maybeTopLeft || !bottomLeft || !maybeBottomRight) {
-    delete pointA;
-    delete pointB;
-    delete pointC;
-    delete pointD;
-    e = BCExceptionNotFound;
-    return nullptr;
-  }
-  CFX_ArrayTemplate<CBC_ResultPoint*> corners;
-  corners.SetSize(3);
-  corners[0] = maybeTopLeft;
-  corners[1] = bottomLeft;
-  corners[2] = maybeBottomRight;
-  OrderBestPatterns(&corners);
-  CBC_ResultPoint* bottomRight = corners[0];
-  bottomLeft = corners[1];
-  CBC_ResultPoint* topLeft = corners[2];
-  CBC_ResultPoint* topRight = nullptr;
-  int32_t value;
-  if (!pointCount.Lookup(pointA, value)) {
-    topRight = pointA;
-  } else if (!pointCount.Lookup(pointB, value)) {
-    topRight = pointB;
-  } else if (!pointCount.Lookup(pointC, value)) {
-    topRight = pointC;
-  } else {
-    topRight = pointD;
-  }
-  int32_t dimensionTop = std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(topLeft, topRight))
-                             ->GetTransitions();
-  int32_t dimensionRight = std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                               TransitionsBetween(bottomRight, topRight))
-                               ->GetTransitions();
-  if ((dimensionTop & 0x01) == 1) {
-    dimensionTop++;
-  }
-  dimensionTop += 2;
-  if ((dimensionRight & 0x01) == 1) {
-    dimensionRight++;
-  }
-  dimensionRight += 2;
-  std::unique_ptr<CBC_CommonBitMatrix> bits;
-  std::unique_ptr<CBC_ResultPoint> correctedTopRight;
-  if (4 * dimensionTop >= 7 * dimensionRight ||
-      4 * dimensionRight >= 7 * dimensionTop) {
-    correctedTopRight.reset(
-        CorrectTopRightRectangular(bottomLeft, bottomRight, topLeft, topRight,
-                                   dimensionTop, dimensionRight));
-    if (!correctedTopRight.get()) {
-      correctedTopRight.reset(topRight);
-    } else {
-      delete topRight;
-      topRight = nullptr;
-    }
-    dimensionTop = std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                       TransitionsBetween(topLeft, correctedTopRight.get()))
-                       ->GetTransitions();
-    dimensionRight =
-        std::unique_ptr<CBC_ResultPointsAndTransitions>(
-            TransitionsBetween(bottomRight, correctedTopRight.get()))
-            ->GetTransitions();
-    if ((dimensionTop & 0x01) == 1) {
-      dimensionTop++;
-    }
-    if ((dimensionRight & 0x01) == 1) {
-      dimensionRight++;
-    }
-    bits.reset(SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
-                          correctedTopRight.get(), dimensionTop, dimensionRight,
-                          e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  } else {
-    int32_t dimension = std::min(dimensionRight, dimensionTop);
-    correctedTopRight.reset(
-        CorrectTopRight(bottomLeft, bottomRight, topLeft, topRight, dimension));
-    if (!correctedTopRight.get()) {
-      correctedTopRight.reset(topRight);
-    } else {
-      delete topRight;
-      topRight = nullptr;
-    }
-    int32_t dimensionCorrected =
-        std::max(std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                     TransitionsBetween(topLeft, correctedTopRight.get()))
-                     ->GetTransitions(),
-                 std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                     TransitionsBetween(bottomRight, correctedTopRight.get()))
-                     ->GetTransitions());
-    dimensionCorrected++;
-    if ((dimensionCorrected & 0x01) == 1) {
-      dimensionCorrected++;
-    }
-    bits.reset(SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
-                          correctedTopRight.get(), dimensionCorrected,
-                          dimensionCorrected, e));
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  CFX_ArrayTemplate<CBC_ResultPoint*>* result =
-      new CFX_ArrayTemplate<CBC_ResultPoint*>();
-  result->SetSize(4);
-  result->Add(topLeft);
-  result->Add(bottomLeft);
-  result->Add(bottomRight);
-  result->Add(correctedTopRight.release());
-  return new CBC_QRDetectorResult(bits.release(), result);
-}
-CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular(
-    CBC_ResultPoint* bottomLeft,
-    CBC_ResultPoint* bottomRight,
-    CBC_ResultPoint* topLeft,
-    CBC_ResultPoint* topRight,
-    int32_t dimensionTop,
-    int32_t dimensionRight) {
-  FX_FLOAT corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimensionTop;
-  int32_t norm = Distance(topLeft, topRight);
-  FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
-  FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
-  std::unique_ptr<CBC_ResultPoint> c1(new CBC_ResultPoint(
-      topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
-  corr = Distance(bottomLeft, topLeft) / (FX_FLOAT)dimensionRight;
-  norm = Distance(bottomRight, topRight);
-  cos = (topRight->GetX() - bottomRight->GetX()) / norm;
-  sin = (topRight->GetY() - bottomRight->GetY()) / norm;
-  std::unique_ptr<CBC_ResultPoint> c2(new CBC_ResultPoint(
-      topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
-  if (!IsValid(c1.get())) {
-    if (IsValid(c2.get())) {
-      return c2.release();
-    }
-    return nullptr;
-  } else if (!IsValid(c2.get())) {
-    return c1.release();
-  }
-  int32_t l1 = FXSYS_abs(dimensionTop -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(topLeft, c1.get()))
-                             ->GetTransitions()) +
-               FXSYS_abs(dimensionRight -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(bottomRight, c1.get()))
-                             ->GetTransitions());
-  int32_t l2 = FXSYS_abs(dimensionTop -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(topLeft, c2.get()))
-                             ->GetTransitions()) +
-               FXSYS_abs(dimensionRight -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(bottomRight, c2.get()))
-                             ->GetTransitions());
-  if (l1 <= l2) {
-    return c1.release();
-  }
-  return c2.release();
-}
-CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRight(
-    CBC_ResultPoint* bottomLeft,
-    CBC_ResultPoint* bottomRight,
-    CBC_ResultPoint* topLeft,
-    CBC_ResultPoint* topRight,
-    int32_t dimension) {
-  FX_FLOAT corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
-  int32_t norm = Distance(topLeft, topRight);
-  FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
-  FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
-  std::unique_ptr<CBC_ResultPoint> c1(new CBC_ResultPoint(
-      topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
-  corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
-  norm = Distance(bottomRight, topRight);
-  cos = (topRight->GetX() - bottomRight->GetX()) / norm;
-  sin = (topRight->GetY() - bottomRight->GetY()) / norm;
-  std::unique_ptr<CBC_ResultPoint> c2(new CBC_ResultPoint(
-      topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
-  if (!IsValid(c1.get())) {
-    if (IsValid(c2.get())) {
-      return c2.release();
-    }
-    return nullptr;
-  } else if (!IsValid(c2.get())) {
-    return c1.release();
-  }
-  int32_t l1 = FXSYS_abs(std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(topLeft, c1.get()))
-                             ->GetTransitions() -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(bottomRight, c1.get()))
-                             ->GetTransitions());
-  int32_t l2 = FXSYS_abs(std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(topLeft, c2.get()))
-                             ->GetTransitions() -
-                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
-                             TransitionsBetween(bottomRight, c2.get()))
-                             ->GetTransitions());
-  return l1 <= l2 ? c1.release() : c2.release();
-}
-FX_BOOL CBC_DataMatrixDetector::IsValid(CBC_ResultPoint* p) {
-  return p->GetX() >= 0 && p->GetX() < m_image->GetWidth() && p->GetY() > 0 &&
-         p->GetY() < m_image->GetHeight();
-}
-int32_t CBC_DataMatrixDetector::Round(FX_FLOAT d) {
-  return (int32_t)(d + 0.5f);
-}
-int32_t CBC_DataMatrixDetector::Distance(CBC_ResultPoint* a,
-                                         CBC_ResultPoint* b) {
-  return Round(
-      (FX_FLOAT)sqrt((a->GetX() - b->GetX()) * (a->GetX() - b->GetX()) +
-                     (a->GetY() - b->GetY()) * (a->GetY() - b->GetY())));
-}
-void CBC_DataMatrixDetector::Increment(
-    CFX_MapPtrTemplate<CBC_ResultPoint*, int32_t>& table,
-    CBC_ResultPoint* key) {
-  int32_t value;
-  if (table.Lookup(key, value)) {
-    table.SetAt(key, INTEGERS[value + 1]);
-  } else {
-    table.SetAt(key, INTEGERS[1]);
-  }
-}
-CBC_CommonBitMatrix* CBC_DataMatrixDetector::SampleGrid(
-    CBC_CommonBitMatrix* image,
-    CBC_ResultPoint* topLeft,
-    CBC_ResultPoint* bottomLeft,
-    CBC_ResultPoint* bottomRight,
-    CBC_ResultPoint* topRight,
-    int32_t dimensionX,
-    int32_t dimensionY,
-    int32_t& e) {
-  CBC_QRGridSampler& sampler = CBC_QRGridSampler::GetInstance();
-  CBC_CommonBitMatrix* cbm = sampler.SampleGrid(
-      image, dimensionX, dimensionY, 0.5f, 0.5f, dimensionX - 0.5f, 0.5f,
-      dimensionX - 0.5f, dimensionY - 0.5f, 0.5f, dimensionY - 0.5f,
-      topLeft->GetX(), topLeft->GetY(), topRight->GetX(), topRight->GetY(),
-      bottomRight->GetX(), bottomRight->GetY(), bottomLeft->GetX(),
-      bottomLeft->GetY(), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return cbm;
-}
-CBC_ResultPointsAndTransitions* CBC_DataMatrixDetector::TransitionsBetween(
-    CBC_ResultPoint* from,
-    CBC_ResultPoint* to) {
-  int32_t fromX = (int32_t)from->GetX();
-  int32_t fromY = (int32_t)from->GetY();
-  int32_t toX = (int32_t)to->GetX();
-  int32_t toY = (int32_t)to->GetY();
-  FX_BOOL steep = FXSYS_abs(toY - fromY) > FXSYS_abs(toX - fromX);
-  if (steep) {
-    int32_t temp = fromX;
-    fromX = fromY;
-    fromY = temp;
-    temp = toX;
-    toX = toY;
-    toY = temp;
-  }
-  int32_t dx = FXSYS_abs(toX - fromX);
-  int32_t dy = FXSYS_abs(toY - fromY);
-  int32_t error = -dx >> 1;
-  int32_t ystep = fromY < toY ? 1 : -1;
-  int32_t xstep = fromX < toX ? 1 : -1;
-  int32_t transitions = 0;
-  FX_BOOL inBlack = m_image->Get(steep ? fromY : fromX, steep ? fromX : fromY);
-  for (int32_t x = fromX, y = fromY; x != toX; x += xstep) {
-    FX_BOOL isBlack = m_image->Get(steep ? y : x, steep ? x : y);
-    if (isBlack != inBlack) {
-      transitions++;
-      inBlack = isBlack;
-    }
-    error += dy;
-    if (error > 0) {
-      if (y == toY) {
-        break;
-      }
-      y += ystep;
-      error -= dx;
-    }
-  }
-  return new CBC_ResultPointsAndTransitions(from, to, transitions);
-}
-void CBC_DataMatrixDetector::OrderBestPatterns(
-    CFX_ArrayTemplate<CBC_ResultPoint*>* patterns) {
-  FX_FLOAT abDistance = (FX_FLOAT)Distance((*patterns)[0], (*patterns)[1]);
-  FX_FLOAT bcDistance = (FX_FLOAT)Distance((*patterns)[1], (*patterns)[2]);
-  FX_FLOAT acDistance = (FX_FLOAT)Distance((*patterns)[0], (*patterns)[2]);
-  CBC_ResultPoint *topLeft, *topRight, *bottomLeft;
-  if (bcDistance >= abDistance && bcDistance >= acDistance) {
-    topLeft = (*patterns)[0];
-    topRight = (*patterns)[1];
-    bottomLeft = (*patterns)[2];
-  } else if (acDistance >= bcDistance && acDistance >= abDistance) {
-    topLeft = (*patterns)[1];
-    topRight = (*patterns)[0];
-    bottomLeft = (*patterns)[2];
-  } else {
-    topLeft = (*patterns)[2];
-    topRight = (*patterns)[0];
-    bottomLeft = (*patterns)[1];
-  }
-  if ((bottomLeft->GetY() - topLeft->GetY()) *
-          (topRight->GetX() - topLeft->GetX()) <
-      (bottomLeft->GetX() - topLeft->GetX()) *
-          (topRight->GetY() - topLeft->GetY())) {
-    CBC_ResultPoint* temp = topRight;
-    topRight = bottomLeft;
-    bottomLeft = temp;
-  }
-  (*patterns)[0] = bottomLeft;
-  (*patterns)[1] = topLeft;
-  (*patterns)[2] = topRight;
-}
-
-CBC_ResultPointsAndTransitions::CBC_ResultPointsAndTransitions(
-    CBC_ResultPoint* from,
-    CBC_ResultPoint* to,
-    int32_t transitions)
-    : m_from(from), m_to(to), m_transitions(transitions) {}
-
-CBC_ResultPointsAndTransitions::~CBC_ResultPointsAndTransitions() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h
deleted file mode 100644
index d06b051554..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_DataMatrixDetector;
-class CBC_QRDetectorResult;
-class CBC_ResultPoint;
-class CBC_WhiteRectangleDetector;
-
-class CBC_ResultPointsAndTransitions {
- public:
-  CBC_ResultPointsAndTransitions(CBC_ResultPoint* from,
-                                 CBC_ResultPoint* to,
-                                 int32_t transitions);
-  ~CBC_ResultPointsAndTransitions();
-
-  CBC_ResultPoint* GetFrom() const { return m_from; }
-  CBC_ResultPoint* GetTo() const { return m_to; }
-  int32_t GetTransitions() const { return m_transitions; }
-
- private:
-  CBC_ResultPoint* m_from;
-  CBC_ResultPoint* m_to;
-  int32_t m_transitions;
-};
-
-class CBC_DataMatrixDetector {
- public:
-  CBC_DataMatrixDetector(CBC_CommonBitMatrix* image);
-  virtual ~CBC_DataMatrixDetector();
-
-  CBC_QRDetectorResult* Detect(int32_t& e);
-  CBC_ResultPoint* CorrectTopRightRectangular(CBC_ResultPoint* bottomLeft,
-                                              CBC_ResultPoint* bottomRight,
-                                              CBC_ResultPoint* topLeft,
-                                              CBC_ResultPoint* topRight,
-                                              int32_t dimensionTop,
-                                              int32_t dimensionRight);
-  CBC_ResultPoint* CorrectTopRight(CBC_ResultPoint* bottomLeft,
-                                   CBC_ResultPoint* bottomRight,
-                                   CBC_ResultPoint* topLeft,
-                                   CBC_ResultPoint* topRight,
-                                   int32_t dimension);
-  CBC_CommonBitMatrix* SampleGrid(CBC_CommonBitMatrix* image,
-                                  CBC_ResultPoint* topLeft,
-                                  CBC_ResultPoint* bottomLeft,
-                                  CBC_ResultPoint* bottomRight,
-                                  CBC_ResultPoint* topRight,
-                                  int32_t dimensionX,
-                                  int32_t dimensionY,
-                                  int32_t& e);
-  CBC_ResultPointsAndTransitions* TransitionsBetween(CBC_ResultPoint* from,
-                                                     CBC_ResultPoint* to);
-  FX_BOOL IsValid(CBC_ResultPoint* p);
-  int32_t Distance(CBC_ResultPoint* a, CBC_ResultPoint* b);
-  void Increment(CFX_MapPtrTemplate<CBC_ResultPoint*, int32_t>& table,
-                 CBC_ResultPoint* key);
-  int32_t Round(FX_FLOAT d);
-  void OrderBestPatterns(CFX_ArrayTemplate<CBC_ResultPoint*>* patterns);
-
-  virtual void Init(int32_t& e);
-
- private:
-  static const int32_t INTEGERS[5];
-
-  CBC_CommonBitMatrix* m_image;
-  CBC_WhiteRectangleDetector* m_rectangleDetector;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
deleted file mode 100644
index 7c1ba96a46..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_DataMatrixReader::CBC_DataMatrixReader() {
-  m_decoder = nullptr;
-}
-void CBC_DataMatrixReader::Init() {
-  m_decoder = new CBC_DataMatrixDecoder;
-  m_decoder->Init();
-}
-CBC_DataMatrixReader::~CBC_DataMatrixReader() {
-  delete m_decoder;
-}
-CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
-                                            int32_t hints,
-                                            int32_t& e) {
-  CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CBC_DataMatrixDetector detector(cdr);
-  detector.Init(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  std::unique_ptr<CBC_QRDetectorResult> detectorResult(detector.Detect(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  std::unique_ptr<CBC_CommonDecoderResult> decodeResult(
-      m_decoder->Decode(detectorResult->GetBits(), e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return decodeResult->GetText();
-}
-
-CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
-                                            int32_t& e) {
-  CFX_ByteString bs = Decode(image, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return bs;
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h
deleted file mode 100644
index c7a0995dcb..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
-
-#include "xfa/fxbarcode/BC_Reader.h"
-
-class CBC_BinaryBitmap;
-class CBC_DataMatrixDecoder;
-
-class CBC_DataMatrixReader : public CBC_Reader {
- public:
-  CBC_DataMatrixReader();
-  ~CBC_DataMatrixReader() override;
-
-  // CBC_Reader
-  CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override;
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        int hints,
-                        int32_t& e) override;
-
-  virtual void Init();
-
- private:
-  CBC_DataMatrixDecoder* m_decoder;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
deleted file mode 100644
index 29fb792ced..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdint.h>
-
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
-#include "xfa/fxbarcode/utils.h"
-
-CFX_ArrayTemplate<CBC_DataMatrixVersion*>* CBC_DataMatrixVersion::VERSIONS =
-    nullptr;
-
-void CBC_DataMatrixVersion::Initialize() {
-  VERSIONS = new CFX_ArrayTemplate<CBC_DataMatrixVersion*>();
-}
-void CBC_DataMatrixVersion::Finalize() {
-  for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
-    delete VERSIONS->GetAt(i);
-  }
-  VERSIONS->RemoveAll();
-  delete VERSIONS;
-}
-CBC_DataMatrixVersion::CBC_DataMatrixVersion(int32_t versionNumber,
-                                             int32_t symbolSizeRows,
-                                             int32_t symbolSizeColumns,
-                                             int32_t dataRegionSizeRows,
-                                             int32_t dataRegionSizeColumns,
-                                             ECBlocks* ecBlocks) {
-  m_versionNumber = versionNumber;
-  m_symbolSizeRows = symbolSizeRows;
-  m_symbolSizeColumns = symbolSizeColumns;
-  m_dataRegionSizeRows = dataRegionSizeRows;
-  m_dataRegionSizeColumns = dataRegionSizeColumns;
-  m_ecBlocks = ecBlocks;
-  int32_t total = 0;
-  int32_t ecCodewords = ecBlocks->GetECCodewords();
-  const CFX_ArrayTemplate<ECB*>& ecbArray = ecBlocks->GetECBlocks();
-  for (int32_t i = 0; i < ecbArray.GetSize(); i++) {
-    total += ecbArray[i]->GetCount() *
-             (ecbArray[i]->GetDataCodewords() + ecCodewords);
-  }
-  m_totalCodewords = total;
-}
-CBC_DataMatrixVersion::~CBC_DataMatrixVersion() {
-  delete m_ecBlocks;
-}
-int32_t CBC_DataMatrixVersion::GetVersionNumber() {
-  return m_versionNumber;
-}
-int32_t CBC_DataMatrixVersion::GetSymbolSizeRows() {
-  return m_symbolSizeRows;
-}
-int32_t CBC_DataMatrixVersion::GetSymbolSizeColumns() {
-  return m_symbolSizeColumns;
-}
-int32_t CBC_DataMatrixVersion::GetDataRegionSizeRows() {
-  return m_dataRegionSizeRows;
-}
-int32_t CBC_DataMatrixVersion::GetDataRegionSizeColumns() {
-  return m_dataRegionSizeColumns;
-}
-int32_t CBC_DataMatrixVersion::GetTotalCodewords() {
-  return m_totalCodewords;
-}
-ECBlocks* CBC_DataMatrixVersion::GetECBlocks() {
-  return m_ecBlocks;
-}
-void CBC_DataMatrixVersion::ReleaseAll() {
-  for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
-    delete VERSIONS->GetAt(i);
-  }
-  VERSIONS->RemoveAll();
-}
-CBC_DataMatrixVersion* CBC_DataMatrixVersion::GetVersionForDimensions(
-    int32_t numRows,
-    int32_t numColumns,
-    int32_t& e) {
-  if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0) {
-    e = BCExceptionNotFound;
-    return nullptr;
-  }
-  if (VERSIONS->GetSize() == 0) {
-    VERSIONS->Add(new CBC_DataMatrixVersion(1, 10, 10, 8, 8,
-                                            new ECBlocks(5, new ECB(1, 3))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(2, 12, 12, 10, 10,
-                                            new ECBlocks(7, new ECB(1, 5))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(3, 14, 14, 12, 12,
-                                            new ECBlocks(10, new ECB(1, 8))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(4, 16, 16, 14, 14,
-                                            new ECBlocks(12, new ECB(1, 12))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(5, 18, 18, 16, 16,
-                                            new ECBlocks(14, new ECB(1, 18))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(6, 20, 20, 18, 18,
-                                            new ECBlocks(18, new ECB(1, 22))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(7, 22, 22, 20, 20,
-                                            new ECBlocks(20, new ECB(1, 30))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(8, 24, 24, 22, 22,
-                                            new ECBlocks(24, new ECB(1, 36))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(9, 26, 26, 24, 24,
-                                            new ECBlocks(28, new ECB(1, 44))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(10, 32, 32, 14, 14,
-                                            new ECBlocks(36, new ECB(1, 62))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(11, 36, 36, 16, 16,
-                                            new ECBlocks(42, new ECB(1, 86))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(12, 40, 40, 18, 18,
-                                            new ECBlocks(48, new ECB(1, 114))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(13, 44, 44, 20, 20,
-                                            new ECBlocks(56, new ECB(1, 144))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(14, 48, 48, 22, 22,
-                                            new ECBlocks(68, new ECB(1, 174))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(15, 52, 52, 24, 24,
-                                            new ECBlocks(42, new ECB(2, 102))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(16, 64, 64, 14, 14,
-                                            new ECBlocks(56, new ECB(2, 140))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(17, 72, 72, 16, 16,
-                                            new ECBlocks(36, new ECB(4, 92))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(18, 80, 80, 18, 18,
-                                            new ECBlocks(48, new ECB(4, 114))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(19, 88, 88, 20, 20,
-                                            new ECBlocks(56, new ECB(4, 144))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(20, 96, 96, 22, 22,
-                                            new ECBlocks(68, new ECB(4, 174))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(21, 104, 104, 24, 24,
-                                            new ECBlocks(56, new ECB(6, 136))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(22, 120, 120, 18, 18,
-                                            new ECBlocks(68, new ECB(6, 175))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(23, 132, 132, 20, 20,
-                                            new ECBlocks(62, new ECB(8, 163))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(
-        24, 144, 144, 22, 22,
-        new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(25, 8, 18, 6, 16,
-                                            new ECBlocks(7, new ECB(1, 5))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(26, 8, 32, 6, 14,
-                                            new ECBlocks(11, new ECB(1, 10))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(27, 12, 26, 10, 24,
-                                            new ECBlocks(14, new ECB(1, 16))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(28, 12, 36, 10, 16,
-                                            new ECBlocks(18, new ECB(1, 22))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(29, 16, 36, 14, 16,
-                                            new ECBlocks(24, new ECB(1, 32))));
-    VERSIONS->Add(new CBC_DataMatrixVersion(30, 16, 48, 14, 22,
-                                            new ECBlocks(28, new ECB(1, 49))));
-  }
-  int32_t numVersions = VERSIONS->GetSize();
-  for (int32_t i = 0; i < numVersions; ++i) {
-    if ((*VERSIONS)[i]->m_symbolSizeRows == numRows &&
-        (*VERSIONS)[i]->m_symbolSizeColumns == numColumns) {
-      return (*VERSIONS)[i];
-    }
-  }
-  e = BCExceptionNotFound;
-  return nullptr;
-}
-
-ECB::ECB(int32_t count, int32_t dataCodewords)
-    : m_count(count), m_dataCodewords(dataCodewords) {}
-
-ECBlocks::ECBlocks(int32_t ecCodewords, ECB* ecBlocks)
-    : m_ecCodewords(ecCodewords) {
-  m_ecBlocksArray.Add(ecBlocks);
-}
-
-ECBlocks::ECBlocks(int32_t ecCodewords, ECB* ecBlocks1, ECB* ecBlocks2)
-    : m_ecCodewords(ecCodewords) {
-  m_ecBlocksArray.Add(ecBlocks1);
-  m_ecBlocksArray.Add(ecBlocks2);
-}
-
-ECBlocks::~ECBlocks() {
-  for (int32_t i = 0; i < m_ecBlocksArray.GetSize(); i++)
-    delete m_ecBlocksArray[i];
-}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h
deleted file mode 100644
index 9bbf7f7b72..0000000000
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_DataMatrixVersion;
-
-class ECB {
- public:
-  ECB(int32_t count, int32_t dataCodewords);
-
-  int32_t GetCount() const { return m_count; }
-  int32_t GetDataCodewords() const { return m_dataCodewords; }
-
- private:
-  int32_t m_count;
-  int32_t m_dataCodewords;
-};
-
-class ECBlocks {
- public:
-  ECBlocks(int32_t ecCodewords, ECB* ecBlocks);
-  ECBlocks(int32_t ecCodewords, ECB* ecBlocks1, ECB* ecBlocks2);
-  ~ECBlocks();
-
-  int32_t GetECCodewords() { return m_ecCodewords; }
-  const CFX_ArrayTemplate<ECB*>& GetECBlocks() { return m_ecBlocksArray; }
-
- private:
-  int32_t m_ecCodewords;
-  CFX_ArrayTemplate<ECB*> m_ecBlocksArray;
-};
-
-class CBC_DataMatrixVersion {
- public:
-  CBC_DataMatrixVersion(int32_t versionNumber,
-                        int32_t symbolSizeRows,
-                        int32_t symbolSizeColumns,
-                        int32_t dataRegionSizeRows,
-                        int32_t dataRegionSizeColumns,
-                        ECBlocks* ecBlocks);
-  virtual ~CBC_DataMatrixVersion();
-
-  static void Initialize();
-  static void Finalize();
-  int32_t GetVersionNumber();
-  int32_t GetSymbolSizeRows();
-  int32_t GetSymbolSizeColumns();
-  int32_t GetDataRegionSizeRows();
-  int32_t GetDataRegionSizeColumns();
-  int32_t GetTotalCodewords();
-  ECBlocks* GetECBlocks();
-  static CBC_DataMatrixVersion* GetVersionForDimensions(int32_t numRows,
-                                                        int32_t numColumns,
-                                                        int32_t& e);
-  static void ReleaseAll();
-
- private:
-  int32_t m_versionNumber;
-  int32_t m_symbolSizeRows;
-  int32_t m_symbolSizeColumns;
-  int32_t m_dataRegionSizeRows;
-  int32_t m_dataRegionSizeColumns;
-  ECBlocks* m_ecBlocks;
-  int32_t m_totalCodewords;
-  static CFX_ArrayTemplate<CBC_DataMatrixVersion*>* VERSIONS;
-};
-
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index f056ece258..6263b7fbe5 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
 #include "xfa/fxbarcode/BC_Dimension.h"
 #include "xfa/fxbarcode/BC_TwoDimWriter.h"
 #include "xfa/fxbarcode/BC_UtilCodingConvert.h"
diff --git a/xfa/fxbarcode/oned/BC_OneDReader.cpp b/xfa/fxbarcode/oned/BC_OneDReader.cpp
deleted file mode 100644
index 53ff9a480c..0000000000
--- a/xfa/fxbarcode/oned/BC_OneDReader.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <algorithm>
-#include <memory>
-
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_OneDReader::CBC_OneDReader() {}
-CBC_OneDReader::~CBC_OneDReader() {}
-CFX_ByteString CBC_OneDReader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
-  CFX_ByteString strtemp = Decode(image, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return strtemp;
-}
-CFX_ByteString CBC_OneDReader::Decode(CBC_BinaryBitmap* image,
-                                      int32_t hints,
-                                      int32_t& e) {
-  CFX_ByteString strtemp = DeDecode(image, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return strtemp;
-}
-CFX_ByteString CBC_OneDReader::DecodeRow(int32_t rowNumber,
-                                         CBC_CommonBitArray* row,
-                                         int32_t hints,
-                                         int32_t& e) {
-  return "";
-}
-CFX_ByteString CBC_OneDReader::DeDecode(CBC_BinaryBitmap* image,
-                                        int32_t hints,
-                                        int32_t& e) {
-  int32_t height = image->GetHeight();
-  int32_t middle = height >> 1;
-  FX_BOOL tryHarder = FALSE;
-  int32_t rowStep = std::max(1, height >> (tryHarder ? 8 : 5));
-  int32_t maxLines;
-  if (tryHarder) {
-    maxLines = height;
-  } else {
-    maxLines = 15;
-  }
-  for (int32_t x = 0; x < maxLines; x++) {
-    int32_t rowStepsAboveOrBelow = (x + 1) >> 1;
-    const bool isAbove = (x & 0x01) == 0;
-    int32_t rowNumber =
-        middle +
-        rowStep * (isAbove ? rowStepsAboveOrBelow : -rowStepsAboveOrBelow);
-    if (rowNumber < 0 || rowNumber >= height) {
-      break;
-    }
-    std::unique_ptr<CBC_CommonBitArray> row(
-        image->GetBlackRow(rowNumber, nullptr, e));
-    if (e != BCExceptionNO) {
-      e = BCExceptionNO;
-      continue;
-    }
-    for (int32_t attempt = 0; attempt < 2; attempt++) {
-      if (attempt == 1) {
-        row->Reverse();
-      }
-      CFX_ByteString result = DecodeRow(rowNumber, row.get(), hints, e);
-      if (e != BCExceptionNO) {
-        e = BCExceptionNO;
-        continue;
-      }
-      return result;
-    }
-  }
-  e = BCExceptionNotFound;
-  return "";
-}
-void CBC_OneDReader::RecordPattern(CBC_CommonBitArray* row,
-                                   int32_t start,
-                                   CFX_Int32Array* counters,
-                                   int32_t& e) {
-  int32_t numCounters = counters->GetSize();
-  for (int32_t i = 0; i < numCounters; i++) {
-    (*counters)[i] = 0;
-  }
-  int32_t end = row->GetSize();
-  if (start >= end) {
-    e = BCExceptionNotFound;
-    return;
-  }
-  FX_BOOL isWhite = !row->Get(start);
-  int32_t counterPosition = 0;
-  int32_t j = start;
-  while (j < end) {
-    FX_BOOL pixel = row->Get(j);
-    if (pixel ^ isWhite) {
-      (*counters)[counterPosition]++;
-    } else {
-      counterPosition++;
-      if (counterPosition == numCounters) {
-        break;
-      } else {
-        (*counters)[counterPosition] = 1;
-        isWhite = !isWhite;
-      }
-    }
-    j++;
-  }
-  if (!(counterPosition == numCounters ||
-        (counterPosition == numCounters - 1 && j == end))) {
-    e = BCExceptionNotFound;
-    return;
-  }
-}
-void CBC_OneDReader::RecordPatternInReverse(CBC_CommonBitArray* row,
-                                            int32_t start,
-                                            CFX_Int32Array* counters,
-                                            int32_t& e) {
-  int32_t numTransitionsLeft = counters->GetSize();
-  FX_BOOL last = row->Get(start);
-  while (start > 0 && numTransitionsLeft >= 0) {
-    if (row->Get(--start) != last) {
-      numTransitionsLeft--;
-      last = !last;
-    }
-  }
-  if (numTransitionsLeft >= 0) {
-    e = BCExceptionNotFound;
-    return;
-  }
-  RecordPattern(row, start + 1, counters, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-}
-int32_t CBC_OneDReader::PatternMatchVariance(CFX_Int32Array* counters,
-                                             const int32_t* pattern,
-                                             int32_t maxIndividualVariance) {
-  int32_t numCounters = counters->GetSize();
-  int32_t total = 0;
-  int32_t patternLength = 0;
-  for (int32_t i = 0; i < numCounters; i++) {
-    total += (*counters)[i];
-    patternLength += pattern[i];
-  }
-  if (total < patternLength) {
-#undef max
-    return FXSYS_IntMax;
-  }
-  int32_t unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength;
-  maxIndividualVariance =
-      (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT;
-  int32_t totalVariance = 0;
-  for (int32_t x = 0; x < numCounters; x++) {
-    int32_t counter = (*counters)[x] << INTEGER_MATH_SHIFT;
-    int32_t scaledPattern = pattern[x] * unitBarWidth;
-    int32_t variance = counter > scaledPattern ? counter - scaledPattern
-                                               : scaledPattern - counter;
-    if (variance > maxIndividualVariance) {
-#undef max
-      return FXSYS_IntMax;
-    }
-    totalVariance += variance;
-  }
-  return totalVariance / total;
-}
diff --git a/xfa/fxbarcode/oned/BC_OneDReader.h b/xfa/fxbarcode/oned/BC_OneDReader.h
deleted file mode 100644
index 77e04777a4..0000000000
--- a/xfa/fxbarcode/oned/BC_OneDReader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDREADER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDREADER_H_
-
-#include "xfa/fxbarcode/BC_Reader.h"
-
-class CBC_BinaryBitmap;
-class CBC_CommonBitArray;
-
-class CBC_OneDReader : public CBC_Reader {
- public:
-  CBC_OneDReader();
-  ~CBC_OneDReader() override;
-
-  // CBC_Reader
-  CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override;
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        int32_t hints,
-                        int32_t& e) override;
-
-  virtual CFX_ByteString DecodeRow(int32_t rowNumber,
-                                   CBC_CommonBitArray* row,
-                                   int32_t hints,
-                                   int32_t& e);
-
- private:
-  CFX_ByteString DeDecode(CBC_BinaryBitmap* image, int32_t hints, int32_t& e);
-
- protected:
-  static const int32_t INTEGER_MATH_SHIFT = 8;
-  static const int32_t PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8;
-
-  void RecordPattern(CBC_CommonBitArray* row,
-                     int32_t start,
-                     CFX_Int32Array* counters,
-                     int32_t& e);
-  void RecordPatternInReverse(CBC_CommonBitArray* row,
-                              int32_t start,
-                              CFX_Int32Array* counters,
-                              int32_t& e);
-  int32_t PatternMatchVariance(CFX_Int32Array* counters,
-                               const int32_t* pattern,
-                               int32_t maxIndividualVariance);
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDREADER_H_
diff --git a/xfa/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/fxbarcode/oned/BC_OneDimReader.cpp
deleted file mode 100644
index e413adb6a4..0000000000
--- a/xfa/fxbarcode/oned/BC_OneDimReader.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1};
-const int32_t CBC_OneDimReader::MIDDLE_PATTERN[5] = {1, 1, 1, 1, 1};
-const int32_t CBC_OneDimReader::L_PATTERNS[10][4] = {
-    {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
-    {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2}};
-const int32_t CBC_OneDimReader::L_AND_G_PATTERNS[20][4] = {
-    {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
-    {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2},
-    {1, 1, 2, 3}, {1, 2, 2, 2}, {2, 2, 1, 2}, {1, 1, 4, 1}, {2, 3, 1, 1},
-    {1, 3, 2, 1}, {4, 1, 1, 1}, {2, 1, 3, 1}, {3, 1, 2, 1}, {2, 1, 1, 3}};
-
-CBC_OneDimReader::CBC_OneDimReader() {}
-CBC_OneDimReader::~CBC_OneDimReader() {}
-CFX_Int32Array* CBC_OneDimReader::FindStartGuardPattern(CBC_CommonBitArray* row,
-                                                        int32_t& e) {
-  FX_BOOL foundStart = FALSE;
-  CFX_Int32Array* startRange = nullptr;
-  CFX_Int32Array startEndPattern;
-  startEndPattern.SetSize(3);
-  startEndPattern[0] = START_END_PATTERN[0];
-  startEndPattern[1] = START_END_PATTERN[1];
-  startEndPattern[2] = START_END_PATTERN[2];
-  int32_t nextStart = 0;
-  while (!foundStart) {
-    delete startRange;
-    startRange = FindGuardPattern(row, nextStart, FALSE, &startEndPattern, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    int32_t start = (*startRange)[0];
-    nextStart = (*startRange)[1];
-    if (start <= 1) {
-      break;
-    }
-    int32_t quietStart = start - (nextStart - start);
-    if (quietStart >= 0) {
-      FX_BOOL booT = row->IsRange(quietStart, start, FALSE, e);
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      foundStart = booT;
-    }
-  }
-  return startRange;
-}
-CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber,
-                                           CBC_CommonBitArray* row,
-                                           int32_t hints,
-                                           int32_t& e) {
-  std::unique_ptr<CFX_Int32Array> result(FindStartGuardPattern(row, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CFX_ByteString temp = DecodeRow(rowNumber, row, result.get(), hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return temp;
-}
-CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber,
-                                           CBC_CommonBitArray* row,
-                                           CFX_Int32Array* startGuardRange,
-                                           int32_t hints,
-                                           int32_t& e) {
-  CFX_ByteString result;
-  DecodeMiddle(row, startGuardRange, result, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  FX_BOOL b = CheckChecksum(result, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  if (!b) {
-    e = BCExceptionChecksumException;
-    return "";
-  }
-  return result;
-}
-FX_BOOL CBC_OneDimReader::CheckChecksum(CFX_ByteString& s, int32_t& e) {
-  FX_BOOL temp = CheckStandardUPCEANChecksum(s, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
-  return temp;
-}
-FX_BOOL CBC_OneDimReader::CheckStandardUPCEANChecksum(CFX_ByteString& s,
-                                                      int32_t& e) {
-  int32_t length = s.GetLength();
-  if (length == 0) {
-    return FALSE;
-  }
-  int32_t sum = 0;
-  for (int32_t i = length - 2; i >= 0; i -= 2) {
-    int32_t digit = (int32_t)s[i] - (int32_t)'0';
-    if (digit < 0 || digit > 9) {
-      e = BCExceptionFormatException;
-      return FALSE;
-    }
-    sum += digit;
-  }
-  sum *= 3;
-  for (int32_t j = length - 1; j >= 0; j -= 2) {
-    int32_t digit = (int32_t)s[j] - (int32_t)'0';
-    if (digit < 0 || digit > 9) {
-      e = BCExceptionFormatException;
-      return FALSE;
-    }
-    sum += digit;
-  }
-  return sum % 10 == 0;
-}
-CFX_Int32Array* CBC_OneDimReader::DecodeEnd(CBC_CommonBitArray* row,
-                                            int32_t endStart,
-                                            int32_t& e) {
-  CFX_Int32Array startEndPattern;
-  startEndPattern.Add(START_END_PATTERN[0]);
-  startEndPattern.Add(START_END_PATTERN[1]);
-  startEndPattern.Add(START_END_PATTERN[2]);
-  CFX_Int32Array* FindGuard =
-      FindGuardPattern(row, endStart, FALSE, &startEndPattern, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return FindGuard;
-}
-CFX_Int32Array* CBC_OneDimReader::FindGuardPattern(CBC_CommonBitArray* row,
-                                                   int32_t rowOffset,
-                                                   FX_BOOL whiteFirst,
-                                                   CFX_Int32Array* pattern,
-                                                   int32_t& e) {
-  int32_t patternLength = pattern->GetSize();
-  CFX_Int32Array counters;
-  counters.SetSize(patternLength);
-  int32_t width = row->GetSize();
-  FX_BOOL isWhite = FALSE;
-  while (rowOffset < width) {
-    isWhite = !row->Get(rowOffset);
-    if (whiteFirst == isWhite) {
-      break;
-    }
-    rowOffset++;
-  }
-  int32_t counterPosition = 0;
-  int32_t patternStart = rowOffset;
-  for (int32_t x = rowOffset; x < width; x++) {
-    FX_BOOL pixel = row->Get(x);
-    if (pixel ^ isWhite) {
-      counters[counterPosition]++;
-    } else {
-      if (counterPosition == patternLength - 1) {
-        if (PatternMatchVariance(&counters, &(*pattern)[0],
-                                 MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) {
-          CFX_Int32Array* result = new CFX_Int32Array();
-          result->SetSize(2);
-          (*result)[0] = patternStart;
-          (*result)[1] = x;
-          return result;
-        }
-        patternStart += counters[0] + counters[1];
-        for (int32_t y = 2; y < patternLength; y++) {
-          counters[y - 2] = counters[y];
-        }
-        counters[patternLength - 2] = 0;
-        counters[patternLength - 1] = 0;
-        counterPosition--;
-      } else {
-        counterPosition++;
-      }
-      counters[counterPosition] = 1;
-      isWhite = !isWhite;
-    }
-  }
-  e = BCExceptionNotFound;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return nullptr;
-}
-int32_t CBC_OneDimReader::DecodeDigit(CBC_CommonBitArray* row,
-                                      CFX_Int32Array* counters,
-                                      int32_t rowOffset,
-                                      const int32_t* patterns,
-                                      int32_t patternLength,
-                                      int32_t& e) {
-  RecordPattern(row, rowOffset, counters, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  int32_t bestVariance = MAX_AVG_VARIANCE;
-  int32_t bestMatch = -1;
-  int32_t max = patternLength;
-  for (int32_t i = 0; i < max; i++) {
-    int32_t variance = PatternMatchVariance(counters, &patterns[i * 4],
-                                            MAX_INDIVIDUAL_VARIANCE);
-    if (variance < bestVariance) {
-      bestVariance = variance;
-      bestMatch = i;
-    }
-  }
-  if (bestMatch >= 0) {
-    return bestMatch;
-  }
-  e = BCExceptionNotFound;
-  return 0;
-}
diff --git a/xfa/fxbarcode/oned/BC_OneDimReader.h b/xfa/fxbarcode/oned/BC_OneDimReader.h
deleted file mode 100644
index bd46a189f4..0000000000
--- a/xfa/fxbarcode/oned/BC_OneDimReader.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDIMREADER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDIMREADER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-
-class CBC_CommonBitArray;
-
-class CBC_OneDimReader : public CBC_OneDReader {
- private:
-  static const int32_t MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f);
-  static const int32_t MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f);
-
-  FX_BOOL CheckStandardUPCEANChecksum(CFX_ByteString& s, int32_t& e);
-
- public:
-  static const int32_t START_END_PATTERN[3];
-  static const int32_t MIDDLE_PATTERN[5];
-  static const int32_t L_PATTERNS[10][4];
-  static const int32_t L_AND_G_PATTERNS[20][4];
-
-  CBC_OneDimReader();
-  ~CBC_OneDimReader() override;
-
-  // CBC_OneDReader
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           int32_t hints,
-                           int32_t& e) override;
-
-  virtual CFX_ByteString DecodeRow(int32_t rowNumber,
-                                   CBC_CommonBitArray* row,
-                                   CFX_Int32Array* startGuardRange,
-                                   int32_t hints,
-                                   int32_t& e);
-
- protected:
-  CFX_Int32Array* FindStartGuardPattern(CBC_CommonBitArray* row, int32_t& e);
-  virtual FX_BOOL CheckChecksum(CFX_ByteString& s, int32_t& e);
-  CFX_Int32Array* FindGuardPattern(CBC_CommonBitArray* row,
-                                   int32_t rowOffset,
-                                   FX_BOOL whiteFirst,
-                                   CFX_Int32Array* pattern,
-                                   int32_t& e);
-  int32_t DecodeDigit(CBC_CommonBitArray* row,
-                      CFX_Int32Array* counters,
-                      int32_t rowOffset,
-                      const int32_t* patterns,
-                      int32_t patternLength,
-                      int32_t& e);
-  virtual int32_t DecodeMiddle(CBC_CommonBitArray* row,
-                               CFX_Int32Array* startRange,
-                               CFX_ByteString& resultResult,
-                               int32_t& e) = 0;
-  virtual CFX_Int32Array* DecodeEnd(CBC_CommonBitArray* row,
-                                    int32_t endStart,
-                                    int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDIMREADER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp
deleted file mode 100644
index 0fa0e9a29b..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/oned/BC_OnedCodaBarReader.h"
-
-#include <algorithm>
-#include <memory>
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode39Reader.h"
-#include "xfa/fxbarcode/utils.h"
-
-const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING =
-    "0123456789-$:/.+ABCDTN";
-const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
-    0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024,
-    0x030, 0x048, 0x00c, 0x018, 0x045, 0x051, 0x054, 0x015,
-    0x01A, 0x029, 0x00B, 0x00E, 0x01A, 0x029};
-const FX_CHAR CBC_OnedCodaBarReader::STARTEND_ENCODING[8] = {
-    'E', '*', 'A', 'B', 'C', 'D', 'T', 'N'};
-
-CBC_OnedCodaBarReader::CBC_OnedCodaBarReader() {}
-CBC_OnedCodaBarReader::~CBC_OnedCodaBarReader() {}
-CFX_ByteString CBC_OnedCodaBarReader::DecodeRow(int32_t rowNumber,
-                                                CBC_CommonBitArray* row,
-                                                int32_t hints,
-                                                int32_t& e) {
-  std::unique_ptr<CFX_Int32Array> start(FindAsteriskPattern(row, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  (*start)[1] = 0;
-  int32_t nextStart = (*start)[1];
-  int32_t end = row->GetSize();
-  while (nextStart < end && !row->Get(nextStart)) {
-    nextStart++;
-  }
-  CFX_ByteString result;
-  CFX_Int32Array counters;
-  counters.SetSize(7);
-  FX_CHAR decodedChar;
-  int32_t lastStart;
-  do {
-    RecordPattern(row, nextStart, &counters, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, "");
-    decodedChar = ToNarrowWidePattern(&counters);
-    if (decodedChar == '!') {
-      e = BCExceptionNotFound;
-      return "";
-    }
-    result += decodedChar;
-    lastStart = nextStart;
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      nextStart += counters[i];
-    }
-    while (nextStart < end && !row->Get(nextStart)) {
-      nextStart++;
-    }
-  } while (nextStart < end);
-  int32_t lastPatternSize = 0;
-  for (int32_t j = 0; j < counters.GetSize(); j++) {
-    lastPatternSize += counters[j];
-  }
-  int32_t whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize;
-  if (nextStart != end && (whiteSpaceAfterEnd / 2 < lastPatternSize)) {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  if (result.GetLength() < 2) {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  FX_CHAR startchar = result[0];
-  if (!ArrayContains(STARTEND_ENCODING, startchar)) {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  int32_t len = result.GetLength();
-  CFX_ByteString temp = result;
-  for (int32_t k = 1; k < result.GetLength(); k++) {
-    if (ArrayContains(STARTEND_ENCODING, result[k])) {
-      if ((k + 1) != result.GetLength()) {
-        result.Delete(1, k);
-        k = 1;
-      }
-    }
-  }
-  if (result.GetLength() < 5) {
-    int32_t index =
-        temp.Find(result.Mid(1, result.GetLength() - 1).AsStringC());
-    if (index == len - (result.GetLength() - 1)) {
-      e = BCExceptionNotFound;
-      return "";
-    }
-  }
-  if (result.GetLength() > minCharacterLength) {
-    result = result.Mid(1, result.GetLength() - 2);
-  } else {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  return result;
-}
-CFX_Int32Array* CBC_OnedCodaBarReader::FindAsteriskPattern(
-    CBC_CommonBitArray* row,
-    int32_t& e) {
-  int32_t width = row->GetSize();
-  int32_t rowOffset = 0;
-  while (rowOffset < width) {
-    if (row->Get(rowOffset)) {
-      break;
-    }
-    rowOffset++;
-  }
-  int32_t counterPosition = 0;
-  CFX_Int32Array counters;
-  counters.SetSize(7);
-  int32_t patternStart = rowOffset;
-  FX_BOOL isWhite = FALSE;
-  int32_t patternLength = counters.GetSize();
-  for (int32_t i = rowOffset; i < width; i++) {
-    FX_BOOL pixel = row->Get(i);
-    if (pixel ^ isWhite) {
-      counters[counterPosition]++;
-    } else {
-      if (counterPosition == patternLength - 1) {
-        if (ArrayContains(STARTEND_ENCODING, ToNarrowWidePattern(&counters))) {
-          FX_BOOL btemp3 =
-              row->IsRange(std::max(0, patternStart - (i - patternStart) / 2),
-                           patternStart, FALSE, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          if (btemp3) {
-            CFX_Int32Array* result = new CFX_Int32Array();
-            result->SetSize(2);
-            (*result)[0] = patternStart;
-            (*result)[1] = i;
-            return result;
-          }
-        }
-        patternStart += counters[0] + counters[1];
-        for (int32_t y = 2; y < patternLength; y++) {
-          counters[y - 2] = counters[y];
-        }
-        counters[patternLength - 2] = 0;
-        counters[patternLength - 1] = 0;
-        counterPosition--;
-      } else {
-        counterPosition++;
-      }
-      counters[counterPosition] = 1;
-      isWhite = !isWhite;
-    }
-  }
-  e = BCExceptionNotFound;
-  return nullptr;
-}
-FX_BOOL CBC_OnedCodaBarReader::ArrayContains(const FX_CHAR array[],
-                                             FX_CHAR key) {
-  for (int32_t i = 0; i < 8; i++) {
-    if (array[i] == key) {
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-FX_CHAR CBC_OnedCodaBarReader::ToNarrowWidePattern(CFX_Int32Array* counter) {
-  int32_t numCounters = counter->GetSize();
-  if (numCounters < 1) {
-    return '!';
-  }
-  int32_t averageCounter = 0;
-  int32_t totalCounters = 0;
-  for (int32_t i = 0; i < numCounters; i++) {
-    totalCounters += (*counter)[i];
-  }
-  averageCounter = totalCounters / numCounters;
-  int32_t pattern = 0;
-  int32_t wideCounters = 0;
-  for (int32_t j = 0; j < numCounters; j++) {
-    if ((*counter)[j] > averageCounter) {
-      pattern |= 1 << (numCounters - 1 - j);
-      wideCounters++;
-    }
-  }
-  if ((wideCounters == 2) || (wideCounters == 3)) {
-    for (int32_t k = 0; k < 22; k++) {
-      if (CHARACTER_ENCODINGS[k] == pattern) {
-        return (ALPHABET_STRING)[k];
-      }
-    }
-  }
-  return '!';
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h
deleted file mode 100644
index ce902bff5e..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-
-class CBC_CommonBitArray;
-class CBC_OneDReader;
-
-class CBC_OnedCodaBarReader : public CBC_OneDReader {
- public:
-  CBC_OnedCodaBarReader();
-  ~CBC_OnedCodaBarReader() override;
-
-  // CBC_OneDReader
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           int32_t hints,
-                           int32_t& e) override;
-
-  CFX_Int32Array* FindAsteriskPattern(CBC_CommonBitArray* row, int32_t& e);
-  FX_BOOL ArrayContains(const FX_CHAR array[], FX_CHAR key);
-  FX_CHAR ToNarrowWidePattern(CFX_Int32Array* counter);
-
-  static const FX_CHAR* ALPHABET_STRING;
-  static const int32_t CHARACTER_ENCODINGS[22];
-
- private:
-  static const int32_t minCharacterLength = 3;
-  static const FX_CHAR STARTEND_ENCODING[8];
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index 59f4d5ea4d..e25a6c0a5c 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -20,20 +20,27 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
 #include "xfa/fxbarcode/common/BC_CommonBitArray.h"
 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCodaBarReader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h"
 
-const FX_CHAR CBC_OnedCodaBarWriter::START_END_CHARS[] = {
-    'A', 'B', 'C', 'D', 'T', 'N', '*', 'E', 'a', 'b', 'c', 'd', 't', 'n', 'e'};
-const FX_CHAR CBC_OnedCodaBarWriter::CONTENT_CHARS[] = {
-    '0', '1', '2', '3', '4', '5', '6', '7',
-    '8', '9', '-', '$', '/', ':', '+', '.'};
+namespace {
+
+const FX_CHAR ALPHABET_STRING[] = "0123456789-$:/.+ABCDTN";
+
+const int32_t CHARACTER_ENCODINGS[22] = {
+    0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024,
+    0x030, 0x048, 0x00c, 0x018, 0x045, 0x051, 0x054, 0x015,
+    0x01A, 0x029, 0x00B, 0x00E, 0x01A, 0x029};
+
+const FX_CHAR START_END_CHARS[] = {'A', 'B', 'C', 'D', 'T', 'N', '*', 'E',
+                                   'a', 'b', 'c', 'd', 't', 'n', 'e'};
+const FX_CHAR CONTENT_CHARS[] = {'0', '1', '2', '3', '4', '5', '6', '7',
+                                 '8', '9', '-', '$', '/', ':', '+', '.'};
+
+}  // namespace
 
 CBC_OnedCodaBarWriter::CBC_OnedCodaBarWriter() {
   m_chStart = 'A';
@@ -158,7 +165,6 @@ uint8_t* CBC_OnedCodaBarWriter::Encode(const CFX_ByteString& contents,
 uint8_t* CBC_OnedCodaBarWriter::Encode(const CFX_ByteString& contents,
                                        int32_t& outLength,
                                        int32_t& e) {
-  CBC_OnedCodaBarReader CodaBarR;
   CFX_ByteString data = m_chStart + contents + m_chEnd;
   m_iContentLen = data.GetLength();
   uint8_t* result = FX_Alloc2D(uint8_t, m_iWideNarrRatio * 7, data.GetLength());
@@ -186,10 +192,10 @@ uint8_t* CBC_OnedCodaBarWriter::Encode(const CFX_ByteString& contents,
         break;
     }
     int32_t code = 0;
-    int32_t len = (int32_t)strlen(CodaBarR.ALPHABET_STRING);
+    int32_t len = (int32_t)strlen(ALPHABET_STRING);
     for (int32_t i = 0; i < len; i++) {
-      if (ch == CodaBarR.ALPHABET_STRING[i]) {
-        code = CodaBarR.CHARACTER_ENCODINGS[i];
+      if (ch == ALPHABET_STRING[i]) {
+        code = CHARACTER_ENCODINGS[i];
         break;
       }
     }
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 99c6bfb039..02b6b66bea 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -44,9 +44,6 @@ class CBC_OnedCodaBarWriter : public CBC_OneDimWriter {
   virtual FX_BOOL FindChar(FX_WCHAR ch, FX_BOOL isContent);
 
  private:
-  static const FX_CHAR START_END_CHARS[];
-  static const FX_CHAR CONTENT_CHARS[];
-
   void RenderResult(const CFX_WideStringC& contents,
                     uint8_t* code,
                     int32_t codeLength,
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/fxbarcode/oned/BC_OnedCode128Reader.cpp
deleted file mode 100644
index b868327a37..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCode128Reader.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <algorithm>
-
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode128Reader.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = {
-    {2, 1, 2, 2, 2, 2, 0}, {2, 2, 2, 1, 2, 2, 0}, {2, 2, 2, 2, 2, 1, 0},
-    {1, 2, 1, 2, 2, 3, 0}, {1, 2, 1, 3, 2, 2, 0}, {1, 3, 1, 2, 2, 2, 0},
-    {1, 2, 2, 2, 1, 3, 0}, {1, 2, 2, 3, 1, 2, 0}, {1, 3, 2, 2, 1, 2, 0},
-    {2, 2, 1, 2, 1, 3, 0}, {2, 2, 1, 3, 1, 2, 0}, {2, 3, 1, 2, 1, 2, 0},
-    {1, 1, 2, 2, 3, 2, 0}, {1, 2, 2, 1, 3, 2, 0}, {1, 2, 2, 2, 3, 1, 0},
-    {1, 1, 3, 2, 2, 2, 0}, {1, 2, 3, 1, 2, 2, 0}, {1, 2, 3, 2, 2, 1, 0},
-    {2, 2, 3, 2, 1, 1, 0}, {2, 2, 1, 1, 3, 2, 0}, {2, 2, 1, 2, 3, 1, 0},
-    {2, 1, 3, 2, 1, 2, 0}, {2, 2, 3, 1, 1, 2, 0}, {3, 1, 2, 1, 3, 1, 0},
-    {3, 1, 1, 2, 2, 2, 0}, {3, 2, 1, 1, 2, 2, 0}, {3, 2, 1, 2, 2, 1, 0},
-    {3, 1, 2, 2, 1, 2, 0}, {3, 2, 2, 1, 1, 2, 0}, {3, 2, 2, 2, 1, 1, 0},
-    {2, 1, 2, 1, 2, 3, 0}, {2, 1, 2, 3, 2, 1, 0}, {2, 3, 2, 1, 2, 1, 0},
-    {1, 1, 1, 3, 2, 3, 0}, {1, 3, 1, 1, 2, 3, 0}, {1, 3, 1, 3, 2, 1, 0},
-    {1, 1, 2, 3, 1, 3, 0}, {1, 3, 2, 1, 1, 3, 0}, {1, 3, 2, 3, 1, 1, 0},
-    {2, 1, 1, 3, 1, 3, 0}, {2, 3, 1, 1, 1, 3, 0}, {2, 3, 1, 3, 1, 1, 0},
-    {1, 1, 2, 1, 3, 3, 0}, {1, 1, 2, 3, 3, 1, 0}, {1, 3, 2, 1, 3, 1, 0},
-    {1, 1, 3, 1, 2, 3, 0}, {1, 1, 3, 3, 2, 1, 0}, {1, 3, 3, 1, 2, 1, 0},
-    {3, 1, 3, 1, 2, 1, 0}, {2, 1, 1, 3, 3, 1, 0}, {2, 3, 1, 1, 3, 1, 0},
-    {2, 1, 3, 1, 1, 3, 0}, {2, 1, 3, 3, 1, 1, 0}, {2, 1, 3, 1, 3, 1, 0},
-    {3, 1, 1, 1, 2, 3, 0}, {3, 1, 1, 3, 2, 1, 0}, {3, 3, 1, 1, 2, 1, 0},
-    {3, 1, 2, 1, 1, 3, 0}, {3, 1, 2, 3, 1, 1, 0}, {3, 3, 2, 1, 1, 1, 0},
-    {3, 1, 4, 1, 1, 1, 0}, {2, 2, 1, 4, 1, 1, 0}, {4, 3, 1, 1, 1, 1, 0},
-    {1, 1, 1, 2, 2, 4, 0}, {1, 1, 1, 4, 2, 2, 0}, {1, 2, 1, 1, 2, 4, 0},
-    {1, 2, 1, 4, 2, 1, 0}, {1, 4, 1, 1, 2, 2, 0}, {1, 4, 1, 2, 2, 1, 0},
-    {1, 1, 2, 2, 1, 4, 0}, {1, 1, 2, 4, 1, 2, 0}, {1, 2, 2, 1, 1, 4, 0},
-    {1, 2, 2, 4, 1, 1, 0}, {1, 4, 2, 1, 1, 2, 0}, {1, 4, 2, 2, 1, 1, 0},
-    {2, 4, 1, 2, 1, 1, 0}, {2, 2, 1, 1, 1, 4, 0}, {4, 1, 3, 1, 1, 1, 0},
-    {2, 4, 1, 1, 1, 2, 0}, {1, 3, 4, 1, 1, 1, 0}, {1, 1, 1, 2, 4, 2, 0},
-    {1, 2, 1, 1, 4, 2, 0}, {1, 2, 1, 2, 4, 1, 0}, {1, 1, 4, 2, 1, 2, 0},
-    {1, 2, 4, 1, 1, 2, 0}, {1, 2, 4, 2, 1, 1, 0}, {4, 1, 1, 2, 1, 2, 0},
-    {4, 2, 1, 1, 1, 2, 0}, {4, 2, 1, 2, 1, 1, 0}, {2, 1, 2, 1, 4, 1, 0},
-    {2, 1, 4, 1, 2, 1, 0}, {4, 1, 2, 1, 2, 1, 0}, {1, 1, 1, 1, 4, 3, 0},
-    {1, 1, 1, 3, 4, 1, 0}, {1, 3, 1, 1, 4, 1, 0}, {1, 1, 4, 1, 1, 3, 0},
-    {1, 1, 4, 3, 1, 1, 0}, {4, 1, 1, 1, 1, 3, 0}, {4, 1, 1, 3, 1, 1, 0},
-    {1, 1, 3, 1, 4, 1, 0}, {1, 1, 4, 1, 3, 1, 0}, {3, 1, 1, 1, 4, 1, 0},
-    {4, 1, 1, 1, 3, 1, 0}, {2, 1, 1, 4, 1, 2, 0}, {2, 1, 1, 2, 1, 4, 0},
-    {2, 1, 1, 2, 3, 2, 0}, {2, 3, 3, 1, 1, 1, 2}};
-
-CBC_OnedCode128Reader::CBC_OnedCode128Reader() {}
-CBC_OnedCode128Reader::~CBC_OnedCode128Reader() {}
-CFX_Int32Array* CBC_OnedCode128Reader::FindStartPattern(CBC_CommonBitArray* row,
-                                                        int32_t& e) {
-  int32_t width = row->GetSize();
-  int32_t rowOffset = 0;
-  while (rowOffset < width) {
-    if (row->Get(rowOffset)) {
-      break;
-    }
-    rowOffset++;
-  }
-  int32_t counterPosition = 0;
-  CFX_Int32Array counters;
-  counters.SetSize(6);
-  int32_t patternStart = rowOffset;
-  FX_BOOL isWhite = FALSE;
-  int32_t patternLength = counters.GetSize();
-  for (int32_t i = rowOffset; i < width; i++) {
-    FX_BOOL pixel = row->Get(i);
-    if (pixel ^ isWhite) {
-      counters[counterPosition]++;
-    } else {
-      if (counterPosition == patternLength - 1) {
-        int32_t bestVariance = MAX_AVG_VARIANCE;
-        int32_t bestMatch = -1;
-        for (int32_t startCode = CODE_START_A; startCode <= CODE_START_C;
-             startCode++) {
-          int32_t variance = PatternMatchVariance(
-              &counters, &CODE_PATTERNS[startCode][0], MAX_INDIVIDUAL_VARIANCE);
-          if (variance < bestVariance) {
-            bestVariance = variance;
-            bestMatch = startCode;
-          }
-        }
-        if (bestMatch >= 0) {
-          FX_BOOL btemp2 =
-              row->IsRange(std::max(0, patternStart - (i - patternStart) / 2),
-                           patternStart, FALSE, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          if (btemp2) {
-            CFX_Int32Array* result = new CFX_Int32Array;
-            result->SetSize(3);
-            (*result)[0] = patternStart;
-            (*result)[1] = i;
-            (*result)[2] = bestMatch;
-            return result;
-          }
-        }
-        patternStart += counters[0] + counters[1];
-        for (int32_t y = 2; y < patternLength; y++) {
-          counters[y - 2] = counters[y];
-        }
-        counters[patternLength - 2] = 0;
-        counters[patternLength - 1] = 0;
-        counterPosition--;
-      } else {
-        counterPosition++;
-      }
-      counters[counterPosition] = 1;
-      isWhite = !isWhite;
-    }
-  }
-  e = BCExceptionNotFound;
-  return nullptr;
-}
-int32_t CBC_OnedCode128Reader::DecodeCode(CBC_CommonBitArray* row,
-                                          CFX_Int32Array* counters,
-                                          int32_t rowOffset,
-                                          int32_t& e) {
-  RecordPattern(row, rowOffset, counters, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  int32_t bestVariance = MAX_AVG_VARIANCE;
-  int32_t bestMatch = -1;
-  for (int32_t d = 0; d < 107; d++) {
-    int32_t variance = PatternMatchVariance(counters, &CODE_PATTERNS[d][0],
-                                            MAX_INDIVIDUAL_VARIANCE);
-    if (variance < bestVariance) {
-      bestVariance = variance;
-      bestMatch = d;
-    }
-  }
-  if (bestMatch >= 0) {
-    return bestMatch;
-  }
-  e = BCExceptionNotFound;
-  return 0;
-}
-CFX_ByteString CBC_OnedCode128Reader::DecodeRow(int32_t rowNumber,
-                                                CBC_CommonBitArray* row,
-                                                int32_t hints,
-                                                int32_t& e) {
-  CFX_Int32Array* startPatternInfo = FindStartPattern(row, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  int32_t startCode = (*startPatternInfo)[2];
-  int32_t codeSet;
-  switch (startCode) {
-    case 103:
-      codeSet = CODE_CODE_A;
-      break;
-    case 104:
-      codeSet = CODE_CODE_B;
-      break;
-    case 105:
-      codeSet = CODE_CODE_C;
-      break;
-    default:
-      if (startPatternInfo) {
-        startPatternInfo->RemoveAll();
-        delete startPatternInfo;
-        startPatternInfo = nullptr;
-      }
-      e = BCExceptionFormatException;
-      return "";
-  }
-  FX_BOOL done = FALSE;
-  FX_BOOL isNextShifted = FALSE;
-  CFX_ByteString result;
-  int32_t lastStart = (*startPatternInfo)[0];
-  int32_t nextStart = (*startPatternInfo)[1];
-  if (startPatternInfo) {
-    startPatternInfo->RemoveAll();
-    delete startPatternInfo;
-    startPatternInfo = nullptr;
-  }
-  CFX_Int32Array counters;
-  counters.SetSize(6);
-  int32_t lastCode = 0;
-  int32_t code = 0;
-  int32_t checksumTotal = startCode;
-  int32_t multiplier = 0;
-  FX_BOOL lastCharacterWasPrintable = TRUE;
-  while (!done) {
-    FX_BOOL unshift = isNextShifted;
-    isNextShifted = FALSE;
-    lastCode = code;
-    code = DecodeCode(row, &counters, nextStart, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, "");
-    if (code != CODE_STOP) {
-      lastCharacterWasPrintable = TRUE;
-    }
-    if (code != CODE_STOP) {
-      multiplier++;
-      checksumTotal += multiplier * code;
-    }
-    lastStart = nextStart;
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      nextStart += counters[i];
-    }
-    switch (code) {
-      case 103:
-      case 104:
-      case 105:
-        e = BCExceptionFormatException;
-        return "";
-    }
-    switch (codeSet) {
-      case 101:
-        if (code < 64) {
-          result += (FX_CHAR)(' ' + code);
-        } else if (code < 96) {
-          result += (FX_CHAR)(code - 64);
-        } else {
-          if (code != CODE_STOP) {
-            lastCharacterWasPrintable = FALSE;
-          }
-          switch (code) {
-            case 102:
-            case 97:
-            case 96:
-            case 101:
-              break;
-            case 98:
-              isNextShifted = TRUE;
-              codeSet = CODE_CODE_B;
-              break;
-            case 100:
-              codeSet = CODE_CODE_B;
-              break;
-            case 99:
-              codeSet = CODE_CODE_C;
-              break;
-            case 106:
-              done = TRUE;
-              break;
-          }
-        }
-        break;
-      case 100:
-        if (code < 96) {
-          result += (FX_CHAR)(' ' + code);
-        } else {
-          if (code != CODE_STOP) {
-            lastCharacterWasPrintable = FALSE;
-          }
-          switch (code) {
-            case 102:
-            case 97:
-            case 96:
-            case 100:
-              break;
-            case 98:
-              isNextShifted = TRUE;
-              codeSet = CODE_CODE_A;
-              break;
-            case 101:
-              codeSet = CODE_CODE_A;
-              break;
-            case 99:
-              codeSet = CODE_CODE_C;
-              break;
-            case 106:
-              done = TRUE;
-              break;
-          }
-        }
-        break;
-      case 99:
-        if (code < 100) {
-          if (code < 10) {
-            result += '0';
-          }
-          FX_CHAR temp[128];
-          // TODO(dsinclair): Should this be snprintf?
-          sprintf(temp, "%d", code);
-          result += temp;
-        } else {
-          if (code != CODE_STOP) {
-            lastCharacterWasPrintable = FALSE;
-          }
-          switch (code) {
-            case 102:
-              break;
-            case 101:
-              codeSet = CODE_CODE_A;
-              break;
-            case 100:
-              codeSet = CODE_CODE_B;
-              break;
-            case 106:
-              done = TRUE;
-              break;
-          }
-        }
-        break;
-    }
-    if (unshift) {
-      codeSet = codeSet == CODE_CODE_A ? CODE_CODE_B : CODE_CODE_A;
-    }
-  }
-  int32_t width = row->GetSize();
-  while (nextStart < width && row->Get(nextStart)) {
-    nextStart++;
-  }
-  FX_BOOL boolT1 = row->IsRange(
-      nextStart, std::min(width, nextStart + (nextStart - lastStart) / 2),
-      FALSE, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  if (!boolT1) {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  checksumTotal -= multiplier * lastCode;
-  if (checksumTotal % 103 != lastCode) {
-    e = BCExceptionChecksumException;
-    return "";
-  }
-  int32_t resultLength = result.GetLength();
-  if (resultLength > 0 && lastCharacterWasPrintable) {
-    if (codeSet == CODE_CODE_C) {
-      result = result.Mid(0, result.GetLength() - 2);
-    } else {
-      result = result.Mid(0, result.GetLength() - 1);
-    }
-  }
-  if (result.GetLength() == 0) {
-    e = BCExceptionFormatException;
-    return "";
-  }
-  return result;
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Reader.h b/xfa/fxbarcode/oned/BC_OnedCode128Reader.h
deleted file mode 100644
index b63b054984..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCode128Reader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
-
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-
-class CBC_CommonBitArray;
-
-class CBC_OnedCode128Reader : public CBC_OneDReader {
- public:
-  CBC_OnedCode128Reader();
-  ~CBC_OnedCode128Reader() override;
-
-  // CBC_OneDReader
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           int32_t hints,
-                           int32_t& e) override;
-
-  static const int32_t CODE_PATTERNS[107][7];
-
- private:
-  static const int32_t MAX_AVG_VARIANCE = (int32_t)(256 * 0.25f);
-  static const int32_t MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f);
-
-  static const int32_t CODE_SHIFT = 98;
-  static const int32_t CODE_CODE_C = 99;
-  static const int32_t CODE_CODE_B = 100;
-  static const int32_t CODE_CODE_A = 101;
-  static const int32_t CODE_FNC_1 = 102;
-  static const int32_t CODE_FNC_2 = 97;
-  static const int32_t CODE_FNC_3 = 96;
-  static const int32_t CODE_FNC_4_A = 101;
-  static const int32_t CODE_FNC_4_B = 100;
-
-  static const int32_t CODE_START_A = 103;
-  static const int32_t CODE_START_B = 104;
-  static const int32_t CODE_START_C = 105;
-  static const int32_t CODE_STOP = 106;
-
-  CFX_Int32Array* FindStartPattern(CBC_CommonBitArray* row, int32_t& e);
-  int32_t DecodeCode(CBC_CommonBitArray* row,
-                     CFX_Int32Array* counters,
-                     int32_t rowOffset,
-                     int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp
index d5754230b5..109742e85f 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -20,13 +20,56 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode128Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCode128Writer.h"
 
+namespace {
+
+const int32_t CODE_PATTERNS[107][7] = {
+    {2, 1, 2, 2, 2, 2, 0}, {2, 2, 2, 1, 2, 2, 0}, {2, 2, 2, 2, 2, 1, 0},
+    {1, 2, 1, 2, 2, 3, 0}, {1, 2, 1, 3, 2, 2, 0}, {1, 3, 1, 2, 2, 2, 0},
+    {1, 2, 2, 2, 1, 3, 0}, {1, 2, 2, 3, 1, 2, 0}, {1, 3, 2, 2, 1, 2, 0},
+    {2, 2, 1, 2, 1, 3, 0}, {2, 2, 1, 3, 1, 2, 0}, {2, 3, 1, 2, 1, 2, 0},
+    {1, 1, 2, 2, 3, 2, 0}, {1, 2, 2, 1, 3, 2, 0}, {1, 2, 2, 2, 3, 1, 0},
+    {1, 1, 3, 2, 2, 2, 0}, {1, 2, 3, 1, 2, 2, 0}, {1, 2, 3, 2, 2, 1, 0},
+    {2, 2, 3, 2, 1, 1, 0}, {2, 2, 1, 1, 3, 2, 0}, {2, 2, 1, 2, 3, 1, 0},
+    {2, 1, 3, 2, 1, 2, 0}, {2, 2, 3, 1, 1, 2, 0}, {3, 1, 2, 1, 3, 1, 0},
+    {3, 1, 1, 2, 2, 2, 0}, {3, 2, 1, 1, 2, 2, 0}, {3, 2, 1, 2, 2, 1, 0},
+    {3, 1, 2, 2, 1, 2, 0}, {3, 2, 2, 1, 1, 2, 0}, {3, 2, 2, 2, 1, 1, 0},
+    {2, 1, 2, 1, 2, 3, 0}, {2, 1, 2, 3, 2, 1, 0}, {2, 3, 2, 1, 2, 1, 0},
+    {1, 1, 1, 3, 2, 3, 0}, {1, 3, 1, 1, 2, 3, 0}, {1, 3, 1, 3, 2, 1, 0},
+    {1, 1, 2, 3, 1, 3, 0}, {1, 3, 2, 1, 1, 3, 0}, {1, 3, 2, 3, 1, 1, 0},
+    {2, 1, 1, 3, 1, 3, 0}, {2, 3, 1, 1, 1, 3, 0}, {2, 3, 1, 3, 1, 1, 0},
+    {1, 1, 2, 1, 3, 3, 0}, {1, 1, 2, 3, 3, 1, 0}, {1, 3, 2, 1, 3, 1, 0},
+    {1, 1, 3, 1, 2, 3, 0}, {1, 1, 3, 3, 2, 1, 0}, {1, 3, 3, 1, 2, 1, 0},
+    {3, 1, 3, 1, 2, 1, 0}, {2, 1, 1, 3, 3, 1, 0}, {2, 3, 1, 1, 3, 1, 0},
+    {2, 1, 3, 1, 1, 3, 0}, {2, 1, 3, 3, 1, 1, 0}, {2, 1, 3, 1, 3, 1, 0},
+    {3, 1, 1, 1, 2, 3, 0}, {3, 1, 1, 3, 2, 1, 0}, {3, 3, 1, 1, 2, 1, 0},
+    {3, 1, 2, 1, 1, 3, 0}, {3, 1, 2, 3, 1, 1, 0}, {3, 3, 2, 1, 1, 1, 0},
+    {3, 1, 4, 1, 1, 1, 0}, {2, 2, 1, 4, 1, 1, 0}, {4, 3, 1, 1, 1, 1, 0},
+    {1, 1, 1, 2, 2, 4, 0}, {1, 1, 1, 4, 2, 2, 0}, {1, 2, 1, 1, 2, 4, 0},
+    {1, 2, 1, 4, 2, 1, 0}, {1, 4, 1, 1, 2, 2, 0}, {1, 4, 1, 2, 2, 1, 0},
+    {1, 1, 2, 2, 1, 4, 0}, {1, 1, 2, 4, 1, 2, 0}, {1, 2, 2, 1, 1, 4, 0},
+    {1, 2, 2, 4, 1, 1, 0}, {1, 4, 2, 1, 1, 2, 0}, {1, 4, 2, 2, 1, 1, 0},
+    {2, 4, 1, 2, 1, 1, 0}, {2, 2, 1, 1, 1, 4, 0}, {4, 1, 3, 1, 1, 1, 0},
+    {2, 4, 1, 1, 1, 2, 0}, {1, 3, 4, 1, 1, 1, 0}, {1, 1, 1, 2, 4, 2, 0},
+    {1, 2, 1, 1, 4, 2, 0}, {1, 2, 1, 2, 4, 1, 0}, {1, 1, 4, 2, 1, 2, 0},
+    {1, 2, 4, 1, 1, 2, 0}, {1, 2, 4, 2, 1, 1, 0}, {4, 1, 1, 2, 1, 2, 0},
+    {4, 2, 1, 1, 1, 2, 0}, {4, 2, 1, 2, 1, 1, 0}, {2, 1, 2, 1, 4, 1, 0},
+    {2, 1, 4, 1, 2, 1, 0}, {4, 1, 2, 1, 2, 1, 0}, {1, 1, 1, 1, 4, 3, 0},
+    {1, 1, 1, 3, 4, 1, 0}, {1, 3, 1, 1, 4, 1, 0}, {1, 1, 4, 1, 1, 3, 0},
+    {1, 1, 4, 3, 1, 1, 0}, {4, 1, 1, 1, 1, 3, 0}, {4, 1, 1, 3, 1, 1, 0},
+    {1, 1, 3, 1, 4, 1, 0}, {1, 1, 4, 1, 3, 1, 0}, {3, 1, 1, 1, 4, 1, 0},
+    {4, 1, 1, 1, 3, 1, 0}, {2, 1, 1, 4, 1, 2, 0}, {2, 1, 1, 2, 1, 4, 0},
+    {2, 1, 1, 2, 3, 2, 0}, {2, 3, 3, 1, 1, 1, 2}};
+
+const int32_t CODE_START_B = 104;
+const int32_t CODE_START_C = 105;
+const int32_t CODE_STOP = 106;
+
+}  // namespace
+
 CBC_OnedCode128Writer::CBC_OnedCode128Writer() {
   m_codeFormat = BC_CODE128_B;
 }
@@ -153,8 +196,8 @@ uint8_t* CBC_OnedCode128Writer::Encode(const CFX_ByteString& contents,
     return nullptr;
   }
   checkSum %= 103;
-  patterns.Add(CBC_OnedCode128Reader::CODE_PATTERNS[checkSum]);
-  patterns.Add(CBC_OnedCode128Reader::CODE_PATTERNS[CODE_STOP]);
+  patterns.Add(CODE_PATTERNS[checkSum]);
+  patterns.Add(CODE_PATTERNS[CODE_STOP]);
   m_iContentLen = contents.GetLength() + 3;
   int32_t codeWidth = 0;
   for (int32_t k = 0; k < patterns.GetSize(); k++) {
@@ -183,13 +226,13 @@ int32_t CBC_OnedCode128Writer::Encode128B(
   int32_t checkSum = 0;
   int32_t checkWeight = 1;
   int32_t position = 0;
-  patterns->Add(CBC_OnedCode128Reader::CODE_PATTERNS[CODE_START_B]);
+  patterns->Add(CODE_PATTERNS[CODE_START_B]);
   checkSum += CODE_START_B * checkWeight;
   while (position < contents.GetLength()) {
     int32_t patternIndex = 0;
     patternIndex = contents[position] - ' ';
     position += 1;
-    patterns->Add(CBC_OnedCode128Reader::CODE_PATTERNS[patternIndex]);
+    patterns->Add(CODE_PATTERNS[patternIndex]);
     checkSum += patternIndex * checkWeight;
     if (position != 0) {
       checkWeight++;
@@ -204,7 +247,7 @@ int32_t CBC_OnedCode128Writer::Encode128C(
   int32_t checkSum = 0;
   int32_t checkWeight = 1;
   int32_t position = 0;
-  patterns->Add(CBC_OnedCode128Reader::CODE_PATTERNS[CODE_START_C]);
+  patterns->Add(CODE_PATTERNS[CODE_START_C]);
   checkSum += CODE_START_C * checkWeight;
   while (position < contents.GetLength()) {
     int32_t patternIndex = 0;
@@ -221,7 +264,7 @@ int32_t CBC_OnedCode128Writer::Encode128C(
         position += 2;
       }
     }
-    patterns->Add(CBC_OnedCode128Reader::CODE_PATTERNS[patternIndex]);
+    patterns->Add(CODE_PATTERNS[patternIndex]);
     checkSum += patternIndex * checkWeight;
     if (position != 0) {
       checkWeight++;
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
index 7338b56952..9d2285f0c6 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -41,12 +41,6 @@ class CBC_OnedCode128Writer : public CBC_OneDimWriter {
   BC_TYPE GetType();
 
  private:
-  static const int32_t CODE_CODE_B = 100;
-  static const int32_t CODE_CODE_C = 99;
-  static const int32_t CODE_START_B = 104;
-  static const int32_t CODE_START_C = 105;
-  static const int32_t CODE_STOP = 106;
-
   FX_BOOL IsDigits(const CFX_ByteString& contents,
                    int32_t start,
                    int32_t length);
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/fxbarcode/oned/BC_OnedCode39Reader.cpp
deleted file mode 100644
index 331af7e887..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCode39Reader.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <algorithm>
-
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode39Reader.h"
-#include "xfa/fxbarcode/utils.h"
-
-const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
-const FX_CHAR* CBC_OnedCode39Reader::CHECKSUM_STRING =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%";
-const int32_t CBC_OnedCode39Reader::CHARACTER_ENCODINGS[44] = {
-    0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124,
-    0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C,
-    0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007,
-    0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0,
-    0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A};
-
-CBC_OnedCode39Reader::CBC_OnedCode39Reader()
-    : m_usingCheckDigit(FALSE), m_extendedMode(FALSE) {}
-CBC_OnedCode39Reader::CBC_OnedCode39Reader(FX_BOOL usingCheckDigit)
-    : m_usingCheckDigit(usingCheckDigit), m_extendedMode(FALSE) {}
-CBC_OnedCode39Reader::CBC_OnedCode39Reader(FX_BOOL usingCheckDigit,
-                                           FX_BOOL extendedMode)
-    : m_usingCheckDigit(usingCheckDigit), m_extendedMode(extendedMode) {}
-CBC_OnedCode39Reader::~CBC_OnedCode39Reader() {}
-CFX_ByteString CBC_OnedCode39Reader::DecodeRow(int32_t rowNumber,
-                                               CBC_CommonBitArray* row,
-                                               int32_t hints,
-                                               int32_t& e) {
-  CFX_Int32Array* start = FindAsteriskPattern(row, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  int32_t nextStart = (*start)[1];
-  delete start;
-  int32_t end = row->GetSize();
-  while (nextStart < end && !row->Get(nextStart)) {
-    nextStart++;
-  }
-  CFX_ByteString result;
-  CFX_Int32Array counters;
-  counters.SetSize(9);
-  FX_CHAR decodedChar;
-  do {
-    RecordPattern(row, nextStart, &counters, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, "");
-    int32_t pattern = ToNarrowWidePattern(&counters);
-    if (pattern < 0) {
-      e = BCExceptionNotFound;
-      return "";
-    }
-    decodedChar = PatternToChar(pattern, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, "");
-    result += decodedChar;
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      nextStart += counters[i];
-    }
-    while (nextStart < end && !row->Get(nextStart)) {
-      nextStart++;
-    }
-  } while (decodedChar != '*');
-  result = result.Mid(0, result.GetLength() - 1);
-  int32_t lastPatternSize = 0;
-  for (int32_t j = 0; j < counters.GetSize(); j++) {
-    lastPatternSize += counters[j];
-  }
-  if (m_usingCheckDigit) {
-    int32_t max = result.GetLength() - 1;
-    int32_t total = 0;
-    int32_t len = (int32_t)strlen(ALPHABET_STRING);
-    for (int32_t k = 0; k < max; k++) {
-      for (int32_t j = 0; j < len; j++)
-        if (ALPHABET_STRING[j] == result[k]) {
-          total += j;
-        }
-    }
-    if (result[max] != (ALPHABET_STRING)[total % 43]) {
-      e = BCExceptionChecksumException;
-      return "";
-    }
-    result = result.Mid(0, result.GetLength() - 1);
-  }
-  if (result.GetLength() == 0) {
-    e = BCExceptionNotFound;
-    return "";
-  }
-  if (m_extendedMode) {
-    CFX_ByteString bytestr = DecodeExtended(result, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, "");
-    return bytestr;
-  } else {
-    return result;
-  }
-}
-CFX_Int32Array* CBC_OnedCode39Reader::FindAsteriskPattern(
-    CBC_CommonBitArray* row,
-    int32_t& e) {
-  int32_t width = row->GetSize();
-  int32_t rowOffset = 0;
-  while (rowOffset < width) {
-    if (row->Get(rowOffset)) {
-      break;
-    }
-    rowOffset++;
-  }
-  int32_t counterPosition = 0;
-  CFX_Int32Array counters;
-  counters.SetSize(9);
-  int32_t patternStart = rowOffset;
-  FX_BOOL isWhite = FALSE;
-  int32_t patternLength = counters.GetSize();
-  for (int32_t i = rowOffset; i < width; i++) {
-    FX_BOOL pixel = row->Get(i);
-    if (pixel ^ isWhite) {
-      counters[counterPosition]++;
-    } else {
-      if (counterPosition == patternLength - 1) {
-        if (ToNarrowWidePattern(&counters) == ASTERISK_ENCODING) {
-          FX_BOOL bT1 =
-              row->IsRange(std::max(0, patternStart - (i - patternStart) / 2),
-                           patternStart, FALSE, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-          if (bT1) {
-            CFX_Int32Array* result = new CFX_Int32Array;
-            result->SetSize(2);
-            (*result)[0] = patternStart;
-            (*result)[1] = i;
-            return result;
-          }
-        }
-        patternStart += counters[0] + counters[1];
-        for (int32_t y = 2; y < patternLength; y++) {
-          counters[y - 2] = counters[y];
-        }
-        counters[patternLength - 2] = 0;
-        counters[patternLength - 1] = 0;
-        counterPosition--;
-      } else {
-        counterPosition++;
-      }
-      counters[counterPosition] = 1;
-      isWhite = !isWhite;
-    }
-  }
-  e = BCExceptionNotFound;
-  return nullptr;
-}
-int32_t CBC_OnedCode39Reader::ToNarrowWidePattern(CFX_Int32Array* counters) {
-  int32_t numCounters = counters->GetSize();
-  int32_t maxNarrowCounter = 0;
-  int32_t wideCounters;
-  do {
-#undef max
-    int32_t minCounter = FXSYS_IntMax;
-    for (int32_t i = 0; i < numCounters; i++) {
-      int32_t counter = (*counters)[i];
-      if (counter < minCounter && counter > maxNarrowCounter) {
-        minCounter = counter;
-      }
-    }
-    maxNarrowCounter = minCounter;
-    wideCounters = 0;
-    int32_t totalWideCountersWidth = 0;
-    int32_t pattern = 0;
-    for (int32_t j = 0; j < numCounters; j++) {
-      int32_t counter = (*counters)[j];
-      if ((*counters)[j] > maxNarrowCounter) {
-        pattern |= 1 << (numCounters - 1 - j);
-        wideCounters++;
-        totalWideCountersWidth += counter;
-      }
-    }
-    if (wideCounters == 3) {
-      for (int32_t k = 0; k < numCounters && wideCounters > 0; k++) {
-        int32_t counter = (*counters)[k];
-        if ((*counters)[k] > maxNarrowCounter) {
-          wideCounters--;
-          if ((counter << 1) >= totalWideCountersWidth) {
-            return -1;
-          }
-        }
-      }
-      return pattern;
-    }
-  } while (wideCounters > 3);
-  return -1;
-}
-FX_CHAR CBC_OnedCode39Reader::PatternToChar(int32_t pattern, int32_t& e) {
-  for (int32_t i = 0; i < 44; i++) {
-    if (CHARACTER_ENCODINGS[i] == pattern) {
-      return (ALPHABET_STRING)[i];
-    }
-  }
-  e = BCExceptionNotFound;
-  return 0;
-}
-CFX_ByteString CBC_OnedCode39Reader::DecodeExtended(CFX_ByteString& encoded,
-                                                    int32_t& e) {
-  int32_t length = encoded.GetLength();
-  CFX_ByteString decoded;
-  FX_CHAR c, next;
-  for (int32_t i = 0; i < length; i++) {
-    c = encoded[i];
-    if (c == '+' || c == '$' || c == '%' || c == '/') {
-      next = encoded[i + 1];
-      FX_CHAR decodedChar = '\0';
-      switch (c) {
-        case '+':
-          if (next >= 'A' && next <= 'Z') {
-            decodedChar = (FX_CHAR)(next + 32);
-          } else {
-            e = BCExceptionFormatException;
-            return "";
-          }
-          break;
-        case '$':
-          if (next >= 'A' && next <= 'Z') {
-            decodedChar = (FX_CHAR)(next - 64);
-          } else {
-            e = BCExceptionFormatException;
-            return "";
-          }
-          break;
-        case '%':
-          if (next >= 'A' && next <= 'E') {
-            decodedChar = (FX_CHAR)(next - 38);
-          } else if (next >= 'F' && next <= 'J') {
-            decodedChar = (FX_CHAR)(next - 11);
-          } else if (next >= 'K' && next <= 'O' && next != 'M' && next != 'N') {
-            decodedChar = (FX_CHAR)(next + 16);
-          } else if (next >= 'P' && next <= 'S') {
-            decodedChar = (FX_CHAR)(next + 43);
-          } else if (next == 'U') {
-            decodedChar = (FX_CHAR)0;
-          } else if (next == 'V') {
-            decodedChar = (FX_CHAR)64;
-          } else if (next == 'W') {
-            decodedChar = (FX_CHAR)96;
-          } else if (next == 'T' || next == 'X' || next == 'Y' || next == 'Z') {
-            decodedChar = (FX_CHAR)127;
-          } else {
-            e = BCExceptionFormatException;
-            return "";
-          }
-          break;
-        case '/':
-          if (next >= 'A' && next <= 'O') {
-            decodedChar = (FX_CHAR)(next - 32);
-          } else if (next == 'Z') {
-            decodedChar = ':';
-          } else {
-            e = BCExceptionFormatException;
-            return "";
-          }
-          break;
-      }
-      decoded += decodedChar;
-      i++;
-    } else {
-      decoded += c;
-    }
-  }
-  return decoded;
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/fxbarcode/oned/BC_OnedCode39Reader.h
deleted file mode 100644
index 0e1a728a47..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedCode39Reader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
-
-#include "core/fxcrt/include/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-
-class CBC_CommonBitArray;
-
-class CBC_OnedCode39Reader : public CBC_OneDReader {
- public:
-  static const FX_CHAR* ALPHABET_STRING;
-  static const FX_CHAR* CHECKSUM_STRING;
-  static const int32_t CHARACTER_ENCODINGS[44];
-  static const int32_t ASTERISK_ENCODING = 0x094;
-
-  CBC_OnedCode39Reader();
-  explicit CBC_OnedCode39Reader(FX_BOOL usingCheckDigit);
-  CBC_OnedCode39Reader(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);
-  ~CBC_OnedCode39Reader() override;
-
-  // CBC_OneDReader
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           int32_t hints,
-                           int32_t& e) override;
-
- private:
-  CFX_Int32Array* FindAsteriskPattern(CBC_CommonBitArray* row, int32_t& e);
-  int32_t ToNarrowWidePattern(CFX_Int32Array* counters);
-  FX_CHAR PatternToChar(int32_t pattern, int32_t& e);
-  CFX_ByteString DecodeExtended(CFX_ByteString& encoded, int32_t& e);
-
-  FX_BOOL m_usingCheckDigit;
-  FX_BOOL m_extendedMode;
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp
index 58d9472e25..3edf87ba30 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -20,28 +20,33 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode39Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedCode39Writer.h"
 
+namespace {
+
+const FX_CHAR ALPHABET_STRING[] =
+    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
+
+const FX_CHAR CHECKSUM_STRING[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%";
+
+const int32_t CHARACTER_ENCODINGS[44] = {
+    0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124,
+    0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C,
+    0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007,
+    0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0,
+    0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A};
+
+}  // namespace
+
 CBC_OnedCode39Writer::CBC_OnedCode39Writer() {
-  m_extendedMode = FALSE;
-  m_iWideNarrRatio = 3;
-}
-CBC_OnedCode39Writer::CBC_OnedCode39Writer(FX_BOOL extendedMode) {
   m_iWideNarrRatio = 3;
-  m_extendedMode = extendedMode;
 }
 CBC_OnedCode39Writer::~CBC_OnedCode39Writer() {}
 FX_BOOL CBC_OnedCode39Writer::CheckContentValidity(
     const CFX_WideStringC& contents) {
-  if (m_extendedMode) {
-    return CheckExtendedContentValidity(contents);
-  }
   for (int32_t i = 0; i < contents.GetLength(); i++) {
     FX_WCHAR ch = contents.GetAt(i);
     if ((ch >= (FX_WCHAR)'0' && ch <= (FX_WCHAR)'9') ||
@@ -55,21 +60,9 @@ FX_BOOL CBC_OnedCode39Writer::CheckContentValidity(
   }
   return TRUE;
 }
-FX_BOOL CBC_OnedCode39Writer::CheckExtendedContentValidity(
-    const CFX_WideStringC& contents) {
-  for (int32_t i = 0; i < contents.GetLength(); i++) {
-    FX_WCHAR ch = contents.GetAt(i);
-    if (ch > 127) {
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
+
 CFX_WideString CBC_OnedCode39Writer::FilterContents(
     const CFX_WideStringC& contents) {
-  if (m_extendedMode) {
-    return FilterExtendedContents(contents);
-  }
   CFX_WideString filtercontents;
   for (int32_t i = 0; i < contents.GetLength(); i++) {
     FX_WCHAR ch = contents.GetAt(i);
@@ -92,68 +85,9 @@ CFX_WideString CBC_OnedCode39Writer::FilterContents(
   }
   return filtercontents;
 }
-CFX_WideString CBC_OnedCode39Writer::FilterExtendedContents(
-    const CFX_WideStringC& contents) {
-  CFX_WideString filtercontents;
-  for (int32_t i = 0; i < contents.GetLength(); i++) {
-    FX_WCHAR ch = contents.GetAt(i);
-    if (ch == (FX_WCHAR)'*' && (i == 0 || i == contents.GetLength() - 1)) {
-      continue;
-    }
-    if (ch > 175) {
-      i++;
-      continue;
-    }
-    if (ch > 127 && ch < 176) {
-      continue;
-    }
-    if (ch == 0) {
-      filtercontents += '%';
-      filtercontents += 'U';
-    } else if (ch >= 1 && ch <= 26) {
-      filtercontents += '$';
-      filtercontents += (ch + 64);
-    } else if (ch >= 27 && ch <= 31) {
-      filtercontents += '%';
-      filtercontents += (ch + 38);
-    } else if (ch >= 33 && ch <= 47 && ch != 45 && ch != 46) {
-      filtercontents += '/';
-      filtercontents += (ch + 32);
-    } else if (ch == 58) {
-      filtercontents += '/';
-      filtercontents += 'Z';
-    } else if (ch >= 59 && ch <= 63) {
-      filtercontents += '%';
-      filtercontents += ch + 11;
-    } else if (ch == 64) {
-      filtercontents += '%';
-      filtercontents += 'V';
-    } else if (ch >= 91 && ch <= 95) {
-      filtercontents += '%';
-      filtercontents += ch - 16;
-    } else if (ch == 96) {
-      filtercontents += '%';
-      filtercontents += 'W';
-    } else if (ch >= 97 && ch <= 122) {
-      filtercontents += '+';
-      filtercontents += ch - 32;
-    } else if (ch >= 123 && ch <= 126) {
-      filtercontents += '%';
-      filtercontents += ch - 43;
-    } else if (ch == 127) {
-      filtercontents += '%';
-      filtercontents += 'T';
-    } else {
-      filtercontents += ch;
-    }
-  }
-  return filtercontents;
-}
+
 CFX_WideString CBC_OnedCode39Writer::RenderTextContents(
     const CFX_WideStringC& contents) {
-  if (m_extendedMode) {
-    return RenderExtendedTextContents(contents);
-  }
   CFX_WideString renderContents;
   for (int32_t i = 0; i < contents.GetLength(); i++) {
     FX_WCHAR ch = contents.GetAt(i);
@@ -175,25 +109,7 @@ CFX_WideString CBC_OnedCode39Writer::RenderTextContents(
   }
   return renderContents;
 }
-CFX_WideString CBC_OnedCode39Writer::RenderExtendedTextContents(
-    const CFX_WideStringC& contents) {
-  CFX_WideString renderContents;
-  for (int32_t i = 0; i < contents.GetLength(); i++) {
-    FX_WCHAR ch = contents.GetAt(i);
-    if (ch == (FX_WCHAR)'*' && (i == 0 || i == contents.GetLength() - 1)) {
-      continue;
-    }
-    if (ch > 175) {
-      i++;
-      continue;
-    }
-    if (ch > 127 && ch < 176) {
-      continue;
-    }
-    renderContents += ch;
-  }
-  return renderContents;
-}
+
 FX_BOOL CBC_OnedCode39Writer::SetTextLocation(BC_TEXT_LOC location) {
   if (location < BC_TEXT_LOC_NONE || location > BC_TEXT_LOC_BELOWEMBED) {
     return FALSE;
@@ -245,11 +161,11 @@ FX_CHAR CBC_OnedCode39Writer::CalcCheckSum(const CFX_ByteString& contents,
     return '*';
   }
   int32_t checksum = 0;
-  int32_t len = (int32_t)strlen(CBC_OnedCode39Reader::ALPHABET_STRING);
+  int32_t len = (int32_t)strlen(ALPHABET_STRING);
   for (int32_t i = 0; i < contents.GetLength(); i++) {
     int32_t j = 0;
     for (; j < len; j++) {
-      if (CBC_OnedCode39Reader::ALPHABET_STRING[j] == contents[i]) {
+      if (ALPHABET_STRING[j] == contents[i]) {
         if (contents[i] != '*') {
           checksum += j;
           break;
@@ -264,7 +180,7 @@ FX_CHAR CBC_OnedCode39Writer::CalcCheckSum(const CFX_ByteString& contents,
     }
   }
   checksum = checksum % 43;
-  return CBC_OnedCode39Reader::CHECKSUM_STRING[checksum];
+  return CHECKSUM_STRING[checksum];
 }
 uint8_t* CBC_OnedCode39Writer::Encode(const CFX_ByteString& contents,
                                       int32_t& outlength,
@@ -283,11 +199,11 @@ uint8_t* CBC_OnedCode39Writer::Encode(const CFX_ByteString& contents,
   m_iContentLen = encodedContents.GetLength();
   int32_t codeWidth = (wideStrideNum * m_iWideNarrRatio + narrStrideNum) * 2 +
                       1 + m_iContentLen;
-  int32_t len = (int32_t)strlen(CBC_OnedCode39Reader::ALPHABET_STRING);
+  int32_t len = (int32_t)strlen(ALPHABET_STRING);
   for (int32_t j = 0; j < m_iContentLen; j++) {
     for (int32_t i = 0; i < len; i++) {
-      if (CBC_OnedCode39Reader::ALPHABET_STRING[i] == encodedContents[j]) {
-        ToIntArray(CBC_OnedCode39Reader::CHARACTER_ENCODINGS[i], widths);
+      if (ALPHABET_STRING[i] == encodedContents[j]) {
+        ToIntArray(CHARACTER_ENCODINGS[i], widths);
         for (int32_t k = 0; k < 9; k++) {
           codeWidth += widths[k];
         }
@@ -296,7 +212,7 @@ uint8_t* CBC_OnedCode39Writer::Encode(const CFX_ByteString& contents,
   }
   outlength = codeWidth;
   uint8_t* result = FX_Alloc(uint8_t, codeWidth);
-  ToIntArray(CBC_OnedCode39Reader::CHARACTER_ENCODINGS[39], widths);
+  ToIntArray(CHARACTER_ENCODINGS[39], widths);
   int32_t pos = AppendPattern(result, 0, widths, 9, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
@@ -310,8 +226,8 @@ uint8_t* CBC_OnedCode39Writer::Encode(const CFX_ByteString& contents,
   }
   for (int32_t l = m_iContentLen - 1; l >= 0; l--) {
     for (int32_t i = 0; i < len; i++) {
-      if (CBC_OnedCode39Reader::ALPHABET_STRING[i] == encodedContents[l]) {
-        ToIntArray(CBC_OnedCode39Reader::CHARACTER_ENCODINGS[i], widths);
+      if (ALPHABET_STRING[i] == encodedContents[l]) {
+        ToIntArray(CHARACTER_ENCODINGS[i], widths);
         pos += AppendPattern(result, pos, widths, 9, 1, e);
         if (e != BCExceptionNO) {
           FX_Free(result);
@@ -325,7 +241,7 @@ uint8_t* CBC_OnedCode39Writer::Encode(const CFX_ByteString& contents,
       return nullptr;
     }
   }
-  ToIntArray(CBC_OnedCode39Reader::CHARACTER_ENCODINGS[39], widths);
+  ToIntArray(CHARACTER_ENCODINGS[39], widths);
   pos += AppendPattern(result, pos, widths, 9, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/fxbarcode/oned/BC_OnedCode39Writer.h
index 7dc314f968..3cd1594271 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -13,7 +13,6 @@
 class CBC_OnedCode39Writer : public CBC_OneDimWriter {
  public:
   CBC_OnedCode39Writer();
-  explicit CBC_OnedCode39Writer(FX_BOOL extendedMode);
   ~CBC_OnedCode39Writer() override;
 
   // CBC_OneDimWriter
@@ -42,11 +41,6 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
 
   virtual CFX_WideString encodedContents(const CFX_WideStringC& contents,
                                          int32_t& e);
-  virtual FX_BOOL CheckExtendedContentValidity(const CFX_WideStringC& contents);
-  virtual CFX_WideString FilterExtendedContents(
-      const CFX_WideStringC& contents);
-  virtual CFX_WideString RenderExtendedTextContents(
-      const CFX_WideStringC& contents);
   virtual FX_BOOL SetTextLocation(BC_TEXT_LOC loction);
   virtual FX_BOOL SetWideNarrowRatio(int32_t ratio);
 
@@ -55,7 +49,6 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
   FX_CHAR CalcCheckSum(const CFX_ByteString& contents, int32_t& e);
 
   int32_t m_iWideNarrRatio;
-  FX_BOOL m_extendedMode;
 };
 
 #endif  // XFA_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Reader.cpp
deleted file mode 100644
index 83fea7d5f2..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Reader.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[10] = {
-    0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A};
-
-CBC_OnedEAN13Reader::CBC_OnedEAN13Reader() {}
-CBC_OnedEAN13Reader::~CBC_OnedEAN13Reader() {}
-void CBC_OnedEAN13Reader::DetermineFirstDigit(CFX_ByteString& result,
-                                              int32_t lgPatternFound,
-                                              int32_t& e) {
-  for (int32_t d = 0; d < 10; d++) {
-    if (lgPatternFound == FIRST_DIGIT_ENCODINGS[d]) {
-      result.Insert(0, (FX_CHAR)('0' + d));
-      return;
-    }
-  }
-  e = BCExceptionNotFound;
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-}
-int32_t CBC_OnedEAN13Reader::DecodeMiddle(CBC_CommonBitArray* row,
-                                          CFX_Int32Array* startRange,
-                                          CFX_ByteString& resultString,
-                                          int32_t& e) {
-  CFX_Int32Array counters;
-  counters.Add(0);
-  counters.Add(0);
-  counters.Add(0);
-  counters.Add(0);
-  int32_t end = row->GetSize();
-  int32_t rowOffset = (*startRange)[1];
-  int32_t lgPatternFound = 0;
-  for (int32_t x = 0; x < 6 && rowOffset < end; x++) {
-    int32_t bestMatch =
-        DecodeDigit(row, &counters, rowOffset,
-                    &(CBC_OneDimReader::L_AND_G_PATTERNS[0][0]), 20, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    resultString += (FX_CHAR)('0' + bestMatch % 10);
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      rowOffset += counters[i];
-    }
-    if (bestMatch >= 10) {
-      lgPatternFound |= 1 << (5 - x);
-    }
-  }
-  DetermineFirstDigit(resultString, lgPatternFound, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  CFX_Int32Array result;
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[0]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[1]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[2]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[3]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[4]);
-  CFX_Int32Array* middleRange =
-      FindGuardPattern(row, rowOffset, TRUE, &result, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  rowOffset = (*middleRange)[1];
-  delete middleRange;
-  for (int32_t Y = 0; Y < 6 && rowOffset < end; Y++) {
-    int32_t bestMatch =
-        DecodeDigit(row, &counters, rowOffset,
-                    &(CBC_OneDimReader::L_PATTERNS[0][0]), 10, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    resultString += (FX_CHAR)('0' + bestMatch);
-    for (int32_t k = 0; k < counters.GetSize(); k++) {
-      rowOffset += counters[k];
-    }
-  }
-  return rowOffset;
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h b/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h
deleted file mode 100644
index ac53fd4f24..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
-
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-
-class CBC_CommonBitArray;
-class CBC_OnedUPCAReader;
-
-class CBC_OnedEAN13Reader : public CBC_OneDimReader {
- public:
-  CBC_OnedEAN13Reader();
-  ~CBC_OnedEAN13Reader() override;
-
-  static const int32_t FIRST_DIGIT_ENCODINGS[10];
-
- protected:
-  friend class CBC_OnedUPCAReader;
-
-  int32_t DecodeMiddle(CBC_CommonBitArray* row,
-                       CFX_Int32Array* startRange,
-                       CFX_ByteString& resultString,
-                       int32_t& e) override;
-
- private:
-  void DetermineFirstDigit(CFX_ByteString& result,
-                           int32_t lgPatternFound,
-                           int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index e347cb2385..a7393a48f6 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -20,14 +20,27 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Reader.h"
 #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
 
+namespace {
+
+const int32_t FIRST_DIGIT_ENCODINGS[10] = {0x00, 0x0B, 0x0D, 0xE,  0x13,
+                                           0x19, 0x1C, 0x15, 0x16, 0x1A};
+const int32_t START_END_PATTERN[3] = {1, 1, 1};
+const int32_t MIDDLE_PATTERN[5] = {1, 1, 1, 1, 1};
+const int32_t L_PATTERNS[10][4] = {
+    {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
+    {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2}};
+const int32_t L_AND_G_PATTERNS[20][4] = {
+    {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
+    {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2},
+    {1, 1, 2, 3}, {1, 2, 2, 2}, {2, 2, 1, 2}, {1, 1, 4, 1}, {2, 3, 1, 1},
+    {1, 3, 2, 1}, {4, 1, 1, 1}, {2, 1, 3, 1}, {3, 1, 2, 1}, {2, 1, 1, 3}};
+
+}  // namespace
+
 CBC_OnedEAN13Writer::CBC_OnedEAN13Writer() {
   m_bLeftPadding = TRUE;
   m_codeWidth = 3 + (7 * 6) + 5 + (7 * 6) + 3;
@@ -108,12 +121,11 @@ uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,
   }
   m_iDataLenth = 13;
   int32_t firstDigit = FXSYS_atoi(contents.Mid(0, 1).c_str());
-  int32_t parities = CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[firstDigit];
+  int32_t parities = FIRST_DIGIT_ENCODINGS[firstDigit];
   outLength = m_codeWidth;
   uint8_t* result = FX_Alloc(uint8_t, m_codeWidth);
   int32_t pos = 0;
-  pos +=
-      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);
+  pos += AppendPattern(result, pos, START_END_PATTERN, 3, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
@@ -124,29 +136,26 @@ uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,
     if ((parities >> (6 - i) & 1) == 1) {
       digit += 10;
     }
-    pos += AppendPattern(result, pos, CBC_OneDimReader::L_AND_G_PATTERNS[digit],
-                         4, 0, e);
+    pos += AppendPattern(result, pos, L_AND_G_PATTERNS[digit], 4, 0, e);
     if (e != BCExceptionNO) {
       FX_Free(result);
       return nullptr;
     }
   }
-  pos += AppendPattern(result, pos, CBC_OneDimReader::MIDDLE_PATTERN, 5, 0, e);
+  pos += AppendPattern(result, pos, MIDDLE_PATTERN, 5, 0, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
   }
   for (i = 7; i <= 12; i++) {
     int32_t digit = FXSYS_atoi(contents.Mid(i, 1).c_str());
-    pos += AppendPattern(result, pos, CBC_OneDimReader::L_PATTERNS[digit], 4, 1,
-                         e);
+    pos += AppendPattern(result, pos, L_PATTERNS[digit], 4, 1, e);
     if (e != BCExceptionNO) {
       FX_Free(result);
       return nullptr;
     }
   }
-  pos +=
-      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);
+  pos += AppendPattern(result, pos, START_END_PATTERN, 3, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Reader.cpp
deleted file mode 100644
index f3b21fde99..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Reader.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN8Reader.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_OnedEAN8Reader::CBC_OnedEAN8Reader() {}
-CBC_OnedEAN8Reader::~CBC_OnedEAN8Reader() {}
-int32_t CBC_OnedEAN8Reader::DecodeMiddle(CBC_CommonBitArray* row,
-                                         CFX_Int32Array* startRange,
-                                         CFX_ByteString& resultResult,
-                                         int32_t& e) {
-  CFX_Int32Array counters;
-  counters.Add(0);
-  counters.Add(0);
-  counters.Add(0);
-  counters.Add(0);
-  int32_t end = row->GetSize();
-  int32_t rowOffset = (*startRange)[1];
-  int32_t rowOffsetLeft = rowOffset;
-  for (int32_t x = 0; x < 4 && rowOffset < end; x++) {
-    int32_t bestMatch =
-        DecodeDigit(row, &counters, rowOffset,
-                    &(CBC_OneDimReader::L_PATTERNS[0][0]), 10, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    resultResult += (FX_CHAR)('0' + bestMatch);
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      rowOffset += counters[i];
-    }
-  }
-  int32_t RowOffsetLen = (rowOffset - rowOffsetLeft) / 4;
-  CFX_Int32Array result;
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[0]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[1]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[2]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[3]);
-  result.Add(CBC_OneDimReader::MIDDLE_PATTERN[4]);
-  CFX_Int32Array* middleRange =
-      FindGuardPattern(row, rowOffset, TRUE, &result, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  int32_t rowOffsetMid = rowOffset;
-  rowOffset = (*middleRange)[1];
-  if ((rowOffset - rowOffsetMid) > RowOffsetLen) {
-    e = BCExceptionNotFound;
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  }
-  delete middleRange;
-  for (int32_t y = 0; y < 4 && rowOffset < end; y++) {
-    int32_t bestMatch =
-        DecodeDigit(row, &counters, rowOffset,
-                    &(CBC_OneDimReader::L_PATTERNS[0][0]), 10, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    resultResult += (FX_CHAR)('0' + bestMatch);
-    for (int32_t i = 0; i < counters.GetSize(); i++) {
-      rowOffset += counters[i];
-    }
-  }
-  return rowOffset;
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Reader.h b/xfa/fxbarcode/oned/BC_OnedEAN8Reader.h
deleted file mode 100644
index 756565dd8f..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Reader.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
-
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-
-class CBC_CommonBitArray;
-
-class CBC_OnedEAN8Reader : public CBC_OneDimReader {
- public:
-  CBC_OnedEAN8Reader();
-  ~CBC_OnedEAN8Reader() override;
-
- protected:
-  int32_t DecodeMiddle(CBC_CommonBitArray*,
-                       CFX_Int32Array* startRange,
-                       CFX_ByteString& result,
-                       int32_t& e) override;
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 063847b260..bea145b8d1 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -20,14 +20,21 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_Writer.h"
 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
 #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
 #include "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h"
 
+namespace {
+
+const int32_t START_END_PATTERN[3] = {1, 1, 1};
+const int32_t MIDDLE_PATTERN[5] = {1, 1, 1, 1, 1};
+const int32_t L_PATTERNS[10][4] = {
+    {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
+    {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2}};
+
+}  // namespace
+
 CBC_OnedEAN8Writer::CBC_OnedEAN8Writer() {
   m_iDataLenth = 8;
   m_codeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3;
@@ -120,8 +127,7 @@ uint8_t* CBC_OnedEAN8Writer::Encode(const CFX_ByteString& contents,
   outLength = m_codeWidth;
   uint8_t* result = FX_Alloc(uint8_t, m_codeWidth);
   int32_t pos = 0;
-  pos +=
-      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);
+  pos += AppendPattern(result, pos, START_END_PATTERN, 3, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
@@ -129,29 +135,26 @@ uint8_t* CBC_OnedEAN8Writer::Encode(const CFX_ByteString& contents,
   int32_t i = 0;
   for (i = 0; i <= 3; i++) {
     int32_t digit = FXSYS_atoi(contents.Mid(i, 1).c_str());
-    pos += AppendPattern(result, pos, CBC_OneDimReader::L_PATTERNS[digit], 4, 0,
-                         e);
+    pos += AppendPattern(result, pos, L_PATTERNS[digit], 4, 0, e);
     if (e != BCExceptionNO) {
       FX_Free(result);
       return nullptr;
     }
   }
-  pos += AppendPattern(result, pos, CBC_OneDimReader::MIDDLE_PATTERN, 5, 0, e);
+  pos += AppendPattern(result, pos, MIDDLE_PATTERN, 5, 0, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
   }
   for (i = 4; i <= 7; i++) {
     int32_t digit = FXSYS_atoi(contents.Mid(i, 1).c_str());
-    pos += AppendPattern(result, pos, CBC_OneDimReader::L_PATTERNS[digit], 4, 1,
-                         e);
+    pos += AppendPattern(result, pos, L_PATTERNS[digit], 4, 1, e);
     if (e != BCExceptionNO) {
       FX_Free(result);
       return nullptr;
     }
   }
-  pos +=
-      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);
+  pos += AppendPattern(result, pos, START_END_PATTERN, 3, 1, e);
   if (e != BCExceptionNO) {
     FX_Free(result);
     return nullptr;
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp
deleted file mode 100644
index b8b7c9426a..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Reader.h"
-#include "xfa/fxbarcode/oned/BC_OnedUPCAReader.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_OnedUPCAReader::CBC_OnedUPCAReader() {
-  m_ean13Reader = nullptr;
-}
-void CBC_OnedUPCAReader::Init() {
-  m_ean13Reader = new CBC_OnedEAN13Reader;
-}
-CBC_OnedUPCAReader::~CBC_OnedUPCAReader() {
-  delete m_ean13Reader;
-}
-CFX_ByteString CBC_OnedUPCAReader::DecodeRow(int32_t rowNumber,
-                                             CBC_CommonBitArray* row,
-                                             int32_t hints,
-                                             int32_t& e) {
-  CFX_ByteString bytestring =
-      m_ean13Reader->DecodeRow(rowNumber, row, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CFX_ByteString temp = MaybeReturnResult(bytestring, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return temp;
-}
-CFX_ByteString CBC_OnedUPCAReader::DecodeRow(int32_t rowNumber,
-                                             CBC_CommonBitArray* row,
-                                             CFX_Int32Array* startGuardRange,
-                                             int32_t hints,
-                                             int32_t& e) {
-  CFX_ByteString bytestring =
-      m_ean13Reader->DecodeRow(rowNumber, row, startGuardRange, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CFX_ByteString temp = MaybeReturnResult(bytestring, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return temp;
-}
-CFX_ByteString CBC_OnedUPCAReader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
-  CFX_ByteString bytestring = m_ean13Reader->Decode(image, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CFX_ByteString temp = MaybeReturnResult(bytestring, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return temp;
-}
-CFX_ByteString CBC_OnedUPCAReader::Decode(CBC_BinaryBitmap* image,
-                                          int32_t hints,
-                                          int32_t& e) {
-  CFX_ByteString bytestring = m_ean13Reader->Decode(image, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CFX_ByteString temp = MaybeReturnResult(bytestring, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return temp;
-}
-int32_t CBC_OnedUPCAReader::DecodeMiddle(CBC_CommonBitArray* row,
-                                         CFX_Int32Array* startRange,
-                                         CFX_ByteString& resultString,
-                                         int32_t& e) {
-  int32_t temp = m_ean13Reader->DecodeMiddle(row, startRange, resultString, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  return temp;
-}
-CFX_ByteString CBC_OnedUPCAReader::MaybeReturnResult(CFX_ByteString& result,
-                                                     int32_t& e) {
-  if (result[0] == '0') {
-    result.Delete(0);
-    return result;
-  }
-  e = BCExceptionFormatException;
-  return "";
-}
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAReader.h b/xfa/fxbarcode/oned/BC_OnedUPCAReader.h
deleted file mode 100644
index 28e03fc21f..0000000000
--- a/xfa/fxbarcode/oned/BC_OnedUPCAReader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
-
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
-
-class CBC_BinaryBitmap;
-class CBC_CommonBitArray;
-class CBC_OnedEAN13Reader;
-
-class CBC_OnedUPCAReader : public CBC_OneDimReader {
- public:
-  CBC_OnedUPCAReader();
-  ~CBC_OnedUPCAReader() override;
-
-  virtual void Init();
-
-  // CBC_OneDimReader
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           int32_t hints,
-                           int32_t& e) override;
-  CFX_ByteString DecodeRow(int32_t rowNumber,
-                           CBC_CommonBitArray* row,
-                           CFX_Int32Array* startGuardRange,
-                           int32_t hints,
-                           int32_t& e) override;
-
-  // CBC_OneDReader
-  CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override;
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        int32_t hints,
-                        int32_t& e) override;
-
- protected:
-  int32_t DecodeMiddle(CBC_CommonBitArray* row,
-                       CFX_Int32Array* startRange,
-                       CFX_ByteString& resultString,
-                       int32_t& e) override;
-  CFX_ByteString MaybeReturnResult(CFX_ByteString& result, int32_t& e);
-
- private:
-  CBC_OnedEAN13Reader* m_ean13Reader;
-};
-
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
deleted file mode 100644
index ac59c6ef94..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
-
-CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount,
-                                         int32_t rowCountUpperPart,
-                                         int32_t rowCountLowerPart,
-                                         int32_t errorCorrectionLevel) {
-  m_columnCount = columnCount;
-  m_rowCountUpperPart = rowCountUpperPart;
-  m_rowCountLowerPart = rowCountLowerPart;
-  m_errorCorrectionLevel = errorCorrectionLevel;
-  m_rowCount = m_rowCountUpperPart + m_rowCountLowerPart;
-}
-CBC_BarcodeMetadata::~CBC_BarcodeMetadata() {}
-int32_t CBC_BarcodeMetadata::getColumnCount() {
-  return m_columnCount;
-}
-int32_t CBC_BarcodeMetadata::getErrorCorrectionLevel() {
-  return m_errorCorrectionLevel;
-}
-int32_t CBC_BarcodeMetadata::getRowCount() {
-  return m_rowCount;
-}
-int32_t CBC_BarcodeMetadata::getRowCountUpperPart() {
-  return m_rowCountUpperPart;
-}
-int32_t CBC_BarcodeMetadata::getRowCountLowerPart() {
-  return m_rowCountLowerPart;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
deleted file mode 100644
index 07072e5217..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
-
-#include <stdint.h>
-
-class CBC_BarcodeMetadata {
- public:
-  CBC_BarcodeMetadata(int32_t columnCount,
-                      int32_t rowCountUpperPart,
-                      int32_t rowCountLowerPart,
-                      int32_t errorCorrectionLevel);
-  virtual ~CBC_BarcodeMetadata();
-
-  int32_t getColumnCount();
-  int32_t getErrorCorrectionLevel();
-  int32_t getRowCount();
-  int32_t getRowCountUpperPart();
-  int32_t getRowCountLowerPart();
-
- private:
-  int32_t m_columnCount;
-  int32_t m_errorCorrectionLevel;
-  int32_t m_rowCountUpperPart;
-  int32_t m_rowCountLowerPart;
-  int32_t m_rowCount;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
deleted file mode 100644
index eb89546b5c..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-
-CBC_BarcodeValue::CBC_BarcodeValue() {}
-CBC_BarcodeValue::~CBC_BarcodeValue() {}
-void CBC_BarcodeValue::setValue(int32_t value) {
-  int32_t confidence = 0;
-  for (int32_t i = 0; i < m_keys.GetSize(); i++) {
-    if (m_keys.GetAt(i) == value) {
-      confidence = m_values.GetAt(i);
-      m_values.SetAt(i, confidence + 1);
-      return;
-    }
-  }
-  confidence = 1;
-  m_keys.Add(value);
-  m_values.Add(confidence);
-}
-CFX_Int32Array* CBC_BarcodeValue::getValue() {
-  int32_t maxConfidence = -1;
-  CFX_Int32Array* result = new CFX_Int32Array;
-  for (int32_t i = 0; i < m_keys.GetSize(); i++) {
-    if (m_values.GetAt(i) > maxConfidence) {
-      maxConfidence = m_values.GetAt(i);
-      result->RemoveAll();
-      result->Add(m_keys.GetAt(i));
-    } else if (m_values.GetAt(i) == maxConfidence) {
-      result->Add(m_keys.GetAt(i));
-    }
-  }
-  return result;
-}
-int32_t CBC_BarcodeValue::getConfidence(int32_t value) {
-  for (int32_t i = 0; i < m_keys.GetSize(); i++)
-    if (m_keys.GetAt(i) == value) {
-      return m_values.GetAt(i);
-    }
-  return -1;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
deleted file mode 100644
index 0be71a1fb2..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_BarcodeValue final {
- public:
-  CBC_BarcodeValue();
-  ~CBC_BarcodeValue();
-
-  void setValue(int32_t value);
-  CFX_Int32Array* getValue();
-  int32_t getConfidence(int32_t value);
-
- private:
-  CFX_Int32Array m_keys;
-  CFX_Int32Array m_values;
-};
-
-using CBC_BarcodeValueArray = CFX_ArrayTemplate<CBC_BarcodeValue*>;
-using CBC_BarcodeValueArrayArray = CFX_ArrayTemplate<CBC_BarcodeValueArray*>;
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
deleted file mode 100644
index 928ddc5782..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image,
-                                 CBC_ResultPoint* topLeft,
-                                 CBC_ResultPoint* bottomLeft,
-                                 CBC_ResultPoint* topRight,
-                                 CBC_ResultPoint* bottomRight,
-                                 int32_t& e) {
-  if ((!topLeft && !topRight) || (!bottomLeft && !bottomRight) ||
-      (topLeft && !bottomLeft) || (topRight && !bottomRight)) {
-    e = BCExceptionNotFoundInstance;
-  }
-  init(image, topLeft, bottomLeft, topRight, bottomRight);
-}
-CBC_BoundingBox::CBC_BoundingBox(CBC_BoundingBox* boundingBox) {
-  init(boundingBox->m_image, boundingBox->m_topLeft, boundingBox->m_bottomLeft,
-       boundingBox->m_topRight, boundingBox->m_bottomRight);
-}
-
-CBC_BoundingBox::~CBC_BoundingBox() {
-  delete m_topLeft;
-  delete m_bottomLeft;
-  delete m_topRight;
-  delete m_bottomRight;
-}
-
-CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox,
-                                        CBC_BoundingBox* rightBox,
-                                        int32_t& e) {
-  CBC_BoundingBox* boundingBox = nullptr;
-  if (!leftBox) {
-    boundingBox = new CBC_BoundingBox(rightBox);
-    return boundingBox;
-  }
-  if (!rightBox) {
-    boundingBox = new CBC_BoundingBox(leftBox);
-    return boundingBox;
-  }
-  boundingBox = new CBC_BoundingBox(leftBox->m_image, leftBox->m_topLeft,
-                                    leftBox->m_bottomLeft, rightBox->m_topRight,
-                                    rightBox->m_bottomRight, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return boundingBox;
-}
-CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows,
-                                                 int32_t missingEndRows,
-                                                 FX_BOOL isLeft,
-                                                 int32_t& e) {
-  CBC_ResultPoint* newTopLeft = m_topLeft;
-  CBC_ResultPoint* newBottomLeft = m_bottomLeft;
-  CBC_ResultPoint* newTopRight = m_topRight;
-  CBC_ResultPoint* newBottomRight = m_bottomRight;
-  CBC_ResultPoint* newTop = nullptr;
-  CBC_ResultPoint* newBottom = nullptr;
-  if (missingStartRows > 0) {
-    CBC_ResultPoint* top = isLeft ? m_topLeft : m_topRight;
-    int32_t newMinY = (int32_t)top->GetY() - missingStartRows;
-    if (newMinY < 0) {
-      newMinY = 0;
-    }
-    newTop = new CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
-    if (isLeft) {
-      newTopLeft = newTop;
-    } else {
-      newTopRight = newTop;
-    }
-  }
-  if (missingEndRows > 0) {
-    CBC_ResultPoint* bottom = isLeft ? m_bottomLeft : m_bottomRight;
-    int32_t newMaxY = (int32_t)bottom->GetY() + missingEndRows;
-    if (newMaxY >= m_image->GetHeight()) {
-      newMaxY = m_image->GetHeight() - 1;
-    }
-    newBottom =
-        new CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
-    if (isLeft) {
-      newBottomLeft = newBottom;
-    } else {
-      newBottomRight = newBottom;
-    }
-  }
-  calculateMinMaxValues();
-  CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
-      m_image, newTopLeft, newBottomLeft, newTopRight, newBottomRight, e);
-  delete newTop;
-  delete newBottom;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return boundingBox;
-}
-void CBC_BoundingBox::setTopRight(CBC_ResultPoint topRight) {
-  if (m_topRight) {
-    delete m_topRight;
-  }
-  m_topRight = new CBC_ResultPoint(topRight.GetX(), topRight.GetY());
-  calculateMinMaxValues();
-}
-void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) {
-  if (m_bottomRight) {
-    delete m_bottomRight;
-  }
-  m_bottomRight = new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
-  calculateMinMaxValues();
-}
-int32_t CBC_BoundingBox::getMinX() {
-  return m_minX;
-}
-int32_t CBC_BoundingBox::getMaxX() {
-  return m_maxX;
-}
-int32_t CBC_BoundingBox::getMinY() {
-  return m_minY;
-}
-int32_t CBC_BoundingBox::getMaxY() {
-  return m_maxY;
-}
-CBC_ResultPoint* CBC_BoundingBox::getTopLeft() {
-  return m_topLeft;
-}
-CBC_ResultPoint* CBC_BoundingBox::getTopRight() {
-  return m_topRight;
-}
-CBC_ResultPoint* CBC_BoundingBox::getBottomLeft() {
-  return m_bottomLeft;
-}
-CBC_ResultPoint* CBC_BoundingBox::getBottomRight() {
-  return m_bottomRight;
-}
-void CBC_BoundingBox::init(CBC_CommonBitMatrix* image,
-                           CBC_ResultPoint* topLeft,
-                           CBC_ResultPoint* bottomLeft,
-                           CBC_ResultPoint* topRight,
-                           CBC_ResultPoint* bottomRight) {
-  m_topLeft = nullptr;
-  m_bottomLeft = nullptr;
-  m_topRight = nullptr;
-  m_bottomRight = nullptr;
-  m_image = image;
-  if (topLeft) {
-    m_topLeft = new CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
-  }
-  if (bottomLeft) {
-    m_bottomLeft = new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
-  }
-  if (topRight) {
-    m_topRight = new CBC_ResultPoint(topRight->GetX(), topRight->GetY());
-  }
-  if (bottomRight) {
-    m_bottomRight =
-        new CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
-  }
-  calculateMinMaxValues();
-}
-void CBC_BoundingBox::calculateMinMaxValues() {
-  if (!m_topLeft) {
-    m_topLeft = new CBC_ResultPoint(0, m_topRight->GetY());
-    m_bottomLeft = new CBC_ResultPoint(0, m_bottomRight->GetY());
-  } else if (!m_topRight) {
-    m_topRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
-                                     (FX_FLOAT)m_topLeft->GetY());
-    m_bottomRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
-                                        (FX_FLOAT)m_bottomLeft->GetY());
-  }
-  m_minX = (int32_t)(m_topLeft->GetX() < m_bottomLeft->GetX()
-                         ? m_topLeft->GetX()
-                         : m_bottomLeft->GetX());
-  m_maxX = (int32_t)(m_topRight->GetX() > m_bottomRight->GetX()
-                         ? m_topRight->GetX()
-                         : m_bottomRight->GetX());
-  m_minY =
-      (int32_t)(m_topLeft->GetY() < m_topRight->GetY() ? m_topLeft->GetY()
-                                                       : m_topRight->GetY());
-  m_maxY = (int32_t)(m_bottomLeft->GetY() > m_bottomRight->GetY()
-                         ? m_bottomLeft->GetY()
-                         : m_bottomRight->GetY());
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h
deleted file mode 100644
index 69a43e0700..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
-
-#include "core/fxcrt/include/fx_system.h"
-
-class CBC_CommonBitMatrix;
-class CBC_ResultPoint;
-
-class CBC_BoundingBox {
- public:
-  CBC_BoundingBox(CBC_CommonBitMatrix* image,
-                  CBC_ResultPoint* topLeft,
-                  CBC_ResultPoint* bottomLeft,
-                  CBC_ResultPoint* topRight,
-                  CBC_ResultPoint* bottomRight,
-                  int32_t& e);
-  CBC_BoundingBox(CBC_BoundingBox* boundingBox);
-  virtual ~CBC_BoundingBox();
-
-  static CBC_BoundingBox* merge(CBC_BoundingBox* leftBox,
-                                CBC_BoundingBox* rightBox,
-                                int32_t& e);
-  CBC_BoundingBox* addMissingRows(int32_t missingStartRows,
-                                  int32_t missingEndRows,
-                                  FX_BOOL isLeft,
-                                  int32_t& e);
-  void setTopRight(CBC_ResultPoint topRight);
-  void setBottomRight(CBC_ResultPoint bottomRight);
-  int32_t getMinX();
-  int32_t getMaxX();
-  int32_t getMinY();
-  int32_t getMaxY();
-  CBC_ResultPoint* getTopLeft();
-  CBC_ResultPoint* getTopRight();
-  CBC_ResultPoint* getBottomLeft();
-  CBC_ResultPoint* getBottomRight();
-
- private:
-  CBC_CommonBitMatrix* m_image;
-  CBC_ResultPoint* m_topLeft;
-  CBC_ResultPoint* m_bottomLeft;
-  CBC_ResultPoint* m_topRight;
-  CBC_ResultPoint* m_bottomRight;
-  int32_t m_minX;
-  int32_t m_maxX;
-  int32_t m_minY;
-  int32_t m_maxY;
-  void init(CBC_CommonBitMatrix* image,
-            CBC_ResultPoint* topLeft,
-            CBC_ResultPoint* bottomLeft,
-            CBC_ResultPoint* topRight,
-            CBC_ResultPoint* bottomRight);
-  void calculateMinMaxValues();
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
deleted file mode 100644
index 53eabefd95..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <limits>
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-
-#define SYMBOL_TABLE_Length 2787
-
-namespace {
-
-FX_FLOAT RATIOS_TABLE[SYMBOL_TABLE_Length][8] = {{0}};
-
-}  // namespace
-
-CBC_PDF417CodewordDecoder::CBC_PDF417CodewordDecoder() {}
-CBC_PDF417CodewordDecoder::~CBC_PDF417CodewordDecoder() {}
-void CBC_PDF417CodewordDecoder::Initialize() {
-  for (int32_t i = 0; i < SYMBOL_TABLE_Length; i++) {
-    int32_t currentSymbol = CBC_PDF417Common::SYMBOL_TABLE[i];
-    int32_t currentBit = currentSymbol & 0x1;
-    for (int32_t j = 0; j < CBC_PDF417Common::BARS_IN_MODULE; j++) {
-      FX_FLOAT size = 0.0f;
-      while ((currentSymbol & 0x1) == currentBit) {
-        size += 1.0f;
-        currentSymbol >>= 1;
-      }
-      currentBit = currentSymbol & 0x1;
-      RATIOS_TABLE[i][CBC_PDF417Common::BARS_IN_MODULE - j - 1] =
-          size / CBC_PDF417Common::MODULES_IN_CODEWORD;
-    }
-  }
-}
-void CBC_PDF417CodewordDecoder::Finalize() {}
-int32_t CBC_PDF417CodewordDecoder::getDecodedValue(
-    CFX_Int32Array& moduleBitCount) {
-  CFX_Int32Array* array = sampleBitCounts(moduleBitCount);
-  int32_t decodedValue = getDecodedCodewordValue(*array);
-  delete array;
-  if (decodedValue != -1) {
-    return decodedValue;
-  }
-  return getClosestDecodedValue(moduleBitCount);
-}
-CFX_Int32Array* CBC_PDF417CodewordDecoder::sampleBitCounts(
-    CFX_Int32Array& moduleBitCount) {
-  FX_FLOAT bitCountSum =
-      (FX_FLOAT)CBC_PDF417Common::getBitCountSum(moduleBitCount);
-  CFX_Int32Array* bitCount = new CFX_Int32Array();
-  bitCount->SetSize(CBC_PDF417Common::BARS_IN_MODULE);
-  int32_t bitCountIndex = 0;
-  int32_t sumPreviousBits = 0;
-  for (int32_t i = 0; i < CBC_PDF417Common::MODULES_IN_CODEWORD; i++) {
-    FX_FLOAT sampleIndex =
-        bitCountSum / (2 * CBC_PDF417Common::MODULES_IN_CODEWORD) +
-        (i * bitCountSum) / CBC_PDF417Common::MODULES_IN_CODEWORD;
-    if (sumPreviousBits + moduleBitCount.GetAt(bitCountIndex) <= sampleIndex) {
-      sumPreviousBits += moduleBitCount.GetAt(bitCountIndex);
-      bitCountIndex++;
-    }
-    bitCount->SetAt(bitCountIndex, bitCount->GetAt(bitCountIndex) + 1);
-  }
-  return bitCount;
-}
-int32_t CBC_PDF417CodewordDecoder::getDecodedCodewordValue(
-    CFX_Int32Array& moduleBitCount) {
-  int32_t decodedValue = getBitValue(moduleBitCount);
-  return CBC_PDF417Common::getCodeword(decodedValue) == -1 ? -1 : decodedValue;
-}
-int32_t CBC_PDF417CodewordDecoder::getBitValue(CFX_Int32Array& moduleBitCount) {
-  int64_t result = 0;
-  for (int32_t i = 0; i < moduleBitCount.GetSize(); i++) {
-    for (int32_t bit = 0; bit < moduleBitCount.GetAt(i); bit++) {
-      result = (result << 1) | (i % 2 == 0 ? 1 : 0);
-    }
-  }
-  return (int32_t)result;
-}
-int32_t CBC_PDF417CodewordDecoder::getClosestDecodedValue(
-    CFX_Int32Array& moduleBitCount) {
-  int32_t bitCountSum = CBC_PDF417Common::getBitCountSum(moduleBitCount);
-  CFX_FloatArray bitCountRatios;
-  bitCountRatios.SetSize(CBC_PDF417Common::BARS_IN_MODULE);
-  for (int32_t i = 0; i < bitCountRatios.GetSize(); i++) {
-    bitCountRatios[i] = moduleBitCount.GetAt(i) / (FX_FLOAT)bitCountSum;
-  }
-  FX_FLOAT bestMatchError = std::numeric_limits<int32_t>::max();
-  int32_t bestMatch = -1;
-  for (int32_t j = 0; j < SYMBOL_TABLE_Length; j++) {
-    FX_FLOAT error = 0.0f;
-    for (int32_t k = 0; k < CBC_PDF417Common::BARS_IN_MODULE; k++) {
-      FX_FLOAT diff = RATIOS_TABLE[j][k] - bitCountRatios[k];
-      error += diff * diff;
-    }
-    if (error < bestMatchError) {
-      bestMatchError = error;
-      bestMatch = CBC_PDF417Common::SYMBOL_TABLE[j];
-    }
-  }
-  return bestMatch;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
deleted file mode 100644
index ed0c235a9a..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_PDF417CodewordDecoder {
- public:
-  CBC_PDF417CodewordDecoder();
-  virtual ~CBC_PDF417CodewordDecoder();
-
-  static void Initialize();
-  static void Finalize();
-  static int32_t getDecodedValue(CFX_Int32Array& moduleBitCount);
-
- private:
-  static CFX_Int32Array* sampleBitCounts(CFX_Int32Array& moduleBitCount);
-  static int32_t getDecodedCodewordValue(CFX_Int32Array& moduleBitCount);
-  static int32_t getBitValue(CFX_Int32Array& moduleBitCount);
-  static int32_t getClosestDecodedValue(CFX_Int32Array& moduleBitCount);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp
deleted file mode 100644
index b9cac0c678..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-
-CFX_Int32Array* CBC_PDF417Common::EMPTY_INT_ARRAY = nullptr;
-
-const int32_t CBC_PDF417Common::SYMBOL_TABLE[] = {
-    0x1025e, 0x1027a, 0x1029e, 0x102bc, 0x102f2, 0x102f4, 0x1032e, 0x1034e,
-    0x1035c, 0x10396, 0x103a6, 0x103ac, 0x10422, 0x10428, 0x10436, 0x10442,
-    0x10444, 0x10448, 0x10450, 0x1045e, 0x10466, 0x1046c, 0x1047a, 0x10482,
-    0x1049e, 0x104a0, 0x104bc, 0x104c6, 0x104d8, 0x104ee, 0x104f2, 0x104f4,
-    0x10504, 0x10508, 0x10510, 0x1051e, 0x10520, 0x1053c, 0x10540, 0x10578,
-    0x10586, 0x1058c, 0x10598, 0x105b0, 0x105be, 0x105ce, 0x105dc, 0x105e2,
-    0x105e4, 0x105e8, 0x105f6, 0x1062e, 0x1064e, 0x1065c, 0x1068e, 0x1069c,
-    0x106b8, 0x106de, 0x106fa, 0x10716, 0x10726, 0x1072c, 0x10746, 0x1074c,
-    0x10758, 0x1076e, 0x10792, 0x10794, 0x107a2, 0x107a4, 0x107a8, 0x107b6,
-    0x10822, 0x10828, 0x10842, 0x10848, 0x10850, 0x1085e, 0x10866, 0x1086c,
-    0x1087a, 0x10882, 0x10884, 0x10890, 0x1089e, 0x108a0, 0x108bc, 0x108c6,
-    0x108cc, 0x108d8, 0x108ee, 0x108f2, 0x108f4, 0x10902, 0x10908, 0x1091e,
-    0x10920, 0x1093c, 0x10940, 0x10978, 0x10986, 0x10998, 0x109b0, 0x109be,
-    0x109ce, 0x109dc, 0x109e2, 0x109e4, 0x109e8, 0x109f6, 0x10a08, 0x10a10,
-    0x10a1e, 0x10a20, 0x10a3c, 0x10a40, 0x10a78, 0x10af0, 0x10b06, 0x10b0c,
-    0x10b18, 0x10b30, 0x10b3e, 0x10b60, 0x10b7c, 0x10b8e, 0x10b9c, 0x10bb8,
-    0x10bc2, 0x10bc4, 0x10bc8, 0x10bd0, 0x10bde, 0x10be6, 0x10bec, 0x10c2e,
-    0x10c4e, 0x10c5c, 0x10c62, 0x10c64, 0x10c68, 0x10c76, 0x10c8e, 0x10c9c,
-    0x10cb8, 0x10cc2, 0x10cc4, 0x10cc8, 0x10cd0, 0x10cde, 0x10ce6, 0x10cec,
-    0x10cfa, 0x10d0e, 0x10d1c, 0x10d38, 0x10d70, 0x10d7e, 0x10d82, 0x10d84,
-    0x10d88, 0x10d90, 0x10d9e, 0x10da0, 0x10dbc, 0x10dc6, 0x10dcc, 0x10dd8,
-    0x10dee, 0x10df2, 0x10df4, 0x10e16, 0x10e26, 0x10e2c, 0x10e46, 0x10e58,
-    0x10e6e, 0x10e86, 0x10e8c, 0x10e98, 0x10eb0, 0x10ebe, 0x10ece, 0x10edc,
-    0x10f0a, 0x10f12, 0x10f14, 0x10f22, 0x10f28, 0x10f36, 0x10f42, 0x10f44,
-    0x10f48, 0x10f50, 0x10f5e, 0x10f66, 0x10f6c, 0x10fb2, 0x10fb4, 0x11022,
-    0x11028, 0x11042, 0x11048, 0x11050, 0x1105e, 0x1107a, 0x11082, 0x11084,
-    0x11090, 0x1109e, 0x110a0, 0x110bc, 0x110c6, 0x110cc, 0x110d8, 0x110ee,
-    0x110f2, 0x110f4, 0x11102, 0x1111e, 0x11120, 0x1113c, 0x11140, 0x11178,
-    0x11186, 0x11198, 0x111b0, 0x111be, 0x111ce, 0x111dc, 0x111e2, 0x111e4,
-    0x111e8, 0x111f6, 0x11208, 0x1121e, 0x11220, 0x11278, 0x112f0, 0x1130c,
-    0x11330, 0x1133e, 0x11360, 0x1137c, 0x1138e, 0x1139c, 0x113b8, 0x113c2,
-    0x113c8, 0x113d0, 0x113de, 0x113e6, 0x113ec, 0x11408, 0x11410, 0x1141e,
-    0x11420, 0x1143c, 0x11440, 0x11478, 0x114f0, 0x115e0, 0x1160c, 0x11618,
-    0x11630, 0x1163e, 0x11660, 0x1167c, 0x116c0, 0x116f8, 0x1171c, 0x11738,
-    0x11770, 0x1177e, 0x11782, 0x11784, 0x11788, 0x11790, 0x1179e, 0x117a0,
-    0x117bc, 0x117c6, 0x117cc, 0x117d8, 0x117ee, 0x1182e, 0x11834, 0x1184e,
-    0x1185c, 0x11862, 0x11864, 0x11868, 0x11876, 0x1188e, 0x1189c, 0x118b8,
-    0x118c2, 0x118c8, 0x118d0, 0x118de, 0x118e6, 0x118ec, 0x118fa, 0x1190e,
-    0x1191c, 0x11938, 0x11970, 0x1197e, 0x11982, 0x11984, 0x11990, 0x1199e,
-    0x119a0, 0x119bc, 0x119c6, 0x119cc, 0x119d8, 0x119ee, 0x119f2, 0x119f4,
-    0x11a0e, 0x11a1c, 0x11a38, 0x11a70, 0x11a7e, 0x11ae0, 0x11afc, 0x11b08,
-    0x11b10, 0x11b1e, 0x11b20, 0x11b3c, 0x11b40, 0x11b78, 0x11b8c, 0x11b98,
-    0x11bb0, 0x11bbe, 0x11bce, 0x11bdc, 0x11be2, 0x11be4, 0x11be8, 0x11bf6,
-    0x11c16, 0x11c26, 0x11c2c, 0x11c46, 0x11c4c, 0x11c58, 0x11c6e, 0x11c86,
-    0x11c98, 0x11cb0, 0x11cbe, 0x11cce, 0x11cdc, 0x11ce2, 0x11ce4, 0x11ce8,
-    0x11cf6, 0x11d06, 0x11d0c, 0x11d18, 0x11d30, 0x11d3e, 0x11d60, 0x11d7c,
-    0x11d8e, 0x11d9c, 0x11db8, 0x11dc4, 0x11dc8, 0x11dd0, 0x11dde, 0x11de6,
-    0x11dec, 0x11dfa, 0x11e0a, 0x11e12, 0x11e14, 0x11e22, 0x11e24, 0x11e28,
-    0x11e36, 0x11e42, 0x11e44, 0x11e50, 0x11e5e, 0x11e66, 0x11e6c, 0x11e82,
-    0x11e84, 0x11e88, 0x11e90, 0x11e9e, 0x11ea0, 0x11ebc, 0x11ec6, 0x11ecc,
-    0x11ed8, 0x11eee, 0x11f1a, 0x11f2e, 0x11f32, 0x11f34, 0x11f4e, 0x11f5c,
-    0x11f62, 0x11f64, 0x11f68, 0x11f76, 0x12048, 0x1205e, 0x12082, 0x12084,
-    0x12090, 0x1209e, 0x120a0, 0x120bc, 0x120d8, 0x120f2, 0x120f4, 0x12108,
-    0x1211e, 0x12120, 0x1213c, 0x12140, 0x12178, 0x12186, 0x12198, 0x121b0,
-    0x121be, 0x121e2, 0x121e4, 0x121e8, 0x121f6, 0x12204, 0x12210, 0x1221e,
-    0x12220, 0x12278, 0x122f0, 0x12306, 0x1230c, 0x12330, 0x1233e, 0x12360,
-    0x1237c, 0x1238e, 0x1239c, 0x123b8, 0x123c2, 0x123c8, 0x123d0, 0x123e6,
-    0x123ec, 0x1241e, 0x12420, 0x1243c, 0x124f0, 0x125e0, 0x12618, 0x1263e,
-    0x12660, 0x1267c, 0x126c0, 0x126f8, 0x12738, 0x12770, 0x1277e, 0x12782,
-    0x12784, 0x12790, 0x1279e, 0x127a0, 0x127bc, 0x127c6, 0x127cc, 0x127d8,
-    0x127ee, 0x12820, 0x1283c, 0x12840, 0x12878, 0x128f0, 0x129e0, 0x12bc0,
-    0x12c18, 0x12c30, 0x12c3e, 0x12c60, 0x12c7c, 0x12cc0, 0x12cf8, 0x12df0,
-    0x12e1c, 0x12e38, 0x12e70, 0x12e7e, 0x12ee0, 0x12efc, 0x12f04, 0x12f08,
-    0x12f10, 0x12f20, 0x12f3c, 0x12f40, 0x12f78, 0x12f86, 0x12f8c, 0x12f98,
-    0x12fb0, 0x12fbe, 0x12fce, 0x12fdc, 0x1302e, 0x1304e, 0x1305c, 0x13062,
-    0x13068, 0x1308e, 0x1309c, 0x130b8, 0x130c2, 0x130c8, 0x130d0, 0x130de,
-    0x130ec, 0x130fa, 0x1310e, 0x13138, 0x13170, 0x1317e, 0x13182, 0x13184,
-    0x13190, 0x1319e, 0x131a0, 0x131bc, 0x131c6, 0x131cc, 0x131d8, 0x131f2,
-    0x131f4, 0x1320e, 0x1321c, 0x13270, 0x1327e, 0x132e0, 0x132fc, 0x13308,
-    0x1331e, 0x13320, 0x1333c, 0x13340, 0x13378, 0x13386, 0x13398, 0x133b0,
-    0x133be, 0x133ce, 0x133dc, 0x133e2, 0x133e4, 0x133e8, 0x133f6, 0x1340e,
-    0x1341c, 0x13438, 0x13470, 0x1347e, 0x134e0, 0x134fc, 0x135c0, 0x135f8,
-    0x13608, 0x13610, 0x1361e, 0x13620, 0x1363c, 0x13640, 0x13678, 0x136f0,
-    0x1370c, 0x13718, 0x13730, 0x1373e, 0x13760, 0x1377c, 0x1379c, 0x137b8,
-    0x137c2, 0x137c4, 0x137c8, 0x137d0, 0x137de, 0x137e6, 0x137ec, 0x13816,
-    0x13826, 0x1382c, 0x13846, 0x1384c, 0x13858, 0x1386e, 0x13874, 0x13886,
-    0x13898, 0x138b0, 0x138be, 0x138ce, 0x138dc, 0x138e2, 0x138e4, 0x138e8,
-    0x13906, 0x1390c, 0x13930, 0x1393e, 0x13960, 0x1397c, 0x1398e, 0x1399c,
-    0x139b8, 0x139c8, 0x139d0, 0x139de, 0x139e6, 0x139ec, 0x139fa, 0x13a06,
-    0x13a0c, 0x13a18, 0x13a30, 0x13a3e, 0x13a60, 0x13a7c, 0x13ac0, 0x13af8,
-    0x13b0e, 0x13b1c, 0x13b38, 0x13b70, 0x13b7e, 0x13b88, 0x13b90, 0x13b9e,
-    0x13ba0, 0x13bbc, 0x13bcc, 0x13bd8, 0x13bee, 0x13bf2, 0x13bf4, 0x13c12,
-    0x13c14, 0x13c22, 0x13c24, 0x13c28, 0x13c36, 0x13c42, 0x13c48, 0x13c50,
-    0x13c5e, 0x13c66, 0x13c6c, 0x13c82, 0x13c84, 0x13c90, 0x13c9e, 0x13ca0,
-    0x13cbc, 0x13cc6, 0x13ccc, 0x13cd8, 0x13cee, 0x13d02, 0x13d04, 0x13d08,
-    0x13d10, 0x13d1e, 0x13d20, 0x13d3c, 0x13d40, 0x13d78, 0x13d86, 0x13d8c,
-    0x13d98, 0x13db0, 0x13dbe, 0x13dce, 0x13ddc, 0x13de4, 0x13de8, 0x13df6,
-    0x13e1a, 0x13e2e, 0x13e32, 0x13e34, 0x13e4e, 0x13e5c, 0x13e62, 0x13e64,
-    0x13e68, 0x13e76, 0x13e8e, 0x13e9c, 0x13eb8, 0x13ec2, 0x13ec4, 0x13ec8,
-    0x13ed0, 0x13ede, 0x13ee6, 0x13eec, 0x13f26, 0x13f2c, 0x13f3a, 0x13f46,
-    0x13f4c, 0x13f58, 0x13f6e, 0x13f72, 0x13f74, 0x14082, 0x1409e, 0x140a0,
-    0x140bc, 0x14104, 0x14108, 0x14110, 0x1411e, 0x14120, 0x1413c, 0x14140,
-    0x14178, 0x1418c, 0x14198, 0x141b0, 0x141be, 0x141e2, 0x141e4, 0x141e8,
-    0x14208, 0x14210, 0x1421e, 0x14220, 0x1423c, 0x14240, 0x14278, 0x142f0,
-    0x14306, 0x1430c, 0x14318, 0x14330, 0x1433e, 0x14360, 0x1437c, 0x1438e,
-    0x143c2, 0x143c4, 0x143c8, 0x143d0, 0x143e6, 0x143ec, 0x14408, 0x14410,
-    0x1441e, 0x14420, 0x1443c, 0x14440, 0x14478, 0x144f0, 0x145e0, 0x1460c,
-    0x14618, 0x14630, 0x1463e, 0x14660, 0x1467c, 0x146c0, 0x146f8, 0x1471c,
-    0x14738, 0x14770, 0x1477e, 0x14782, 0x14784, 0x14788, 0x14790, 0x147a0,
-    0x147bc, 0x147c6, 0x147cc, 0x147d8, 0x147ee, 0x14810, 0x14820, 0x1483c,
-    0x14840, 0x14878, 0x148f0, 0x149e0, 0x14bc0, 0x14c30, 0x14c3e, 0x14c60,
-    0x14c7c, 0x14cc0, 0x14cf8, 0x14df0, 0x14e38, 0x14e70, 0x14e7e, 0x14ee0,
-    0x14efc, 0x14f04, 0x14f08, 0x14f10, 0x14f1e, 0x14f20, 0x14f3c, 0x14f40,
-    0x14f78, 0x14f86, 0x14f8c, 0x14f98, 0x14fb0, 0x14fce, 0x14fdc, 0x15020,
-    0x15040, 0x15078, 0x150f0, 0x151e0, 0x153c0, 0x15860, 0x1587c, 0x158c0,
-    0x158f8, 0x159f0, 0x15be0, 0x15c70, 0x15c7e, 0x15ce0, 0x15cfc, 0x15dc0,
-    0x15df8, 0x15e08, 0x15e10, 0x15e20, 0x15e40, 0x15e78, 0x15ef0, 0x15f0c,
-    0x15f18, 0x15f30, 0x15f60, 0x15f7c, 0x15f8e, 0x15f9c, 0x15fb8, 0x1604e,
-    0x1605c, 0x1608e, 0x1609c, 0x160b8, 0x160c2, 0x160c4, 0x160c8, 0x160de,
-    0x1610e, 0x1611c, 0x16138, 0x16170, 0x1617e, 0x16184, 0x16188, 0x16190,
-    0x1619e, 0x161a0, 0x161bc, 0x161c6, 0x161cc, 0x161d8, 0x161f2, 0x161f4,
-    0x1620e, 0x1621c, 0x16238, 0x16270, 0x1627e, 0x162e0, 0x162fc, 0x16304,
-    0x16308, 0x16310, 0x1631e, 0x16320, 0x1633c, 0x16340, 0x16378, 0x16386,
-    0x1638c, 0x16398, 0x163b0, 0x163be, 0x163ce, 0x163dc, 0x163e2, 0x163e4,
-    0x163e8, 0x163f6, 0x1640e, 0x1641c, 0x16438, 0x16470, 0x1647e, 0x164e0,
-    0x164fc, 0x165c0, 0x165f8, 0x16610, 0x1661e, 0x16620, 0x1663c, 0x16640,
-    0x16678, 0x166f0, 0x16718, 0x16730, 0x1673e, 0x16760, 0x1677c, 0x1678e,
-    0x1679c, 0x167b8, 0x167c2, 0x167c4, 0x167c8, 0x167d0, 0x167de, 0x167e6,
-    0x167ec, 0x1681c, 0x16838, 0x16870, 0x168e0, 0x168fc, 0x169c0, 0x169f8,
-    0x16bf0, 0x16c10, 0x16c1e, 0x16c20, 0x16c3c, 0x16c40, 0x16c78, 0x16cf0,
-    0x16de0, 0x16e18, 0x16e30, 0x16e3e, 0x16e60, 0x16e7c, 0x16ec0, 0x16ef8,
-    0x16f1c, 0x16f38, 0x16f70, 0x16f7e, 0x16f84, 0x16f88, 0x16f90, 0x16f9e,
-    0x16fa0, 0x16fbc, 0x16fc6, 0x16fcc, 0x16fd8, 0x17026, 0x1702c, 0x17046,
-    0x1704c, 0x17058, 0x1706e, 0x17086, 0x1708c, 0x17098, 0x170b0, 0x170be,
-    0x170ce, 0x170dc, 0x170e8, 0x17106, 0x1710c, 0x17118, 0x17130, 0x1713e,
-    0x17160, 0x1717c, 0x1718e, 0x1719c, 0x171b8, 0x171c2, 0x171c4, 0x171c8,
-    0x171d0, 0x171de, 0x171e6, 0x171ec, 0x171fa, 0x17206, 0x1720c, 0x17218,
-    0x17230, 0x1723e, 0x17260, 0x1727c, 0x172c0, 0x172f8, 0x1730e, 0x1731c,
-    0x17338, 0x17370, 0x1737e, 0x17388, 0x17390, 0x1739e, 0x173a0, 0x173bc,
-    0x173cc, 0x173d8, 0x173ee, 0x173f2, 0x173f4, 0x1740c, 0x17418, 0x17430,
-    0x1743e, 0x17460, 0x1747c, 0x174c0, 0x174f8, 0x175f0, 0x1760e, 0x1761c,
-    0x17638, 0x17670, 0x1767e, 0x176e0, 0x176fc, 0x17708, 0x17710, 0x1771e,
-    0x17720, 0x1773c, 0x17740, 0x17778, 0x17798, 0x177b0, 0x177be, 0x177dc,
-    0x177e2, 0x177e4, 0x177e8, 0x17822, 0x17824, 0x17828, 0x17836, 0x17842,
-    0x17844, 0x17848, 0x17850, 0x1785e, 0x17866, 0x1786c, 0x17882, 0x17884,
-    0x17888, 0x17890, 0x1789e, 0x178a0, 0x178bc, 0x178c6, 0x178cc, 0x178d8,
-    0x178ee, 0x178f2, 0x178f4, 0x17902, 0x17904, 0x17908, 0x17910, 0x1791e,
-    0x17920, 0x1793c, 0x17940, 0x17978, 0x17986, 0x1798c, 0x17998, 0x179b0,
-    0x179be, 0x179ce, 0x179dc, 0x179e2, 0x179e4, 0x179e8, 0x179f6, 0x17a04,
-    0x17a08, 0x17a10, 0x17a1e, 0x17a20, 0x17a3c, 0x17a40, 0x17a78, 0x17af0,
-    0x17b06, 0x17b0c, 0x17b18, 0x17b30, 0x17b3e, 0x17b60, 0x17b7c, 0x17b8e,
-    0x17b9c, 0x17bb8, 0x17bc4, 0x17bc8, 0x17bd0, 0x17bde, 0x17be6, 0x17bec,
-    0x17c2e, 0x17c32, 0x17c34, 0x17c4e, 0x17c5c, 0x17c62, 0x17c64, 0x17c68,
-    0x17c76, 0x17c8e, 0x17c9c, 0x17cb8, 0x17cc2, 0x17cc4, 0x17cc8, 0x17cd0,
-    0x17cde, 0x17ce6, 0x17cec, 0x17d0e, 0x17d1c, 0x17d38, 0x17d70, 0x17d82,
-    0x17d84, 0x17d88, 0x17d90, 0x17d9e, 0x17da0, 0x17dbc, 0x17dc6, 0x17dcc,
-    0x17dd8, 0x17dee, 0x17e26, 0x17e2c, 0x17e3a, 0x17e46, 0x17e4c, 0x17e58,
-    0x17e6e, 0x17e72, 0x17e74, 0x17e86, 0x17e8c, 0x17e98, 0x17eb0, 0x17ece,
-    0x17edc, 0x17ee2, 0x17ee4, 0x17ee8, 0x17ef6, 0x1813a, 0x18172, 0x18174,
-    0x18216, 0x18226, 0x1823a, 0x1824c, 0x18258, 0x1826e, 0x18272, 0x18274,
-    0x18298, 0x182be, 0x182e2, 0x182e4, 0x182e8, 0x182f6, 0x1835e, 0x1837a,
-    0x183ae, 0x183d6, 0x18416, 0x18426, 0x1842c, 0x1843a, 0x18446, 0x18458,
-    0x1846e, 0x18472, 0x18474, 0x18486, 0x184b0, 0x184be, 0x184ce, 0x184dc,
-    0x184e2, 0x184e4, 0x184e8, 0x184f6, 0x18506, 0x1850c, 0x18518, 0x18530,
-    0x1853e, 0x18560, 0x1857c, 0x1858e, 0x1859c, 0x185b8, 0x185c2, 0x185c4,
-    0x185c8, 0x185d0, 0x185de, 0x185e6, 0x185ec, 0x185fa, 0x18612, 0x18614,
-    0x18622, 0x18628, 0x18636, 0x18642, 0x18650, 0x1865e, 0x1867a, 0x18682,
-    0x18684, 0x18688, 0x18690, 0x1869e, 0x186a0, 0x186bc, 0x186c6, 0x186cc,
-    0x186d8, 0x186ee, 0x186f2, 0x186f4, 0x1872e, 0x1874e, 0x1875c, 0x18796,
-    0x187a6, 0x187ac, 0x187d2, 0x187d4, 0x18826, 0x1882c, 0x1883a, 0x18846,
-    0x1884c, 0x18858, 0x1886e, 0x18872, 0x18874, 0x18886, 0x18898, 0x188b0,
-    0x188be, 0x188ce, 0x188dc, 0x188e2, 0x188e4, 0x188e8, 0x188f6, 0x1890c,
-    0x18930, 0x1893e, 0x18960, 0x1897c, 0x1898e, 0x189b8, 0x189c2, 0x189c8,
-    0x189d0, 0x189de, 0x189e6, 0x189ec, 0x189fa, 0x18a18, 0x18a30, 0x18a3e,
-    0x18a60, 0x18a7c, 0x18ac0, 0x18af8, 0x18b1c, 0x18b38, 0x18b70, 0x18b7e,
-    0x18b82, 0x18b84, 0x18b88, 0x18b90, 0x18b9e, 0x18ba0, 0x18bbc, 0x18bc6,
-    0x18bcc, 0x18bd8, 0x18bee, 0x18bf2, 0x18bf4, 0x18c22, 0x18c24, 0x18c28,
-    0x18c36, 0x18c42, 0x18c48, 0x18c50, 0x18c5e, 0x18c66, 0x18c7a, 0x18c82,
-    0x18c84, 0x18c90, 0x18c9e, 0x18ca0, 0x18cbc, 0x18ccc, 0x18cf2, 0x18cf4,
-    0x18d04, 0x18d08, 0x18d10, 0x18d1e, 0x18d20, 0x18d3c, 0x18d40, 0x18d78,
-    0x18d86, 0x18d98, 0x18dce, 0x18de2, 0x18de4, 0x18de8, 0x18e2e, 0x18e32,
-    0x18e34, 0x18e4e, 0x18e5c, 0x18e62, 0x18e64, 0x18e68, 0x18e8e, 0x18e9c,
-    0x18eb8, 0x18ec2, 0x18ec4, 0x18ec8, 0x18ed0, 0x18efa, 0x18f16, 0x18f26,
-    0x18f2c, 0x18f46, 0x18f4c, 0x18f58, 0x18f6e, 0x18f8a, 0x18f92, 0x18f94,
-    0x18fa2, 0x18fa4, 0x18fa8, 0x18fb6, 0x1902c, 0x1903a, 0x19046, 0x1904c,
-    0x19058, 0x19072, 0x19074, 0x19086, 0x19098, 0x190b0, 0x190be, 0x190ce,
-    0x190dc, 0x190e2, 0x190e8, 0x190f6, 0x19106, 0x1910c, 0x19130, 0x1913e,
-    0x19160, 0x1917c, 0x1918e, 0x1919c, 0x191b8, 0x191c2, 0x191c8, 0x191d0,
-    0x191de, 0x191e6, 0x191ec, 0x191fa, 0x19218, 0x1923e, 0x19260, 0x1927c,
-    0x192c0, 0x192f8, 0x19338, 0x19370, 0x1937e, 0x19382, 0x19384, 0x19390,
-    0x1939e, 0x193a0, 0x193bc, 0x193c6, 0x193cc, 0x193d8, 0x193ee, 0x193f2,
-    0x193f4, 0x19430, 0x1943e, 0x19460, 0x1947c, 0x194c0, 0x194f8, 0x195f0,
-    0x19638, 0x19670, 0x1967e, 0x196e0, 0x196fc, 0x19702, 0x19704, 0x19708,
-    0x19710, 0x19720, 0x1973c, 0x19740, 0x19778, 0x19786, 0x1978c, 0x19798,
-    0x197b0, 0x197be, 0x197ce, 0x197dc, 0x197e2, 0x197e4, 0x197e8, 0x19822,
-    0x19824, 0x19842, 0x19848, 0x19850, 0x1985e, 0x19866, 0x1987a, 0x19882,
-    0x19884, 0x19890, 0x1989e, 0x198a0, 0x198bc, 0x198cc, 0x198f2, 0x198f4,
-    0x19902, 0x19908, 0x1991e, 0x19920, 0x1993c, 0x19940, 0x19978, 0x19986,
-    0x19998, 0x199ce, 0x199e2, 0x199e4, 0x199e8, 0x19a08, 0x19a10, 0x19a1e,
-    0x19a20, 0x19a3c, 0x19a40, 0x19a78, 0x19af0, 0x19b18, 0x19b3e, 0x19b60,
-    0x19b9c, 0x19bc2, 0x19bc4, 0x19bc8, 0x19bd0, 0x19be6, 0x19c2e, 0x19c34,
-    0x19c4e, 0x19c5c, 0x19c62, 0x19c64, 0x19c68, 0x19c8e, 0x19c9c, 0x19cb8,
-    0x19cc2, 0x19cc8, 0x19cd0, 0x19ce6, 0x19cfa, 0x19d0e, 0x19d1c, 0x19d38,
-    0x19d70, 0x19d7e, 0x19d82, 0x19d84, 0x19d88, 0x19d90, 0x19da0, 0x19dcc,
-    0x19df2, 0x19df4, 0x19e16, 0x19e26, 0x19e2c, 0x19e46, 0x19e4c, 0x19e58,
-    0x19e74, 0x19e86, 0x19e8c, 0x19e98, 0x19eb0, 0x19ebe, 0x19ece, 0x19ee2,
-    0x19ee4, 0x19ee8, 0x19f0a, 0x19f12, 0x19f14, 0x19f22, 0x19f24, 0x19f28,
-    0x19f42, 0x19f44, 0x19f48, 0x19f50, 0x19f5e, 0x19f6c, 0x19f9a, 0x19fae,
-    0x19fb2, 0x19fb4, 0x1a046, 0x1a04c, 0x1a072, 0x1a074, 0x1a086, 0x1a08c,
-    0x1a098, 0x1a0b0, 0x1a0be, 0x1a0e2, 0x1a0e4, 0x1a0e8, 0x1a0f6, 0x1a106,
-    0x1a10c, 0x1a118, 0x1a130, 0x1a13e, 0x1a160, 0x1a17c, 0x1a18e, 0x1a19c,
-    0x1a1b8, 0x1a1c2, 0x1a1c4, 0x1a1c8, 0x1a1d0, 0x1a1de, 0x1a1e6, 0x1a1ec,
-    0x1a218, 0x1a230, 0x1a23e, 0x1a260, 0x1a27c, 0x1a2c0, 0x1a2f8, 0x1a31c,
-    0x1a338, 0x1a370, 0x1a37e, 0x1a382, 0x1a384, 0x1a388, 0x1a390, 0x1a39e,
-    0x1a3a0, 0x1a3bc, 0x1a3c6, 0x1a3cc, 0x1a3d8, 0x1a3ee, 0x1a3f2, 0x1a3f4,
-    0x1a418, 0x1a430, 0x1a43e, 0x1a460, 0x1a47c, 0x1a4c0, 0x1a4f8, 0x1a5f0,
-    0x1a61c, 0x1a638, 0x1a670, 0x1a67e, 0x1a6e0, 0x1a6fc, 0x1a702, 0x1a704,
-    0x1a708, 0x1a710, 0x1a71e, 0x1a720, 0x1a73c, 0x1a740, 0x1a778, 0x1a786,
-    0x1a78c, 0x1a798, 0x1a7b0, 0x1a7be, 0x1a7ce, 0x1a7dc, 0x1a7e2, 0x1a7e4,
-    0x1a7e8, 0x1a830, 0x1a860, 0x1a87c, 0x1a8c0, 0x1a8f8, 0x1a9f0, 0x1abe0,
-    0x1ac70, 0x1ac7e, 0x1ace0, 0x1acfc, 0x1adc0, 0x1adf8, 0x1ae04, 0x1ae08,
-    0x1ae10, 0x1ae20, 0x1ae3c, 0x1ae40, 0x1ae78, 0x1aef0, 0x1af06, 0x1af0c,
-    0x1af18, 0x1af30, 0x1af3e, 0x1af60, 0x1af7c, 0x1af8e, 0x1af9c, 0x1afb8,
-    0x1afc4, 0x1afc8, 0x1afd0, 0x1afde, 0x1b042, 0x1b05e, 0x1b07a, 0x1b082,
-    0x1b084, 0x1b088, 0x1b090, 0x1b09e, 0x1b0a0, 0x1b0bc, 0x1b0cc, 0x1b0f2,
-    0x1b0f4, 0x1b102, 0x1b104, 0x1b108, 0x1b110, 0x1b11e, 0x1b120, 0x1b13c,
-    0x1b140, 0x1b178, 0x1b186, 0x1b198, 0x1b1ce, 0x1b1e2, 0x1b1e4, 0x1b1e8,
-    0x1b204, 0x1b208, 0x1b210, 0x1b21e, 0x1b220, 0x1b23c, 0x1b240, 0x1b278,
-    0x1b2f0, 0x1b30c, 0x1b33e, 0x1b360, 0x1b39c, 0x1b3c2, 0x1b3c4, 0x1b3c8,
-    0x1b3d0, 0x1b3e6, 0x1b410, 0x1b41e, 0x1b420, 0x1b43c, 0x1b440, 0x1b478,
-    0x1b4f0, 0x1b5e0, 0x1b618, 0x1b660, 0x1b67c, 0x1b6c0, 0x1b738, 0x1b782,
-    0x1b784, 0x1b788, 0x1b790, 0x1b79e, 0x1b7a0, 0x1b7cc, 0x1b82e, 0x1b84e,
-    0x1b85c, 0x1b88e, 0x1b89c, 0x1b8b8, 0x1b8c2, 0x1b8c4, 0x1b8c8, 0x1b8d0,
-    0x1b8e6, 0x1b8fa, 0x1b90e, 0x1b91c, 0x1b938, 0x1b970, 0x1b97e, 0x1b982,
-    0x1b984, 0x1b988, 0x1b990, 0x1b99e, 0x1b9a0, 0x1b9cc, 0x1b9f2, 0x1b9f4,
-    0x1ba0e, 0x1ba1c, 0x1ba38, 0x1ba70, 0x1ba7e, 0x1bae0, 0x1bafc, 0x1bb08,
-    0x1bb10, 0x1bb20, 0x1bb3c, 0x1bb40, 0x1bb98, 0x1bbce, 0x1bbe2, 0x1bbe4,
-    0x1bbe8, 0x1bc16, 0x1bc26, 0x1bc2c, 0x1bc46, 0x1bc4c, 0x1bc58, 0x1bc72,
-    0x1bc74, 0x1bc86, 0x1bc8c, 0x1bc98, 0x1bcb0, 0x1bcbe, 0x1bcce, 0x1bce2,
-    0x1bce4, 0x1bce8, 0x1bd06, 0x1bd0c, 0x1bd18, 0x1bd30, 0x1bd3e, 0x1bd60,
-    0x1bd7c, 0x1bd9c, 0x1bdc2, 0x1bdc4, 0x1bdc8, 0x1bdd0, 0x1bde6, 0x1bdfa,
-    0x1be12, 0x1be14, 0x1be22, 0x1be24, 0x1be28, 0x1be42, 0x1be44, 0x1be48,
-    0x1be50, 0x1be5e, 0x1be66, 0x1be82, 0x1be84, 0x1be88, 0x1be90, 0x1be9e,
-    0x1bea0, 0x1bebc, 0x1becc, 0x1bef4, 0x1bf1a, 0x1bf2e, 0x1bf32, 0x1bf34,
-    0x1bf4e, 0x1bf5c, 0x1bf62, 0x1bf64, 0x1bf68, 0x1c09a, 0x1c0b2, 0x1c0b4,
-    0x1c11a, 0x1c132, 0x1c134, 0x1c162, 0x1c164, 0x1c168, 0x1c176, 0x1c1ba,
-    0x1c21a, 0x1c232, 0x1c234, 0x1c24e, 0x1c25c, 0x1c262, 0x1c264, 0x1c268,
-    0x1c276, 0x1c28e, 0x1c2c2, 0x1c2c4, 0x1c2c8, 0x1c2d0, 0x1c2de, 0x1c2e6,
-    0x1c2ec, 0x1c2fa, 0x1c316, 0x1c326, 0x1c33a, 0x1c346, 0x1c34c, 0x1c372,
-    0x1c374, 0x1c41a, 0x1c42e, 0x1c432, 0x1c434, 0x1c44e, 0x1c45c, 0x1c462,
-    0x1c464, 0x1c468, 0x1c476, 0x1c48e, 0x1c49c, 0x1c4b8, 0x1c4c2, 0x1c4c8,
-    0x1c4d0, 0x1c4de, 0x1c4e6, 0x1c4ec, 0x1c4fa, 0x1c51c, 0x1c538, 0x1c570,
-    0x1c57e, 0x1c582, 0x1c584, 0x1c588, 0x1c590, 0x1c59e, 0x1c5a0, 0x1c5bc,
-    0x1c5c6, 0x1c5cc, 0x1c5d8, 0x1c5ee, 0x1c5f2, 0x1c5f4, 0x1c616, 0x1c626,
-    0x1c62c, 0x1c63a, 0x1c646, 0x1c64c, 0x1c658, 0x1c66e, 0x1c672, 0x1c674,
-    0x1c686, 0x1c68c, 0x1c698, 0x1c6b0, 0x1c6be, 0x1c6ce, 0x1c6dc, 0x1c6e2,
-    0x1c6e4, 0x1c6e8, 0x1c712, 0x1c714, 0x1c722, 0x1c728, 0x1c736, 0x1c742,
-    0x1c744, 0x1c748, 0x1c750, 0x1c75e, 0x1c766, 0x1c76c, 0x1c77a, 0x1c7ae,
-    0x1c7d6, 0x1c7ea, 0x1c81a, 0x1c82e, 0x1c832, 0x1c834, 0x1c84e, 0x1c85c,
-    0x1c862, 0x1c864, 0x1c868, 0x1c876, 0x1c88e, 0x1c89c, 0x1c8b8, 0x1c8c2,
-    0x1c8c8, 0x1c8d0, 0x1c8de, 0x1c8e6, 0x1c8ec, 0x1c8fa, 0x1c90e, 0x1c938,
-    0x1c970, 0x1c97e, 0x1c982, 0x1c984, 0x1c990, 0x1c99e, 0x1c9a0, 0x1c9bc,
-    0x1c9c6, 0x1c9cc, 0x1c9d8, 0x1c9ee, 0x1c9f2, 0x1c9f4, 0x1ca38, 0x1ca70,
-    0x1ca7e, 0x1cae0, 0x1cafc, 0x1cb02, 0x1cb04, 0x1cb08, 0x1cb10, 0x1cb20,
-    0x1cb3c, 0x1cb40, 0x1cb78, 0x1cb86, 0x1cb8c, 0x1cb98, 0x1cbb0, 0x1cbbe,
-    0x1cbce, 0x1cbdc, 0x1cbe2, 0x1cbe4, 0x1cbe8, 0x1cbf6, 0x1cc16, 0x1cc26,
-    0x1cc2c, 0x1cc3a, 0x1cc46, 0x1cc58, 0x1cc72, 0x1cc74, 0x1cc86, 0x1ccb0,
-    0x1ccbe, 0x1ccce, 0x1cce2, 0x1cce4, 0x1cce8, 0x1cd06, 0x1cd0c, 0x1cd18,
-    0x1cd30, 0x1cd3e, 0x1cd60, 0x1cd7c, 0x1cd9c, 0x1cdc2, 0x1cdc4, 0x1cdc8,
-    0x1cdd0, 0x1cdde, 0x1cde6, 0x1cdfa, 0x1ce22, 0x1ce28, 0x1ce42, 0x1ce50,
-    0x1ce5e, 0x1ce66, 0x1ce7a, 0x1ce82, 0x1ce84, 0x1ce88, 0x1ce90, 0x1ce9e,
-    0x1cea0, 0x1cebc, 0x1cecc, 0x1cef2, 0x1cef4, 0x1cf2e, 0x1cf32, 0x1cf34,
-    0x1cf4e, 0x1cf5c, 0x1cf62, 0x1cf64, 0x1cf68, 0x1cf96, 0x1cfa6, 0x1cfac,
-    0x1cfca, 0x1cfd2, 0x1cfd4, 0x1d02e, 0x1d032, 0x1d034, 0x1d04e, 0x1d05c,
-    0x1d062, 0x1d064, 0x1d068, 0x1d076, 0x1d08e, 0x1d09c, 0x1d0b8, 0x1d0c2,
-    0x1d0c4, 0x1d0c8, 0x1d0d0, 0x1d0de, 0x1d0e6, 0x1d0ec, 0x1d0fa, 0x1d11c,
-    0x1d138, 0x1d170, 0x1d17e, 0x1d182, 0x1d184, 0x1d188, 0x1d190, 0x1d19e,
-    0x1d1a0, 0x1d1bc, 0x1d1c6, 0x1d1cc, 0x1d1d8, 0x1d1ee, 0x1d1f2, 0x1d1f4,
-    0x1d21c, 0x1d238, 0x1d270, 0x1d27e, 0x1d2e0, 0x1d2fc, 0x1d302, 0x1d304,
-    0x1d308, 0x1d310, 0x1d31e, 0x1d320, 0x1d33c, 0x1d340, 0x1d378, 0x1d386,
-    0x1d38c, 0x1d398, 0x1d3b0, 0x1d3be, 0x1d3ce, 0x1d3dc, 0x1d3e2, 0x1d3e4,
-    0x1d3e8, 0x1d3f6, 0x1d470, 0x1d47e, 0x1d4e0, 0x1d4fc, 0x1d5c0, 0x1d5f8,
-    0x1d604, 0x1d608, 0x1d610, 0x1d620, 0x1d640, 0x1d678, 0x1d6f0, 0x1d706,
-    0x1d70c, 0x1d718, 0x1d730, 0x1d73e, 0x1d760, 0x1d77c, 0x1d78e, 0x1d79c,
-    0x1d7b8, 0x1d7c2, 0x1d7c4, 0x1d7c8, 0x1d7d0, 0x1d7de, 0x1d7e6, 0x1d7ec,
-    0x1d826, 0x1d82c, 0x1d83a, 0x1d846, 0x1d84c, 0x1d858, 0x1d872, 0x1d874,
-    0x1d886, 0x1d88c, 0x1d898, 0x1d8b0, 0x1d8be, 0x1d8ce, 0x1d8e2, 0x1d8e4,
-    0x1d8e8, 0x1d8f6, 0x1d90c, 0x1d918, 0x1d930, 0x1d93e, 0x1d960, 0x1d97c,
-    0x1d99c, 0x1d9c2, 0x1d9c4, 0x1d9c8, 0x1d9d0, 0x1d9e6, 0x1d9fa, 0x1da0c,
-    0x1da18, 0x1da30, 0x1da3e, 0x1da60, 0x1da7c, 0x1dac0, 0x1daf8, 0x1db38,
-    0x1db82, 0x1db84, 0x1db88, 0x1db90, 0x1db9e, 0x1dba0, 0x1dbcc, 0x1dbf2,
-    0x1dbf4, 0x1dc22, 0x1dc42, 0x1dc44, 0x1dc48, 0x1dc50, 0x1dc5e, 0x1dc66,
-    0x1dc7a, 0x1dc82, 0x1dc84, 0x1dc88, 0x1dc90, 0x1dc9e, 0x1dca0, 0x1dcbc,
-    0x1dccc, 0x1dcf2, 0x1dcf4, 0x1dd04, 0x1dd08, 0x1dd10, 0x1dd1e, 0x1dd20,
-    0x1dd3c, 0x1dd40, 0x1dd78, 0x1dd86, 0x1dd98, 0x1ddce, 0x1dde2, 0x1dde4,
-    0x1dde8, 0x1de2e, 0x1de32, 0x1de34, 0x1de4e, 0x1de5c, 0x1de62, 0x1de64,
-    0x1de68, 0x1de8e, 0x1de9c, 0x1deb8, 0x1dec2, 0x1dec4, 0x1dec8, 0x1ded0,
-    0x1dee6, 0x1defa, 0x1df16, 0x1df26, 0x1df2c, 0x1df46, 0x1df4c, 0x1df58,
-    0x1df72, 0x1df74, 0x1df8a, 0x1df92, 0x1df94, 0x1dfa2, 0x1dfa4, 0x1dfa8,
-    0x1e08a, 0x1e092, 0x1e094, 0x1e0a2, 0x1e0a4, 0x1e0a8, 0x1e0b6, 0x1e0da,
-    0x1e10a, 0x1e112, 0x1e114, 0x1e122, 0x1e124, 0x1e128, 0x1e136, 0x1e142,
-    0x1e144, 0x1e148, 0x1e150, 0x1e166, 0x1e16c, 0x1e17a, 0x1e19a, 0x1e1b2,
-    0x1e1b4, 0x1e20a, 0x1e212, 0x1e214, 0x1e222, 0x1e224, 0x1e228, 0x1e236,
-    0x1e242, 0x1e248, 0x1e250, 0x1e25e, 0x1e266, 0x1e26c, 0x1e27a, 0x1e282,
-    0x1e284, 0x1e288, 0x1e290, 0x1e2a0, 0x1e2bc, 0x1e2c6, 0x1e2cc, 0x1e2d8,
-    0x1e2ee, 0x1e2f2, 0x1e2f4, 0x1e31a, 0x1e332, 0x1e334, 0x1e35c, 0x1e362,
-    0x1e364, 0x1e368, 0x1e3ba, 0x1e40a, 0x1e412, 0x1e414, 0x1e422, 0x1e428,
-    0x1e436, 0x1e442, 0x1e448, 0x1e450, 0x1e45e, 0x1e466, 0x1e46c, 0x1e47a,
-    0x1e482, 0x1e484, 0x1e490, 0x1e49e, 0x1e4a0, 0x1e4bc, 0x1e4c6, 0x1e4cc,
-    0x1e4d8, 0x1e4ee, 0x1e4f2, 0x1e4f4, 0x1e502, 0x1e504, 0x1e508, 0x1e510,
-    0x1e51e, 0x1e520, 0x1e53c, 0x1e540, 0x1e578, 0x1e586, 0x1e58c, 0x1e598,
-    0x1e5b0, 0x1e5be, 0x1e5ce, 0x1e5dc, 0x1e5e2, 0x1e5e4, 0x1e5e8, 0x1e5f6,
-    0x1e61a, 0x1e62e, 0x1e632, 0x1e634, 0x1e64e, 0x1e65c, 0x1e662, 0x1e668,
-    0x1e68e, 0x1e69c, 0x1e6b8, 0x1e6c2, 0x1e6c4, 0x1e6c8, 0x1e6d0, 0x1e6e6,
-    0x1e6fa, 0x1e716, 0x1e726, 0x1e72c, 0x1e73a, 0x1e746, 0x1e74c, 0x1e758,
-    0x1e772, 0x1e774, 0x1e792, 0x1e794, 0x1e7a2, 0x1e7a4, 0x1e7a8, 0x1e7b6,
-    0x1e812, 0x1e814, 0x1e822, 0x1e824, 0x1e828, 0x1e836, 0x1e842, 0x1e844,
-    0x1e848, 0x1e850, 0x1e85e, 0x1e866, 0x1e86c, 0x1e87a, 0x1e882, 0x1e884,
-    0x1e888, 0x1e890, 0x1e89e, 0x1e8a0, 0x1e8bc, 0x1e8c6, 0x1e8cc, 0x1e8d8,
-    0x1e8ee, 0x1e8f2, 0x1e8f4, 0x1e902, 0x1e904, 0x1e908, 0x1e910, 0x1e920,
-    0x1e93c, 0x1e940, 0x1e978, 0x1e986, 0x1e98c, 0x1e998, 0x1e9b0, 0x1e9be,
-    0x1e9ce, 0x1e9dc, 0x1e9e2, 0x1e9e4, 0x1e9e8, 0x1e9f6, 0x1ea04, 0x1ea08,
-    0x1ea10, 0x1ea20, 0x1ea40, 0x1ea78, 0x1eaf0, 0x1eb06, 0x1eb0c, 0x1eb18,
-    0x1eb30, 0x1eb3e, 0x1eb60, 0x1eb7c, 0x1eb8e, 0x1eb9c, 0x1ebb8, 0x1ebc2,
-    0x1ebc4, 0x1ebc8, 0x1ebd0, 0x1ebde, 0x1ebe6, 0x1ebec, 0x1ec1a, 0x1ec2e,
-    0x1ec32, 0x1ec34, 0x1ec4e, 0x1ec5c, 0x1ec62, 0x1ec64, 0x1ec68, 0x1ec8e,
-    0x1ec9c, 0x1ecb8, 0x1ecc2, 0x1ecc4, 0x1ecc8, 0x1ecd0, 0x1ece6, 0x1ecfa,
-    0x1ed0e, 0x1ed1c, 0x1ed38, 0x1ed70, 0x1ed7e, 0x1ed82, 0x1ed84, 0x1ed88,
-    0x1ed90, 0x1ed9e, 0x1eda0, 0x1edcc, 0x1edf2, 0x1edf4, 0x1ee16, 0x1ee26,
-    0x1ee2c, 0x1ee3a, 0x1ee46, 0x1ee4c, 0x1ee58, 0x1ee6e, 0x1ee72, 0x1ee74,
-    0x1ee86, 0x1ee8c, 0x1ee98, 0x1eeb0, 0x1eebe, 0x1eece, 0x1eedc, 0x1eee2,
-    0x1eee4, 0x1eee8, 0x1ef12, 0x1ef22, 0x1ef24, 0x1ef28, 0x1ef36, 0x1ef42,
-    0x1ef44, 0x1ef48, 0x1ef50, 0x1ef5e, 0x1ef66, 0x1ef6c, 0x1ef7a, 0x1efae,
-    0x1efb2, 0x1efb4, 0x1efd6, 0x1f096, 0x1f0a6, 0x1f0ac, 0x1f0ba, 0x1f0ca,
-    0x1f0d2, 0x1f0d4, 0x1f116, 0x1f126, 0x1f12c, 0x1f13a, 0x1f146, 0x1f14c,
-    0x1f158, 0x1f16e, 0x1f172, 0x1f174, 0x1f18a, 0x1f192, 0x1f194, 0x1f1a2,
-    0x1f1a4, 0x1f1a8, 0x1f1da, 0x1f216, 0x1f226, 0x1f22c, 0x1f23a, 0x1f246,
-    0x1f258, 0x1f26e, 0x1f272, 0x1f274, 0x1f286, 0x1f28c, 0x1f298, 0x1f2b0,
-    0x1f2be, 0x1f2ce, 0x1f2dc, 0x1f2e2, 0x1f2e4, 0x1f2e8, 0x1f2f6, 0x1f30a,
-    0x1f312, 0x1f314, 0x1f322, 0x1f328, 0x1f342, 0x1f344, 0x1f348, 0x1f350,
-    0x1f35e, 0x1f366, 0x1f37a, 0x1f39a, 0x1f3ae, 0x1f3b2, 0x1f3b4, 0x1f416,
-    0x1f426, 0x1f42c, 0x1f43a, 0x1f446, 0x1f44c, 0x1f458, 0x1f46e, 0x1f472,
-    0x1f474, 0x1f486, 0x1f48c, 0x1f498, 0x1f4b0, 0x1f4be, 0x1f4ce, 0x1f4dc,
-    0x1f4e2, 0x1f4e4, 0x1f4e8, 0x1f4f6, 0x1f506, 0x1f50c, 0x1f518, 0x1f530,
-    0x1f53e, 0x1f560, 0x1f57c, 0x1f58e, 0x1f59c, 0x1f5b8, 0x1f5c2, 0x1f5c4,
-    0x1f5c8, 0x1f5d0, 0x1f5de, 0x1f5e6, 0x1f5ec, 0x1f5fa, 0x1f60a, 0x1f612,
-    0x1f614, 0x1f622, 0x1f624, 0x1f628, 0x1f636, 0x1f642, 0x1f644, 0x1f648,
-    0x1f650, 0x1f65e, 0x1f666, 0x1f67a, 0x1f682, 0x1f684, 0x1f688, 0x1f690,
-    0x1f69e, 0x1f6a0, 0x1f6bc, 0x1f6cc, 0x1f6f2, 0x1f6f4, 0x1f71a, 0x1f72e,
-    0x1f732, 0x1f734, 0x1f74e, 0x1f75c, 0x1f762, 0x1f764, 0x1f768, 0x1f776,
-    0x1f796, 0x1f7a6, 0x1f7ac, 0x1f7ba, 0x1f7d2, 0x1f7d4, 0x1f89a, 0x1f8ae,
-    0x1f8b2, 0x1f8b4, 0x1f8d6, 0x1f8ea, 0x1f91a, 0x1f92e, 0x1f932, 0x1f934,
-    0x1f94e, 0x1f95c, 0x1f962, 0x1f964, 0x1f968, 0x1f976, 0x1f996, 0x1f9a6,
-    0x1f9ac, 0x1f9ba, 0x1f9ca, 0x1f9d2, 0x1f9d4, 0x1fa1a, 0x1fa2e, 0x1fa32,
-    0x1fa34, 0x1fa4e, 0x1fa5c, 0x1fa62, 0x1fa64, 0x1fa68, 0x1fa76, 0x1fa8e,
-    0x1fa9c, 0x1fab8, 0x1fac2, 0x1fac4, 0x1fac8, 0x1fad0, 0x1fade, 0x1fae6,
-    0x1faec, 0x1fb16, 0x1fb26, 0x1fb2c, 0x1fb3a, 0x1fb46, 0x1fb4c, 0x1fb58,
-    0x1fb6e, 0x1fb72, 0x1fb74, 0x1fb8a, 0x1fb92, 0x1fb94, 0x1fba2, 0x1fba4,
-    0x1fba8, 0x1fbb6, 0x1fbda};
-
-const uint16_t CBC_PDF417Common::CODEWORD_TABLE[] = {
-    2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773,
-    902,  896,  908,  868,  865,  861,  859,  2511, 873,  871,  1780, 835,
-    2493, 825,  2491, 842,  837,  844,  1764, 1762, 811,  810,  809,  2483,
-    807,  2482, 806,  2480, 815,  814,  813,  812,  2484, 817,  816,  1745,
-    1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752,
-    2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780,
-    787,  781,  747,  739,  736,  2413, 754,  752,  1719, 692,  689,  681,
-    2371, 678,  2369, 700,  697,  694,  703,  1688, 1686, 642,  638,  2343,
-    631,  2341, 627,  2338, 651,  646,  643,  2345, 654,  652,  1652, 1650,
-    1647, 1654, 601,  599,  2322, 596,  2321, 594,  2319, 2317, 611,  610,
-    608,  606,  2324, 603,  2323, 615,  614,  612,  1617, 1616, 1614, 1612,
-    616,  1619, 1618, 2575, 2538, 2536, 905,  901,  898,  909,  2509, 2507,
-    2504, 870,  867,  864,  860,  2512, 875,  872,  1781, 2490, 2489, 2487,
-    2485, 1748, 836,  834,  832,  830,  2494, 827,  2492, 843,  841,  839,
-    845,  1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631,
-    2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735,
-    2733, 2731, 1848, 2740, 2738, 2786, 2784, 591,  588,  576,  569,  566,
-    2296, 1590, 537,  534,  526,  2276, 522,  2274, 545,  542,  539,  548,
-    1572, 1570, 481,  2245, 466,  2242, 462,  2239, 492,  485,  482,  2249,
-    496,  494,  1534, 1531, 1528, 1538, 413,  2196, 406,  2191, 2188, 425,
-    419,  2202, 415,  2199, 432,  430,  427,  1472, 1467, 1464, 433,  1476,
-    1474, 368,  367,  2160, 365,  2159, 362,  2157, 2155, 2152, 378,  377,
-    375,  2166, 372,  2165, 369,  2162, 383,  381,  379,  2168, 1419, 1418,
-    1416, 1414, 385,  1411, 384,  1423, 1422, 1420, 1424, 2461, 802,  2441,
-    2439, 790,  786,  783,  794,  2409, 2406, 2403, 750,  742,  738,  2414,
-    756,  753,  1720, 2367, 2365, 2362, 2359, 1663, 693,  691,  684,  2373,
-    680,  2370, 702,  699,  696,  704,  1690, 1687, 2337, 2336, 2334, 2332,
-    1624, 2329, 1622, 640,  637,  2344, 634,  2342, 630,  2340, 650,  648,
-    645,  2346, 655,  653,  1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571,
-    2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907,  904,  900,
-    910,  2503, 2502, 2500, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869,
-    866,  863,  2513, 876,  874,  1782, 2720, 2713, 2711, 2697, 2694, 2691,
-    2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823,
-    2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849,
-    2751, 2749, 2747, 2754, 353,  2148, 344,  342,  336,  2142, 332,  2140,
-    345,  1375, 1373, 306,  2130, 299,  2128, 295,  2125, 319,  314,  311,
-    2132, 1354, 1352, 1349, 1356, 262,  257,  2101, 253,  2096, 2093, 274,
-    273,  267,  2107, 263,  2104, 280,  278,  275,  1316, 1311, 1308, 1320,
-    1318, 2052, 202,  2050, 2044, 2040, 219,  2063, 212,  2060, 208,  2055,
-    224,  221,  2066, 1260, 1258, 1252, 231,  1248, 229,  1266, 1264, 1261,
-    1268, 155,  1998, 153,  1996, 1994, 1991, 1988, 165,  164,  2007, 162,
-    2006, 159,  2003, 2000, 172,  171,  169,  2012, 166,  2010, 1186, 1184,
-    1182, 1179, 175,  1176, 173,  1192, 1191, 1189, 1187, 176,  1194, 1193,
-    2313, 2307, 2305, 592,  589,  2294, 2292, 2289, 578,  572,  568,  2297,
-    580,  1591, 2272, 2267, 2264, 1547, 538,  536,  529,  2278, 525,  2275,
-    547,  544,  541,  1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478,
-    2247, 470,  2244, 465,  2241, 493,  488,  484,  2250, 498,  495,  1536,
-    1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427,
-    414,  412,  2197, 409,  2195, 405,  2193, 2190, 426,  424,  421,  2203,
-    418,  2201, 431,  429,  1473, 1471, 1469, 1466, 434,  1477, 1475, 2478,
-    2472, 2470, 2459, 2457, 2454, 2462, 803,  2437, 2432, 2429, 1726, 2443,
-    2440, 792,  789,  785,  2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408,
-    2405, 745,  741,  2415, 758,  755,  1721, 2358, 2357, 2355, 2353, 1661,
-    2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690,  687,  2374,
-    683,  2372, 701,  698,  705,  1691, 1689, 2619, 2617, 2610, 2608, 2605,
-    2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551,
-    1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785,
-    2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906,  903,  911,
-    2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826,
-    1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854,
-    1853, 1851, 1856, 2766, 2764, 143,  1987, 139,  1986, 135,  133,  131,
-    1984, 128,  1983, 125,  1981, 138,  137,  136,  1985, 1133, 1132, 1130,
-    112,  110,  1974, 107,  1973, 104,  1971, 1969, 122,  121,  119,  117,
-    1977, 114,  1976, 124,  1115, 1114, 1112, 1110, 1117, 1116, 84,   83,
-    1953, 81,   1952, 78,   1950, 1948, 1945, 94,   93,   91,   1959, 88,
-    1958, 85,   1955, 99,   97,   95,   1961, 1086, 1085, 1083, 1081, 1078,
-    100,  1090, 1089, 1087, 1091, 49,   47,   1917, 44,   1915, 1913, 1910,
-    1907, 59,   1926, 56,   1925, 53,   1922, 1919, 66,   64,   1931, 61,
-    1929, 1042, 1040, 1038, 71,   1035, 70,   1032, 68,   1048, 1047, 1045,
-    1043, 1050, 1049, 12,   10,   1869, 1867, 1864, 1861, 21,   1880, 19,
-    1877, 1874, 1871, 28,   1888, 25,   1886, 22,   1883, 982,  980,  977,
-    974,  32,   30,   991,  989,  987,  984,  34,   995,  994,  992,  2151,
-    2150, 2147, 2146, 2144, 356,  355,  354,  2149, 2139, 2138, 2136, 2134,
-    1359, 343,  341,  338,  2143, 335,  2141, 348,  347,  346,  1376, 1374,
-    2124, 2123, 2121, 2119, 1326, 2116, 1324, 310,  308,  305,  2131, 302,
-    2129, 298,  2127, 320,  318,  316,  313,  2133, 322,  321,  1355, 1353,
-    1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259,
-    2102, 256,  2100, 252,  2098, 2095, 272,  269,  2108, 266,  2106, 281,
-    279,  277,  1317, 1315, 1313, 1310, 282,  1321, 1319, 2039, 2037, 2035,
-    2032, 1203, 2029, 1200, 1197, 207,  2053, 205,  2051, 201,  2049, 2046,
-    2043, 220,  218,  2064, 215,  2062, 211,  2059, 228,  226,  223,  2069,
-    1259, 1257, 1254, 232,  1251, 230,  1267, 1265, 1263, 2316, 2315, 2312,
-    2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590,  2288,
-    2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579,  577,  574,
-    571,  2298, 582,  581,  1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544,
-    2252, 1541, 2273, 2271, 2269, 2266, 1550, 535,  532,  2279, 528,  2277,
-    546,  543,  549,  1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214,
-    1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480,  477,  2248,
-    473,  2246, 469,  2243, 490,  487,  2251, 497,  1537, 1535, 1532, 2477,
-    2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452,
-    2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805,  804,  2428,
-    2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431,
-    1727, 2444, 2442, 793,  791,  788,  795,  2388, 2386, 2384, 1697, 2381,
-    1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412,
-    2410, 2407, 751,  748,  744,  2416, 759,  757,  1807, 2620, 2618, 1806,
-    1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587,
-    1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798,
-    2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840,
-    1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695,
-    2704, 1817, 1811, 1810, 897,  862,  1777, 829,  826,  838,  1760, 1758,
-    808,  2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782,  740,
-    737,  1715, 686,  679,  695,  1682, 1680, 639,  628,  2339, 647,  644,
-    1645, 1643, 1640, 1648, 602,  600,  597,  595,  2320, 593,  2318, 609,
-    607,  604,  1611, 1610, 1608, 1606, 613,  1615, 1613, 2328, 926,  924,
-    892,  886,  899,  857,  850,  2505, 1778, 824,  823,  821,  819,  2488,
-    818,  2486, 833,  831,  828,  840,  1761, 1759, 2649, 2632, 2630, 2746,
-    2734, 2732, 2782, 2781, 570,  567,  1587, 531,  527,  523,  540,  1566,
-    1564, 476,  467,  463,  2240, 486,  483,  1524, 1521, 1518, 1529, 411,
-    403,  2192, 399,  2189, 423,  416,  1462, 1457, 1454, 428,  1468, 1465,
-    2210, 366,  363,  2158, 360,  2156, 357,  2153, 376,  373,  370,  2163,
-    1410, 1409, 1407, 1405, 382,  1402, 380,  1417, 1415, 1412, 1421, 2175,
-    2174, 777,  774,  771,  784,  732,  725,  722,  2404, 743,  1716, 676,
-    674,  668,  2363, 665,  2360, 685,  1684, 1681, 626,  624,  622,  2335,
-    620,  2333, 617,  2330, 641,  635,  649,  1646, 1644, 1642, 2566, 928,
-    925,  2530, 2527, 894,  891,  888,  2501, 2499, 2496, 858,  856,  854,
-    851,  1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757,
-    2744, 2743, 2741, 2748, 352,  1382, 340,  337,  333,  1371, 1369, 307,
-    300,  296,  2126, 315,  312,  1347, 1342, 1350, 261,  258,  250,  2097,
-    246,  2094, 271,  268,  264,  1306, 1301, 1298, 276,  1312, 1309, 2115,
-    203,  2048, 195,  2045, 191,  2041, 213,  209,  2056, 1246, 1244, 1238,
-    225,  1234, 222,  1256, 1253, 1249, 1262, 2080, 2079, 154,  1997, 150,
-    1995, 147,  1992, 1989, 163,  160,  2004, 156,  2001, 1175, 1174, 1172,
-    1170, 1167, 170,  1164, 167,  1185, 1183, 1180, 1177, 174,  1190, 1188,
-    2025, 2024, 2022, 587,  586,  564,  559,  556,  2290, 573,  1588, 520,
-    518,  512,  2268, 508,  2265, 530,  1568, 1565, 461,  457,  2233, 450,
-    2230, 446,  2226, 479,  471,  489,  1526, 1523, 1520, 397,  395,  2185,
-    392,  2183, 389,  2180, 2177, 410,  2194, 402,  422,  1463, 1461, 1459,
-    1456, 1470, 2455, 799,  2433, 2430, 779,  776,  773,  2397, 2394, 2390,
-    734,  728,  724,  746,  1717, 2356, 2354, 2351, 2348, 1658, 677,  675,
-    673,  670,  667,  688,  1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552,
-    927,  2523, 2521, 2518, 2515, 1784, 2532, 895,  893,  890,  2718, 2709,
-    2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852,
-    2760, 2758, 142,  141,  1139, 1138, 134,  132,  129,  126,  1982, 1129,
-    1128, 1126, 1131, 113,  111,  108,  105,  1972, 101,  1970, 120,  118,
-    115,  1109, 1108, 1106, 1104, 123,  1113, 1111, 82,   79,   1951, 75,
-    1949, 72,   1946, 92,   89,   86,   1956, 1077, 1076, 1074, 1072, 98,
-    1069, 96,   1084, 1082, 1079, 1088, 1968, 1967, 48,   45,   1916, 42,
-    1914, 39,   1911, 1908, 60,   57,   54,   1923, 50,   1920, 1031, 1030,
-    1028, 1026, 67,   1023, 65,   1020, 62,   1041, 1039, 1036, 1033, 69,
-    1046, 1044, 1944, 1943, 1941, 11,   9,    1868, 7,    1865, 1862, 1859,
-    20,   1878, 16,   1875, 13,   1872, 970,  968,  966,  963,  29,   960,
-    26,   23,   983,  981,  978,  975,  33,   971,  31,   990,  988,  985,
-    1906, 1904, 1902, 993,  351,  2145, 1383, 331,  330,  328,  326,  2137,
-    323,  2135, 339,  1372, 1370, 294,  293,  291,  289,  2122, 286,  2120,
-    283,  2117, 309,  303,  317,  1348, 1346, 1344, 245,  244,  242,  2090,
-    239,  2088, 236,  2085, 2082, 260,  2099, 249,  270,  1307, 1305, 1303,
-    1300, 1314, 189,  2038, 186,  2036, 183,  2033, 2030, 2026, 206,  198,
-    2047, 194,  216,  1247, 1245, 1243, 1240, 227,  1237, 1255, 2310, 2302,
-    2300, 2286, 2284, 2281, 565,  563,  561,  558,  575,  1589, 2261, 2259,
-    2256, 2253, 1542, 521,  519,  517,  514,  2270, 511,  533,  1569, 1567,
-    2223, 2221, 2218, 2215, 1483, 2211, 1480, 459,  456,  453,  2232, 449,
-    474,  491,  1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801,
-    800,  2426, 2424, 2421, 2418, 1723, 2435, 780,  778,  775,  2387, 2385,
-    2382, 2379, 1695, 2375, 1693, 2396, 735,  733,  730,  727,  749,  1718,
-    2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, 1800, 2591, 2550,
-    2549, 2547, 2545, 1792, 2542, 1790, 2558, 929,  2719, 1841, 2710, 2708,
-    1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737,
-    1736, 1734, 1739, 1816, 1711, 1676, 1674, 633,  629,  1638, 1636, 1633,
-    1641, 598,  1605, 1604, 1602, 1600, 605,  1609, 1607, 2327, 887,  853,
-    1775, 822,  820,  1757, 1755, 1584, 524,  1560, 1558, 468,  464,  1514,
-    1511, 1508, 1519, 408,  404,  400,  1452, 1447, 1444, 417,  1458, 1455,
-    2208, 364,  361,  358,  2154, 1401, 1400, 1398, 1396, 374,  1393, 371,
-    1408, 1406, 1403, 1413, 2173, 2172, 772,  726,  723,  1712, 672,  669,
-    666,  682,  1678, 1675, 625,  623,  621,  618,  2331, 636,  632,  1639,
-    1637, 1635, 920,  918,  884,  880,  889,  849,  848,  847,  846,  2497,
-    855,  852,  1776, 2641, 2742, 2787, 1380, 334,  1367, 1365, 301,  297,
-    1340, 1338, 1335, 1343, 255,  251,  247,  1296, 1291, 1288, 265,  1302,
-    1299, 2113, 204,  196,  192,  2042, 1232, 1230, 1224, 214,  1220, 210,
-    1242, 1239, 1235, 1250, 2077, 2075, 151,  148,  1993, 144,  1990, 1163,
-    1162, 1160, 1158, 1155, 161,  1152, 157,  1173, 1171, 1168, 1165, 168,
-    1181, 1178, 2021, 2020, 2018, 2023, 585,  560,  557,  1585, 516,  509,
-    1562, 1559, 458,  447,  2227, 472,  1516, 1513, 1510, 398,  396,  393,
-    390,  2181, 386,  2178, 407,  1453, 1451, 1449, 1446, 420,  1460, 2209,
-    769,  764,  720,  712,  2391, 729,  1713, 664,  663,  661,  659,  2352,
-    656,  2349, 671,  1679, 1677, 2553, 922,  919,  2519, 2516, 885,  883,
-    881,  2685, 2661, 2659, 2767, 2756, 2755, 140,  1137, 1136, 130,  127,
-    1125, 1124, 1122, 1127, 109,  106,  102,  1103, 1102, 1100, 1098, 116,
-    1107, 1105, 1980, 80,   76,   73,   1947, 1068, 1067, 1065, 1063, 90,
-    1060, 87,   1075, 1073, 1070, 1080, 1966, 1965, 46,   43,   40,   1912,
-    36,   1909, 1019, 1018, 1016, 1014, 58,   1011, 55,   1008, 51,   1029,
-    1027, 1024, 1021, 63,   1037, 1034, 1940, 1939, 1937, 1942, 8,    1866,
-    4,    1863, 1,    1860, 956,  954,  952,  949,  946,  17,   14,   969,
-    967,  964,  961,  27,   957,  24,   979,  976,  972,  1901, 1900, 1898,
-    1896, 986,  1905, 1903, 350,  349,  1381, 329,  327,  324,  1368, 1366,
-    292,  290,  287,  284,  2118, 304,  1341, 1339, 1337, 1345, 243,  240,
-    237,  2086, 233,  2083, 254,  1297, 1295, 1293, 1290, 1304, 2114, 190,
-    187,  184,  2034, 180,  2031, 177,  2027, 199,  1233, 1231, 1229, 1226,
-    217,  1223, 1241, 2078, 2076, 584,  555,  554,  552,  550,  2282, 562,
-    1586, 507,  506,  504,  502,  2257, 499,  2254, 515,  1563, 1561, 445,
-    443,  441,  2219, 438,  2216, 435,  2212, 460,  454,  475,  1517, 1515,
-    1512, 2447, 798,  797,  2422, 2419, 770,  768,  766,  2383, 2380, 2376,
-    721,  719,  717,  714,  731,  1714, 2602, 2582, 2580, 2548, 2546, 2543,
-    923,  921,  2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733,
-    1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599,
-    1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552,
-    1504, 1501, 1498, 1509, 1442, 1437, 1434, 401,  1448, 1445, 2206, 1392,
-    1391, 1389, 1387, 1384, 359,  1399, 1397, 1394, 1404, 2171, 2170, 1708,
-    1672, 1669, 619,  1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328,
-    1336, 1286, 1281, 1278, 248,  1292, 1289, 2111, 1218, 1216, 1210, 197,
-    1206, 193,  1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146,
-    152,  1143, 149,  1140, 145,  1161, 1159, 1156, 1153, 158,  1169, 1166,
-    2017, 2016, 2014, 2019, 1582, 510,  1556, 1553, 452,  448,  1506, 1500,
-    394,  391,  387,  1443, 1441, 1439, 1436, 1450, 2207, 765,  716,  713,
-    1709, 662,  660,  657,  1673, 1671, 916,  914,  879,  878,  877,  882,
-    1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103,  1101,
-    1099, 1979, 1059, 1058, 1056, 1054, 77,   1051, 74,   1066, 1064, 1061,
-    1071, 1964, 1963, 1007, 1006, 1004, 1002, 999,  41,   996,  37,   1017,
-    1015, 1012, 1009, 52,   1025, 1022, 1936, 1935, 1933, 1938, 942,  940,
-    938,  935,  932,  5,    2,    955,  953,  950,  947,  18,   943,  15,
-    965,  962,  958,  1895, 1894, 1892, 1890, 973,  1899, 1897, 1379, 325,
-    1364, 1362, 288,  285,  1334, 1332, 1330, 241,  238,  234,  1287, 1285,
-    1283, 1280, 1294, 2112, 188,  185,  181,  178,  2028, 1219, 1217, 1215,
-    1212, 200,  1209, 1227, 2074, 2072, 583,  553,  551,  1583, 505,  503,
-    500,  513,  1557, 1555, 444,  442,  439,  436,  2213, 455,  451,  1507,
-    1505, 1502, 796,  763,  762,  760,  767,  711,  710,  708,  706,  2377,
-    718,  715,  1710, 2544, 917,  915,  2681, 1627, 1597, 1595, 2325, 1769,
-    1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167,
-    1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214,
-    1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146,  1157, 1154, 2013,
-    2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425,
-    388,  1440, 2205, 1705, 658,  1667, 1664, 1119, 1095, 1093, 1978, 1057,
-    1055, 1052, 1062, 1962, 1960, 1005, 1003, 1000, 997,  38,   1013, 1010,
-    1932, 1930, 1927, 1934, 941,  939,  936,  933,  6,    930,  3,    951,
-    948,  944,  1889, 1887, 1884, 1881, 959,  1893, 1891, 35,   1377, 1360,
-    1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235,  1284, 2110,
-    1205, 1204, 1201, 1198, 182,  1195, 179,  1213, 2070, 2067, 1580, 501,
-    1551, 1548, 440,  437,  1497, 1494, 1490, 1503, 761,  709,  707,  1706,
-    913,  912,  2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054,
-    1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659,
-    1656, 1975, 1053, 1957, 1954, 1001, 998,  1924, 1921, 1918, 1928, 937,
-    934,  931,  1879, 1876, 1873, 1870, 945,  1885, 1882, 1323, 1273, 1270,
-    2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481,
-    1478, 1491, 1700};
-
-CBC_PDF417Common::CBC_PDF417Common() {}
-CBC_PDF417Common::~CBC_PDF417Common() {}
-int32_t CBC_PDF417Common::getBitCountSum(CFX_Int32Array& moduleBitCount) {
-  int32_t bitCountSum = 0;
-  for (int32_t i = 0; i < moduleBitCount.GetSize(); i++) {
-    int32_t count = moduleBitCount.GetAt(i);
-    bitCountSum += count;
-  }
-  return bitCountSum;
-}
-int32_t CBC_PDF417Common::getCodeword(uint32_t symbol) {
-  uint32_t sym = symbol & 0x3FFFF;
-  int32_t i = findCodewordIndex(sym);
-  if (i == -1) {
-    return -1;
-  }
-  return (CODEWORD_TABLE[i] - 1) % NUMBER_OF_CODEWORDS;
-}
-int32_t CBC_PDF417Common::findCodewordIndex(uint32_t symbol) {
-  int32_t first = 0;
-  int32_t upto = sizeof(SYMBOL_TABLE) / sizeof(SYMBOL_TABLE[0]);
-  while (first < upto) {
-    int32_t mid = ((uint32_t)(first + upto)) >> 1;
-    if (symbol < (uint32_t)SYMBOL_TABLE[mid]) {
-      upto = mid;
-    } else if (symbol > (uint32_t)SYMBOL_TABLE[mid]) {
-      first = mid + 1;
-    } else {
-      return mid;
-    }
-  }
-  return -1;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/fxbarcode/pdf417/BC_PDF417Common.h
deleted file mode 100644
index 490507285b..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Common.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_PDF417Common {
- public:
-  CBC_PDF417Common();
-  virtual ~CBC_PDF417Common();
-
-  static int32_t getBitCountSum(CFX_Int32Array& moduleBitCount);
-  static int32_t getCodeword(uint32_t symbol);
-  static const int32_t NUMBER_OF_CODEWORDS = 929;
-  static const int32_t MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1;
-  static const int32_t MIN_ROWS_IN_BARCODE = 3;
-  static const int32_t MAX_ROWS_IN_BARCODE = 90;
-  static const int32_t MAX_CODEWORDS_IN_ROW = 32;
-  static const int32_t MODULES_IN_CODEWORD = 17;
-  static const int32_t MODULES_IN_STOP_PATTERN = 18;
-  static const int32_t BARS_IN_MODULE = 8;
-  static const int32_t SYMBOL_TABLE[];
-  static const uint16_t CODEWORD_TABLE[];
-
- private:
-  static CFX_Int32Array* EMPTY_INT_ARRAY;
-  static int32_t findCodewordIndex(uint32_t symbol);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
deleted file mode 100644
index 30632a494a..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-
-#include <stdlib.h>
-
-#include "third_party/bigint/BigIntegerLibrary.hh"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
-#include "xfa/fxbarcode/utils.h"
-
-#define TEXT_COMPACTION_MODE_LATCH 900
-#define BYTE_COMPACTION_MODE_LATCH 901
-#define NUMERIC_COMPACTION_MODE_LATCH 902
-#define BYTE_COMPACTION_MODE_LATCH_6 924
-#define BEGIN_MACRO_PDF417_CONTROL_BLOCK 928
-#define BEGIN_MACRO_PDF417_OPTIONAL_FIELD 923
-#define MACRO_PDF417_TERMINATOR 922
-#define MODE_SHIFT_TO_BYTE_COMPACTION_MODE 913
-
-int32_t CBC_DecodedBitStreamPaser::MAX_NUMERIC_CODEWORDS = 15;
-int32_t CBC_DecodedBitStreamPaser::NUMBER_OF_SEQUENCE_CODEWORDS = 2;
-int32_t CBC_DecodedBitStreamPaser::PL = 25;
-int32_t CBC_DecodedBitStreamPaser::LL = 27;
-int32_t CBC_DecodedBitStreamPaser::AS = 27;
-int32_t CBC_DecodedBitStreamPaser::ML = 28;
-int32_t CBC_DecodedBitStreamPaser::AL = 28;
-int32_t CBC_DecodedBitStreamPaser::PS = 29;
-int32_t CBC_DecodedBitStreamPaser::PAL = 29;
-FX_CHAR CBC_DecodedBitStreamPaser::PUNCT_CHARS[29] = {
-    ';', '<',  '>',  '@', '[', '\\', '}', '_', '`', '~',
-    '!', '\r', '\t', ',', ':', '\n', '-', '.', '$', '/',
-    '"', '|',  '*',  '(', ')', '?',  '{', '}', '\''};
-FX_CHAR CBC_DecodedBitStreamPaser::MIXED_CHARS[30] = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '&', '\r', '\t',
-    ',', ':', '#', '-', '.', '$', '/', '+', '%', '*', '=', '^'};
-
-void CBC_DecodedBitStreamPaser::Initialize() {}
-void CBC_DecodedBitStreamPaser::Finalize() {}
-CBC_DecodedBitStreamPaser::CBC_DecodedBitStreamPaser() {}
-CBC_DecodedBitStreamPaser::~CBC_DecodedBitStreamPaser() {}
-CBC_CommonDecoderResult* CBC_DecodedBitStreamPaser::decode(
-    CFX_Int32Array& codewords,
-    CFX_ByteString ecLevel,
-    int32_t& e) {
-  CFX_ByteString result;
-  int32_t codeIndex = 1;
-  int32_t code = codewords.GetAt(codeIndex);
-  codeIndex++;
-  CBC_PDF417ResultMetadata* resultMetadata = new CBC_PDF417ResultMetadata;
-  while (codeIndex < codewords[0]) {
-    switch (code) {
-      case TEXT_COMPACTION_MODE_LATCH:
-        codeIndex = textCompaction(codewords, codeIndex, result);
-        break;
-      case BYTE_COMPACTION_MODE_LATCH:
-        codeIndex = byteCompaction(code, codewords, codeIndex, result);
-        break;
-      case NUMERIC_COMPACTION_MODE_LATCH:
-        codeIndex = numericCompaction(codewords, codeIndex, result, e);
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        break;
-      case MODE_SHIFT_TO_BYTE_COMPACTION_MODE:
-        codeIndex = byteCompaction(code, codewords, codeIndex, result);
-        break;
-      case BYTE_COMPACTION_MODE_LATCH_6:
-        codeIndex = byteCompaction(code, codewords, codeIndex, result);
-        break;
-      case BEGIN_MACRO_PDF417_CONTROL_BLOCK:
-        codeIndex = decodeMacroBlock(codewords, codeIndex, resultMetadata, e);
-        if (e != BCExceptionNO) {
-          delete resultMetadata;
-          return nullptr;
-        }
-        break;
-      default:
-        codeIndex--;
-        codeIndex = textCompaction(codewords, codeIndex, result);
-        break;
-    }
-    if (codeIndex < codewords.GetSize()) {
-      code = codewords[codeIndex++];
-    } else {
-      e = BCExceptionFormatInstance;
-      delete resultMetadata;
-      return nullptr;
-    }
-  }
-  if (result.GetLength() == 0) {
-    e = BCExceptionFormatInstance;
-    delete resultMetadata;
-    return nullptr;
-  }
-  CFX_ByteArray rawBytes;
-  CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
-  tempCd->Init(rawBytes, result, ecLevel, e);
-  if (e != BCExceptionNO) {
-    delete resultMetadata;
-    return nullptr;
-  }
-  tempCd->setOther(resultMetadata);
-  return tempCd;
-}
-int32_t CBC_DecodedBitStreamPaser::decodeMacroBlock(
-    CFX_Int32Array& codewords,
-    int32_t codeIndex,
-    CBC_PDF417ResultMetadata* resultMetadata,
-    int32_t& e) {
-  if (codeIndex + NUMBER_OF_SEQUENCE_CODEWORDS > codewords[0]) {
-    e = BCExceptionFormatInstance;
-    return -1;
-  }
-  CFX_Int32Array segmentIndexArray;
-  segmentIndexArray.SetSize(NUMBER_OF_SEQUENCE_CODEWORDS);
-  for (int32_t i = 0; i < NUMBER_OF_SEQUENCE_CODEWORDS; i++, codeIndex++) {
-    segmentIndexArray.SetAt(i, codewords[codeIndex]);
-  }
-  CFX_ByteString str =
-      decodeBase900toBase10(segmentIndexArray, NUMBER_OF_SEQUENCE_CODEWORDS, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-  resultMetadata->setSegmentIndex(atoi(str.GetBuffer(str.GetLength())));
-  CFX_ByteString fileId;
-  codeIndex = textCompaction(codewords, codeIndex, fileId);
-  resultMetadata->setFileId(fileId);
-  if (codewords[codeIndex] == BEGIN_MACRO_PDF417_OPTIONAL_FIELD) {
-    codeIndex++;
-    CFX_Int32Array additionalOptionCodeWords;
-    additionalOptionCodeWords.SetSize(codewords[0] - codeIndex);
-    int32_t additionalOptionCodeWordsIndex = 0;
-    FX_BOOL end = FALSE;
-    while ((codeIndex < codewords[0]) && !end) {
-      int32_t code = codewords[codeIndex++];
-      if (code < TEXT_COMPACTION_MODE_LATCH) {
-        additionalOptionCodeWords[additionalOptionCodeWordsIndex++] = code;
-      } else {
-        switch (code) {
-          case MACRO_PDF417_TERMINATOR:
-            resultMetadata->setLastSegment(TRUE);
-            codeIndex++;
-            end = TRUE;
-            break;
-          default:
-            e = BCExceptionFormatInstance;
-            return -1;
-        }
-      }
-    }
-    CFX_Int32Array array;
-    array.SetSize(additionalOptionCodeWordsIndex);
-    array.Copy(additionalOptionCodeWords);
-    resultMetadata->setOptionalData(array);
-  } else if (codewords[codeIndex] == MACRO_PDF417_TERMINATOR) {
-    resultMetadata->setLastSegment(TRUE);
-    codeIndex++;
-  }
-  return codeIndex;
-}
-int32_t CBC_DecodedBitStreamPaser::textCompaction(CFX_Int32Array& codewords,
-                                                  int32_t codeIndex,
-                                                  CFX_ByteString& result) {
-  CFX_Int32Array textCompactionData;
-  textCompactionData.SetSize((codewords[0] - codeIndex) << 1);
-  CFX_Int32Array byteCompactionData;
-  byteCompactionData.SetSize((codewords[0] - codeIndex) << 1);
-  int32_t index = 0;
-  FX_BOOL end = FALSE;
-  while ((codeIndex < codewords[0]) && !end) {
-    int32_t code = codewords[codeIndex++];
-    if (code < TEXT_COMPACTION_MODE_LATCH) {
-      textCompactionData[index] = code / 30;
-      textCompactionData[index + 1] = code % 30;
-      index += 2;
-    } else {
-      switch (code) {
-        case TEXT_COMPACTION_MODE_LATCH:
-          textCompactionData[index++] = TEXT_COMPACTION_MODE_LATCH;
-          break;
-        case BYTE_COMPACTION_MODE_LATCH:
-          codeIndex--;
-          end = TRUE;
-          break;
-        case NUMERIC_COMPACTION_MODE_LATCH:
-          codeIndex--;
-          end = TRUE;
-          break;
-        case BEGIN_MACRO_PDF417_CONTROL_BLOCK:
-          codeIndex--;
-          end = TRUE;
-          break;
-        case BEGIN_MACRO_PDF417_OPTIONAL_FIELD:
-          codeIndex--;
-          end = TRUE;
-          break;
-        case MACRO_PDF417_TERMINATOR:
-          codeIndex--;
-          end = TRUE;
-          break;
-        case MODE_SHIFT_TO_BYTE_COMPACTION_MODE:
-          textCompactionData[index] = MODE_SHIFT_TO_BYTE_COMPACTION_MODE;
-          code = codewords[codeIndex++];
-          byteCompactionData[index] = code;
-          index++;
-          break;
-        case BYTE_COMPACTION_MODE_LATCH_6:
-          codeIndex--;
-          end = TRUE;
-          break;
-      }
-    }
-  }
-  decodeTextCompaction(textCompactionData, byteCompactionData, index, result);
-  return codeIndex;
-}
-void CBC_DecodedBitStreamPaser::decodeTextCompaction(
-    CFX_Int32Array& textCompactionData,
-    CFX_Int32Array& byteCompactionData,
-    int32_t length,
-    CFX_ByteString& result) {
-  Mode subMode = ALPHA;
-  Mode priorToShiftMode = ALPHA;
-  int32_t i = 0;
-  while (i < length) {
-    int32_t subModeCh = textCompactionData[i];
-    FX_CHAR ch = 0;
-    switch (subMode) {
-      case ALPHA:
-        if (subModeCh < 26) {
-          ch = (FX_CHAR)('A' + subModeCh);
-        } else {
-          if (subModeCh == 26) {
-            ch = ' ';
-          } else if (subModeCh == LL) {
-            subMode = LOWER;
-          } else if (subModeCh == ML) {
-            subMode = MIXED;
-          } else if (subModeCh == PS) {
-            priorToShiftMode = subMode;
-            subMode = PUNCT_SHIFT;
-          } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) {
-            result += (FX_CHAR)byteCompactionData[i];
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-      case LOWER:
-        if (subModeCh < 26) {
-          ch = (FX_CHAR)('a' + subModeCh);
-        } else {
-          if (subModeCh == 26) {
-            ch = ' ';
-          } else if (subModeCh == AS) {
-            priorToShiftMode = subMode;
-            subMode = ALPHA_SHIFT;
-          } else if (subModeCh == ML) {
-            subMode = MIXED;
-          } else if (subModeCh == PS) {
-            priorToShiftMode = subMode;
-            subMode = PUNCT_SHIFT;
-          } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) {
-            result += (FX_CHAR)byteCompactionData[i];
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-      case MIXED:
-        if (subModeCh < PL) {
-          ch = MIXED_CHARS[subModeCh];
-        } else {
-          if (subModeCh == PL) {
-            subMode = PUNCT;
-          } else if (subModeCh == 26) {
-            ch = ' ';
-          } else if (subModeCh == LL) {
-            subMode = LOWER;
-          } else if (subModeCh == AL) {
-            subMode = ALPHA;
-          } else if (subModeCh == PS) {
-            priorToShiftMode = subMode;
-            subMode = PUNCT_SHIFT;
-          } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) {
-            result += (FX_CHAR)byteCompactionData[i];
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-      case PUNCT:
-        if (subModeCh < PAL) {
-          ch = PUNCT_CHARS[subModeCh];
-        } else {
-          if (subModeCh == PAL) {
-            subMode = ALPHA;
-          } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) {
-            result += (FX_CHAR)byteCompactionData[i];
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-      case ALPHA_SHIFT:
-        subMode = priorToShiftMode;
-        if (subModeCh < 26) {
-          ch = (FX_CHAR)('A' + subModeCh);
-        } else {
-          if (subModeCh == 26) {
-            ch = ' ';
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-      case PUNCT_SHIFT:
-        subMode = priorToShiftMode;
-        if (subModeCh < PAL) {
-          ch = PUNCT_CHARS[subModeCh];
-        } else {
-          if (subModeCh == PAL) {
-            subMode = ALPHA;
-          } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) {
-            result += (FX_CHAR)byteCompactionData[i];
-          } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) {
-            subMode = ALPHA;
-          }
-        }
-        break;
-    }
-    if (ch != 0) {
-      result += ch;
-    }
-    i++;
-  }
-}
-int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
-                                                  CFX_Int32Array& codewords,
-                                                  int32_t codeIndex,
-                                                  CFX_ByteString& result) {
-  if (mode == BYTE_COMPACTION_MODE_LATCH) {
-    int32_t count = 0;
-    int64_t value = 0;
-    uint16_t* decodedData = FX_Alloc(uint16_t, 6);
-    CFX_Int32Array byteCompactedCodewords;
-    byteCompactedCodewords.SetSize(6);
-    FX_BOOL end = FALSE;
-    int32_t nextCode = codewords[codeIndex++];
-    while ((codeIndex < codewords[0]) && !end) {
-      byteCompactedCodewords[count++] = nextCode;
-      value = 900 * value + nextCode;
-      nextCode = codewords[codeIndex++];
-      if (nextCode == TEXT_COMPACTION_MODE_LATCH ||
-          nextCode == BYTE_COMPACTION_MODE_LATCH ||
-          nextCode == NUMERIC_COMPACTION_MODE_LATCH ||
-          nextCode == BYTE_COMPACTION_MODE_LATCH_6 ||
-          nextCode == BEGIN_MACRO_PDF417_CONTROL_BLOCK ||
-          nextCode == BEGIN_MACRO_PDF417_OPTIONAL_FIELD ||
-          nextCode == MACRO_PDF417_TERMINATOR) {
-        codeIndex--;
-        end = TRUE;
-      } else {
-        if ((count % 5 == 0) && (count > 0)) {
-          int32_t j = 0;
-          for (; j < 6; ++j) {
-            decodedData[5 - j] = (uint16_t)(value % 256);
-            value >>= 8;
-          }
-          for (j = 0; j < 6; ++j) {
-            result += (FX_CHAR)decodedData[j];
-          }
-          count = 0;
-        }
-      }
-    }
-    FX_Free(decodedData);
-    if (codeIndex == codewords[0] && nextCode < TEXT_COMPACTION_MODE_LATCH) {
-      byteCompactedCodewords[count++] = nextCode;
-    }
-    for (int32_t i = 0; i < count; i++) {
-      result += (FX_CHAR)(uint16_t)byteCompactedCodewords[i];
-    }
-  } else if (mode == BYTE_COMPACTION_MODE_LATCH_6) {
-    int32_t count = 0;
-    int64_t value = 0;
-    FX_BOOL end = FALSE;
-    while (codeIndex < codewords[0] && !end) {
-      int32_t code = codewords[codeIndex++];
-      if (code < TEXT_COMPACTION_MODE_LATCH) {
-        count++;
-        value = 900 * value + code;
-      } else {
-        if (code == TEXT_COMPACTION_MODE_LATCH ||
-            code == BYTE_COMPACTION_MODE_LATCH ||
-            code == NUMERIC_COMPACTION_MODE_LATCH ||
-            code == BYTE_COMPACTION_MODE_LATCH_6 ||
-            code == BEGIN_MACRO_PDF417_CONTROL_BLOCK ||
-            code == BEGIN_MACRO_PDF417_OPTIONAL_FIELD ||
-            code == MACRO_PDF417_TERMINATOR) {
-          codeIndex--;
-          end = TRUE;
-        }
-      }
-      if ((count % 5 == 0) && (count > 0)) {
-        uint16_t* decodedData = FX_Alloc(uint16_t, 6);
-        int32_t j = 0;
-        for (; j < 6; ++j) {
-          decodedData[5 - j] = (uint16_t)(value & 0xFF);
-          value >>= 8;
-        }
-        for (j = 0; j < 6; ++j) {
-          result += (FX_CHAR)decodedData[j];
-        }
-        count = 0;
-        FX_Free(decodedData);
-      }
-    }
-  }
-  return codeIndex;
-}
-int32_t CBC_DecodedBitStreamPaser::numericCompaction(CFX_Int32Array& codewords,
-                                                     int32_t codeIndex,
-                                                     CFX_ByteString& result,
-                                                     int32_t& e) {
-  int32_t count = 0;
-  FX_BOOL end = FALSE;
-  CFX_Int32Array numericCodewords;
-  numericCodewords.SetSize(MAX_NUMERIC_CODEWORDS);
-  while (codeIndex < codewords[0] && !end) {
-    int32_t code = codewords[codeIndex++];
-    if (codeIndex == codewords[0]) {
-      end = TRUE;
-    }
-    if (code < TEXT_COMPACTION_MODE_LATCH) {
-      numericCodewords[count] = code;
-      count++;
-    } else {
-      if (code == TEXT_COMPACTION_MODE_LATCH ||
-          code == BYTE_COMPACTION_MODE_LATCH ||
-          code == BYTE_COMPACTION_MODE_LATCH_6 ||
-          code == BEGIN_MACRO_PDF417_CONTROL_BLOCK ||
-          code == BEGIN_MACRO_PDF417_OPTIONAL_FIELD ||
-          code == MACRO_PDF417_TERMINATOR) {
-        codeIndex--;
-        end = TRUE;
-      }
-    }
-    if (count % MAX_NUMERIC_CODEWORDS == 0 ||
-        code == NUMERIC_COMPACTION_MODE_LATCH || end) {
-      CFX_ByteString s = decodeBase900toBase10(numericCodewords, count, e);
-      BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-      result += s;
-      count = 0;
-    }
-  }
-  return codeIndex;
-}
-CFX_ByteString CBC_DecodedBitStreamPaser::decodeBase900toBase10(
-    CFX_Int32Array& codewords,
-    int32_t count,
-    int32_t& e) {
-  BigInteger result = 0;
-  BigInteger nineHundred(900);
-  for (int32_t i = 0; i < count; i++) {
-    result = result * nineHundred + BigInteger(codewords[i]);
-  }
-  CFX_ByteString resultString(bigIntegerToString(result).c_str());
-  if (resultString.GetAt(0) != '1') {
-    e = BCExceptionFormatInstance;
-    return ' ';
-  }
-  return resultString.Mid(1, resultString.GetLength() - 1);
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
deleted file mode 100644
index e32103e27c..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_string.h"
-
-class CBC_CommonDecoderResult;
-class CBC_PDF417ResultMetadata;
-
-class CBC_DecodedBitStreamPaser {
- public:
-  CBC_DecodedBitStreamPaser();
-  virtual ~CBC_DecodedBitStreamPaser();
-
-  static void Initialize();
-  static void Finalize();
-  static CBC_CommonDecoderResult* decode(CFX_Int32Array& codewords,
-                                         CFX_ByteString ecLevel,
-                                         int32_t& e);
-
- private:
-  enum Mode { ALPHA, LOWER, MIXED, PUNCT, ALPHA_SHIFT, PUNCT_SHIFT };
-  static int32_t MAX_NUMERIC_CODEWORDS;
-  static int32_t PL;
-  static int32_t LL;
-  static int32_t AS;
-  static int32_t ML;
-  static int32_t AL;
-  static int32_t PS;
-  static int32_t PAL;
-  static FX_CHAR PUNCT_CHARS[29];
-  static FX_CHAR MIXED_CHARS[30];
-  static int32_t NUMBER_OF_SEQUENCE_CODEWORDS;
-  static int32_t decodeMacroBlock(CFX_Int32Array& codewords,
-                                  int32_t codeIndex,
-                                  CBC_PDF417ResultMetadata* resultMetadata,
-                                  int32_t& e);
-  static int32_t textCompaction(CFX_Int32Array& codewords,
-                                int32_t codeIndex,
-                                CFX_ByteString& result);
-  static void decodeTextCompaction(CFX_Int32Array& textCompactionData,
-                                   CFX_Int32Array& byteCompactionData,
-                                   int32_t length,
-                                   CFX_ByteString& result);
-  static int32_t byteCompaction(int32_t mode,
-                                CFX_Int32Array& codewords,
-                                int32_t codeIndex,
-                                CFX_ByteString& result);
-  static int32_t numericCompaction(CFX_Int32Array& codewords,
-                                   int32_t codeIndex,
-                                   CFX_ByteString& result,
-                                   int32_t& e);
-  static CFX_ByteString decodeBase900toBase10(CFX_Int32Array& codewords,
-                                              int32_t count,
-                                              int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
deleted file mode 100644
index ef19370a74..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Codeword.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
-
-int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2;
-
-CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata,
-                                         CBC_BoundingBox* boundingBox) {
-  m_barcodeMetadata = barcodeMetadata;
-  m_barcodeColumnCount = barcodeMetadata->getColumnCount();
-  m_boundingBox = boundingBox;
-  m_detectionResultColumns.SetSize(m_barcodeColumnCount + 2);
-  for (int32_t i = 0; i < m_barcodeColumnCount + 2; i++)
-    m_detectionResultColumns[i] = nullptr;
-}
-
-CBC_DetectionResult::~CBC_DetectionResult() {
-  delete m_boundingBox;
-  delete m_barcodeMetadata;
-}
-
-CFX_ArrayTemplate<CBC_DetectionResultColumn*>&
-CBC_DetectionResult::getDetectionResultColumns() {
-  adjustIndicatorColumnRowNumbers(m_detectionResultColumns.GetAt(0));
-  adjustIndicatorColumnRowNumbers(
-      m_detectionResultColumns.GetAt(m_barcodeColumnCount + 1));
-  int32_t unadjustedCodewordCount = CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE;
-  int32_t previousUnadjustedCount;
-  do {
-    previousUnadjustedCount = unadjustedCodewordCount;
-    unadjustedCodewordCount = adjustRowNumbers();
-  } while (unadjustedCodewordCount > 0 &&
-           unadjustedCodewordCount < previousUnadjustedCount);
-  return m_detectionResultColumns;
-}
-void CBC_DetectionResult::setBoundingBox(CBC_BoundingBox* boundingBox) {
-  m_boundingBox = boundingBox;
-}
-CBC_BoundingBox* CBC_DetectionResult::getBoundingBox() {
-  return m_boundingBox;
-}
-void CBC_DetectionResult::setDetectionResultColumn(
-    int32_t barcodeColumn,
-    CBC_DetectionResultColumn* detectionResultColumn) {
-  m_detectionResultColumns[barcodeColumn] = detectionResultColumn;
-}
-CBC_DetectionResultColumn* CBC_DetectionResult::getDetectionResultColumn(
-    int32_t barcodeColumn) {
-  return m_detectionResultColumns[barcodeColumn];
-}
-CFX_ByteString CBC_DetectionResult::toString() {
-  CBC_DetectionResultColumn* rowIndicatorColumn = m_detectionResultColumns[0];
-  if (!rowIndicatorColumn)
-    rowIndicatorColumn = m_detectionResultColumns[m_barcodeColumnCount + 1];
-
-  CFX_ByteString result;
-  for (int32_t codewordsRow = 0;
-       codewordsRow < rowIndicatorColumn->getCodewords()->GetSize();
-       codewordsRow++) {
-    result += (FX_CHAR)codewordsRow;
-    for (int32_t barcodeColumn = 0; barcodeColumn < m_barcodeColumnCount + 2;
-         barcodeColumn++) {
-      if (!m_detectionResultColumns[barcodeColumn]) {
-        result += "    |   ";
-        continue;
-      }
-      CBC_Codeword* codeword =
-          m_detectionResultColumns[barcodeColumn]->getCodewords()->GetAt(
-              codewordsRow);
-      if (!codeword) {
-        result += "    |   ";
-        continue;
-      }
-      result += codeword->getRowNumber();
-      result += codeword->getValue();
-    }
-  }
-  return result;
-}
-void CBC_DetectionResult::adjustIndicatorColumnRowNumbers(
-    CBC_DetectionResultColumn* detectionResultColumn) {
-  if (detectionResultColumn) {
-    static_cast<CBC_DetectionResultRowIndicatorColumn*>(detectionResultColumn)
-        ->adjustCompleteIndicatorColumnRowNumbers(*m_barcodeMetadata);
-  }
-}
-int32_t CBC_DetectionResult::adjustRowNumbers() {
-  int32_t unadjustedCount = adjustRowNumbersByRow();
-  if (unadjustedCount == 0) {
-    return 0;
-  }
-  for (int32_t barcodeColumn = 1; barcodeColumn < m_barcodeColumnCount + 1;
-       barcodeColumn++) {
-    CFX_ArrayTemplate<CBC_Codeword*>* codewords =
-        m_detectionResultColumns[barcodeColumn]->getCodewords();
-    for (int32_t codewordsRow = 0; codewordsRow < codewords->GetSize();
-         codewordsRow++) {
-      if (!codewords->GetAt(codewordsRow))
-        continue;
-
-      if (!codewords->GetAt(codewordsRow)->hasValidRowNumber()) {
-        adjustRowNumbers(barcodeColumn, codewordsRow, codewords);
-      }
-    }
-  }
-  return unadjustedCount;
-}
-int32_t CBC_DetectionResult::adjustRowNumbersByRow() {
-  adjustRowNumbersFromBothRI();
-  int32_t unadjustedCount = adjustRowNumbersFromLRI();
-  return unadjustedCount + adjustRowNumbersFromRRI();
-}
-int32_t CBC_DetectionResult::adjustRowNumbersFromBothRI() {
-  if (!m_detectionResultColumns[0] ||
-      !m_detectionResultColumns[m_barcodeColumnCount + 1]) {
-    return 0;
-  }
-  CFX_ArrayTemplate<CBC_Codeword*>* LRIcodewords =
-      m_detectionResultColumns[0]->getCodewords();
-  CFX_ArrayTemplate<CBC_Codeword*>* RRIcodewords =
-      m_detectionResultColumns[m_barcodeColumnCount + 1]->getCodewords();
-  for (int32_t codewordsRow = 0; codewordsRow < LRIcodewords->GetSize();
-       codewordsRow++) {
-    if (LRIcodewords->GetAt(codewordsRow) &&
-        RRIcodewords->GetAt(codewordsRow) &&
-        LRIcodewords->GetAt(codewordsRow)->getRowNumber() ==
-            RRIcodewords->GetAt(codewordsRow)->getRowNumber()) {
-      for (int32_t barcodeColumn = 1; barcodeColumn <= m_barcodeColumnCount;
-           barcodeColumn++) {
-        CBC_Codeword* codeword =
-            m_detectionResultColumns[barcodeColumn]->getCodewords()->GetAt(
-                codewordsRow);
-        if (!codeword) {
-          continue;
-        }
-        codeword->setRowNumber(
-            LRIcodewords->GetAt(codewordsRow)->getRowNumber());
-        if (!codeword->hasValidRowNumber()) {
-          m_detectionResultColumns[barcodeColumn]->getCodewords()->SetAt(
-              codewordsRow, nullptr);
-        }
-      }
-    }
-  }
-  return 0;
-}
-int32_t CBC_DetectionResult::adjustRowNumbersFromRRI() {
-  if (!m_detectionResultColumns[m_barcodeColumnCount + 1]) {
-    return 0;
-  }
-  int32_t unadjustedCount = 0;
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords =
-      m_detectionResultColumns.GetAt(m_barcodeColumnCount + 1)->getCodewords();
-  for (int32_t codewordsRow = 0; codewordsRow < codewords->GetSize();
-       codewordsRow++) {
-    if (!codewords->GetAt(codewordsRow))
-      continue;
-
-    int32_t rowIndicatorRowNumber =
-        codewords->GetAt(codewordsRow)->getRowNumber();
-    int32_t invalidRowCounts = 0;
-    for (int32_t barcodeColumn = m_barcodeColumnCount + 1;
-         barcodeColumn > 0 && invalidRowCounts < ADJUST_ROW_NUMBER_SKIP;
-         barcodeColumn--) {
-      CBC_Codeword* codeword = m_detectionResultColumns.GetAt(barcodeColumn)
-                                   ->getCodewords()
-                                   ->GetAt(codewordsRow);
-      if (codeword) {
-        invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber,
-                                                  invalidRowCounts, codeword);
-        if (!codeword->hasValidRowNumber()) {
-          unadjustedCount++;
-        }
-      }
-    }
-  }
-  return unadjustedCount;
-}
-int32_t CBC_DetectionResult::adjustRowNumbersFromLRI() {
-  if (!m_detectionResultColumns[0])
-    return 0;
-
-  int32_t unadjustedCount = 0;
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords =
-      m_detectionResultColumns.GetAt(0)->getCodewords();
-  for (int32_t codewordsRow = 0; codewordsRow < codewords->GetSize();
-       codewordsRow++) {
-    if (!codewords->GetAt(codewordsRow))
-      continue;
-
-    int32_t rowIndicatorRowNumber =
-        codewords->GetAt(codewordsRow)->getRowNumber();
-    int32_t invalidRowCounts = 0;
-    for (int32_t barcodeColumn = 1; barcodeColumn < m_barcodeColumnCount + 1 &&
-                                    invalidRowCounts < ADJUST_ROW_NUMBER_SKIP;
-         barcodeColumn++) {
-      CBC_Codeword* codeword =
-          m_detectionResultColumns[barcodeColumn]->getCodewords()->GetAt(
-              codewordsRow);
-      if (codeword) {
-        invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber,
-                                                  invalidRowCounts, codeword);
-        if (!codeword->hasValidRowNumber()) {
-          unadjustedCount++;
-        }
-      }
-    }
-  }
-  return unadjustedCount;
-}
-int32_t CBC_DetectionResult::adjustRowNumberIfValid(
-    int32_t rowIndicatorRowNumber,
-    int32_t invalidRowCounts,
-    CBC_Codeword* codeword) {
-  if (!codeword)
-    return invalidRowCounts;
-
-  if (!codeword->hasValidRowNumber()) {
-    if (codeword->isValidRowNumber(rowIndicatorRowNumber)) {
-      codeword->setRowNumber(rowIndicatorRowNumber);
-      invalidRowCounts = 0;
-    } else {
-      ++invalidRowCounts;
-    }
-  }
-  return invalidRowCounts;
-}
-void CBC_DetectionResult::adjustRowNumbers(
-    int32_t barcodeColumn,
-    int32_t codewordsRow,
-    CFX_ArrayTemplate<CBC_Codeword*>* codewords) {
-  CBC_Codeword* codeword = codewords->GetAt(codewordsRow);
-  CFX_ArrayTemplate<CBC_Codeword*>* previousColumnCodewords =
-      m_detectionResultColumns.GetAt(barcodeColumn - 1)->getCodewords();
-  CFX_ArrayTemplate<CBC_Codeword*>* nextColumnCodewords =
-      previousColumnCodewords;
-  if (m_detectionResultColumns[barcodeColumn + 1]) {
-    nextColumnCodewords =
-        m_detectionResultColumns[barcodeColumn + 1]->getCodewords();
-  }
-  CFX_ArrayTemplate<CBC_Codeword*> otherCodewords;
-  otherCodewords.SetSize(14);
-  otherCodewords[2] = previousColumnCodewords->GetAt(codewordsRow);
-  otherCodewords[3] = nextColumnCodewords->GetAt(codewordsRow);
-  if (codewordsRow > 0) {
-    otherCodewords[0] = codewords->GetAt(codewordsRow - 1);
-    otherCodewords[4] = previousColumnCodewords->GetAt(codewordsRow - 1);
-    otherCodewords[5] = nextColumnCodewords->GetAt(codewordsRow - 1);
-  }
-  if (codewordsRow > 1) {
-    otherCodewords[8] = codewords->GetAt(codewordsRow - 2);
-    otherCodewords[10] = previousColumnCodewords->GetAt(codewordsRow - 2);
-    otherCodewords[11] = nextColumnCodewords->GetAt(codewordsRow - 2);
-  }
-  if (codewordsRow < codewords->GetSize() - 1) {
-    otherCodewords[1] = codewords->GetAt(codewordsRow + 1);
-    otherCodewords[6] = previousColumnCodewords->GetAt(codewordsRow + 1);
-    otherCodewords[7] = nextColumnCodewords->GetAt(codewordsRow + 1);
-  }
-  if (codewordsRow < codewords->GetSize() - 2) {
-    otherCodewords[9] = codewords->GetAt(codewordsRow + 2);
-    otherCodewords[12] = previousColumnCodewords->GetAt(codewordsRow + 2);
-    otherCodewords[13] = nextColumnCodewords->GetAt(codewordsRow + 2);
-  }
-  for (int32_t i = 0; i < otherCodewords.GetSize(); i++) {
-    CBC_Codeword* otherCodeword = otherCodewords.GetAt(i);
-    if (adjustRowNumber(codeword, otherCodeword)) {
-      return;
-    }
-  }
-}
-FX_BOOL CBC_DetectionResult::adjustRowNumber(CBC_Codeword* codeword,
-                                             CBC_Codeword* otherCodeword) {
-  if (!otherCodeword)
-    return FALSE;
-
-  if (otherCodeword->hasValidRowNumber() &&
-      otherCodeword->getBucket() == codeword->getBucket()) {
-    codeword->setRowNumber(otherCodeword->getRowNumber());
-    return TRUE;
-  }
-  return FALSE;
-}
-int32_t CBC_DetectionResult::getBarcodeColumnCount() {
-  return m_barcodeColumnCount;
-}
-int32_t CBC_DetectionResult::getBarcodeRowCount() {
-  return m_barcodeMetadata->getRowCount();
-}
-int32_t CBC_DetectionResult::getBarcodeECLevel() {
-  return m_barcodeMetadata->getErrorCorrectionLevel();
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h
deleted file mode 100644
index e5cad81b9f..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
-
-class CBC_BarcodeMetadata;
-class CBC_BoundingBox;
-class CBC_Codeword;
-class CBC_DetectionResultColumn;
-class CBC_DetectionResult {
- public:
-  CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata,
-                      CBC_BoundingBox* boundingBox);
-  virtual ~CBC_DetectionResult();
-
-  CFX_ArrayTemplate<CBC_DetectionResultColumn*>& getDetectionResultColumns();
-  void setBoundingBox(CBC_BoundingBox* boundingBox);
-  CBC_BoundingBox* getBoundingBox();
-  void setDetectionResultColumn(
-      int32_t barcodeColumn,
-      CBC_DetectionResultColumn* detectionResultColumn);
-  CBC_DetectionResultColumn* getDetectionResultColumn(int32_t barcodeColumn);
-  CFX_ByteString toString();
-
-  int32_t getBarcodeColumnCount();
-  int32_t getBarcodeRowCount();
-  int32_t getBarcodeECLevel();
-
- private:
-  static int32_t ADJUST_ROW_NUMBER_SKIP;
-  CBC_BarcodeMetadata* m_barcodeMetadata;
-  CFX_ArrayTemplate<CBC_DetectionResultColumn*> m_detectionResultColumns;
-  CBC_BoundingBox* m_boundingBox;
-  int32_t m_barcodeColumnCount;
-
- private:
-  void adjustIndicatorColumnRowNumbers(
-      CBC_DetectionResultColumn* detectionResultColumn);
-  int32_t adjustRowNumbers();
-  int32_t adjustRowNumbersByRow();
-  int32_t adjustRowNumbersFromBothRI();
-  int32_t adjustRowNumbersFromRRI();
-  int32_t adjustRowNumbersFromLRI();
-  static int32_t adjustRowNumberIfValid(int32_t rowIndicatorRowNumber,
-                                        int32_t invalidRowCounts,
-                                        CBC_Codeword* codeword);
-  void adjustRowNumbers(int32_t barcodeColumn,
-                        int32_t codewordsRow,
-                        CFX_ArrayTemplate<CBC_Codeword*>* codewords);
-  static FX_BOOL adjustRowNumber(CBC_Codeword* codeword,
-                                 CBC_Codeword* otherCodeword);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
deleted file mode 100644
index 010b83c5fb..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Codeword.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
-
-int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
-
-CBC_DetectionResultColumn::CBC_DetectionResultColumn(
-    CBC_BoundingBox* boundingBox)
-    : m_boundingBox(boundingBox),
-      m_codewords(new CFX_ArrayTemplate<CBC_Codeword*>()) {
-  m_codewords->SetSize(boundingBox->getMaxY() - boundingBox->getMinY() + 1);
-}
-
-CBC_DetectionResultColumn::~CBC_DetectionResultColumn() {
-  for (int32_t i = 0; i < m_codewords->GetSize(); i++) {
-    delete m_codewords->GetAt(i);
-  }
-  delete m_codewords;
-}
-CBC_Codeword* CBC_DetectionResultColumn::getCodewordNearby(int32_t imageRow) {
-  CBC_Codeword* codeword = getCodeword(imageRow);
-  if (codeword) {
-    return codeword;
-  }
-  for (int32_t i = 1; i < MAX_NEARBY_DISTANCE; i++) {
-    int32_t nearImageRow = imageRowToCodewordIndex(imageRow) - i;
-    if (nearImageRow >= 0) {
-      codeword = m_codewords->GetAt(nearImageRow);
-      if (codeword) {
-        return codeword;
-      }
-    }
-    nearImageRow = imageRowToCodewordIndex(imageRow) + i;
-    if (nearImageRow < m_codewords->GetSize()) {
-      codeword = m_codewords->GetAt(nearImageRow);
-      if (codeword) {
-        return codeword;
-      }
-    }
-  }
-  return nullptr;
-}
-int32_t CBC_DetectionResultColumn::imageRowToCodewordIndex(int32_t imageRow) {
-  return imageRow - m_boundingBox->getMinY();
-}
-int32_t CBC_DetectionResultColumn::codewordIndexToImageRow(
-    int32_t codewordIndex) {
-  return m_boundingBox->getMinY() + codewordIndex;
-}
-void CBC_DetectionResultColumn::setCodeword(int32_t imageRow,
-                                            CBC_Codeword* codeword) {
-  m_codewords->SetAt(imageRowToCodewordIndex(imageRow), codeword);
-}
-CBC_Codeword* CBC_DetectionResultColumn::getCodeword(int32_t imageRow) {
-  return m_codewords->GetAt(imageRowToCodewordIndex(imageRow));
-}
-CBC_BoundingBox* CBC_DetectionResultColumn::getBoundingBox() {
-  return m_boundingBox;
-}
-CFX_ArrayTemplate<CBC_Codeword*>* CBC_DetectionResultColumn::getCodewords()
-    const {
-  return m_codewords;
-}
-CFX_ByteString CBC_DetectionResultColumn::toString() {
-  CFX_ByteString result;
-  int32_t row = 0;
-  for (int32_t i = 0; i < m_codewords->GetSize(); i++) {
-    CBC_Codeword* codeword = m_codewords->GetAt(i);
-    if (!codeword) {
-      result += (FX_CHAR)row;
-      row++;
-      continue;
-    }
-    result += (FX_CHAR)row;
-    result += codeword->getRowNumber();
-    result += codeword->getValue();
-    row++;
-  }
-  return result;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
deleted file mode 100644
index 949f8ac4aa..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
-
-class CBC_Codeword;
-class CBC_BoundingBox;
-
-class CBC_DetectionResultColumn {
- public:
-  CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox);
-  virtual ~CBC_DetectionResultColumn();
-
-  CBC_Codeword* getCodewordNearby(int32_t imageRow);
-  int32_t imageRowToCodewordIndex(int32_t imageRow);
-  int32_t codewordIndexToImageRow(int32_t codewordIndex);
-  void setCodeword(int32_t imageRow, CBC_Codeword* codeword);
-  CBC_Codeword* getCodeword(int32_t imageRow);
-  CBC_BoundingBox* getBoundingBox();
-  CFX_ArrayTemplate<CBC_Codeword*>* getCodewords() const;
-  CFX_ByteString toString();
-
-  CBC_BoundingBox* m_boundingBox;
-  CFX_ArrayTemplate<CBC_Codeword*>* m_codewords;
-
- private:
-  static int32_t MAX_NEARBY_DISTANCE;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
deleted file mode 100644
index 900036d315..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Codeword.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_DetectionResultRowIndicatorColumn::CBC_DetectionResultRowIndicatorColumn(
-    CBC_BoundingBox* boundingBox,
-    FX_BOOL isLeft)
-    : CBC_DetectionResultColumn(boundingBox) {
-  m_isLeft = isLeft;
-}
-CBC_DetectionResultRowIndicatorColumn::
-    ~CBC_DetectionResultRowIndicatorColumn() {}
-void CBC_DetectionResultRowIndicatorColumn::setRowNumbers() {
-  for (int32_t i = 0; i < m_codewords->GetSize(); i++) {
-    CBC_Codeword* codeword = m_codewords->GetAt(i);
-    if (codeword) {
-      codeword->setRowNumberAsRowIndicatorColumn();
-    }
-  }
-}
-int32_t
-CBC_DetectionResultRowIndicatorColumn::adjustCompleteIndicatorColumnRowNumbers(
-    CBC_BarcodeMetadata barcodeMetadata) {
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords = getCodewords();
-  setRowNumbers();
-  removeIncorrectCodewords(codewords, barcodeMetadata);
-  CBC_BoundingBox* boundingBox = getBoundingBox();
-  CBC_ResultPoint* top =
-      m_isLeft ? boundingBox->getTopLeft() : boundingBox->getTopRight();
-  CBC_ResultPoint* bottom =
-      m_isLeft ? boundingBox->getBottomLeft() : boundingBox->getBottomRight();
-  int32_t firstRow = imageRowToCodewordIndex((int32_t)top->GetY());
-  int32_t lastRow = imageRowToCodewordIndex((int32_t)bottom->GetY());
-  FX_FLOAT averageRowHeight =
-      (lastRow - firstRow) / (FX_FLOAT)barcodeMetadata.getRowCount();
-  int32_t barcodeRow = -1;
-  int32_t maxRowHeight = 1;
-  int32_t currentRowHeight = 0;
-  for (int32_t codewordsRow = firstRow; codewordsRow < lastRow;
-       codewordsRow++) {
-    if (!codewords->GetAt(codewordsRow))
-      continue;
-
-    CBC_Codeword* codeword = codewords->GetAt(codewordsRow);
-    int32_t rowDifference = codeword->getRowNumber() - barcodeRow;
-    if (rowDifference == 0) {
-      currentRowHeight++;
-    } else if (rowDifference == 1) {
-      maxRowHeight =
-          maxRowHeight > currentRowHeight ? maxRowHeight : currentRowHeight;
-      currentRowHeight = 1;
-      barcodeRow = codeword->getRowNumber();
-    } else if (rowDifference < 0) {
-      codewords->SetAt(codewordsRow, nullptr);
-    } else if (codeword->getRowNumber() >= barcodeMetadata.getRowCount()) {
-      codewords->SetAt(codewordsRow, nullptr);
-    } else if (rowDifference > codewordsRow) {
-      codewords->SetAt(codewordsRow, nullptr);
-    } else {
-      int32_t checkedRows;
-      if (maxRowHeight > 2) {
-        checkedRows = (maxRowHeight - 2) * rowDifference;
-      } else {
-        checkedRows = rowDifference;
-      }
-      FX_BOOL closePreviousCodewordFound = checkedRows >= codewordsRow;
-      for (int32_t i = 1; i <= checkedRows && !closePreviousCodewordFound;
-           i++) {
-        closePreviousCodewordFound = !!codewords->GetAt(codewordsRow - i);
-      }
-      if (closePreviousCodewordFound) {
-        codewords->SetAt(codewordsRow, nullptr);
-      } else {
-        barcodeRow = codeword->getRowNumber();
-        currentRowHeight = 1;
-      }
-    }
-  }
-  return (int32_t)(averageRowHeight + 0.5);
-}
-CFX_Int32Array* CBC_DetectionResultRowIndicatorColumn::getRowHeights(
-    int32_t& e) {
-  CBC_BarcodeMetadata* barcodeMetadata = getBarcodeMetadata();
-  if (!barcodeMetadata) {
-    e = BCExceptionCannotMetadata;
-    return nullptr;
-  }
-  adjustIncompleteIndicatorColumnRowNumbers(*barcodeMetadata);
-  CFX_Int32Array* result = new CFX_Int32Array;
-  result->SetSize(barcodeMetadata->getRowCount());
-  for (int32_t i = 0; i < getCodewords()->GetSize(); i++) {
-    CBC_Codeword* codeword = getCodewords()->GetAt(i);
-    if (codeword) {
-      result->SetAt(codeword->getRowNumber(),
-                    result->GetAt(codeword->getRowNumber()) + 1);
-    }
-  }
-  return result;
-}
-int32_t CBC_DetectionResultRowIndicatorColumn::
-    adjustIncompleteIndicatorColumnRowNumbers(
-        CBC_BarcodeMetadata barcodeMetadata) {
-  CBC_BoundingBox* boundingBox = getBoundingBox();
-  CBC_ResultPoint* top =
-      m_isLeft ? boundingBox->getTopLeft() : boundingBox->getTopRight();
-  CBC_ResultPoint* bottom =
-      m_isLeft ? boundingBox->getBottomLeft() : boundingBox->getBottomRight();
-  int32_t firstRow = imageRowToCodewordIndex((int32_t)top->GetY());
-  int32_t lastRow = imageRowToCodewordIndex((int32_t)bottom->GetY());
-  FX_FLOAT averageRowHeight =
-      (lastRow - firstRow) / (FX_FLOAT)barcodeMetadata.getRowCount();
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords = getCodewords();
-  int32_t barcodeRow = -1;
-  int32_t maxRowHeight = 1;
-  int32_t currentRowHeight = 0;
-  for (int32_t codewordsRow = firstRow; codewordsRow < lastRow;
-       codewordsRow++) {
-    if (!codewords->GetAt(codewordsRow))
-      continue;
-
-    CBC_Codeword* codeword = codewords->GetAt(codewordsRow);
-    codeword->setRowNumberAsRowIndicatorColumn();
-    int32_t rowDifference = codeword->getRowNumber() - barcodeRow;
-    if (rowDifference == 0) {
-      currentRowHeight++;
-    } else if (rowDifference == 1) {
-      maxRowHeight =
-          maxRowHeight > currentRowHeight ? maxRowHeight : currentRowHeight;
-      currentRowHeight = 1;
-      barcodeRow = codeword->getRowNumber();
-    } else if (codeword->getRowNumber() >= barcodeMetadata.getRowCount()) {
-      codewords->SetAt(codewordsRow, nullptr);
-    } else {
-      barcodeRow = codeword->getRowNumber();
-      currentRowHeight = 1;
-    }
-  }
-  return (int32_t)(averageRowHeight + 0.5);
-}
-CBC_BarcodeMetadata*
-CBC_DetectionResultRowIndicatorColumn::getBarcodeMetadata() {
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords = getCodewords();
-  CBC_BarcodeValue barcodeColumnCount;
-  CBC_BarcodeValue barcodeRowCountUpperPart;
-  CBC_BarcodeValue barcodeRowCountLowerPart;
-  CBC_BarcodeValue barcodeECLevel;
-  for (int32_t i = 0; i < codewords->GetSize(); i++) {
-    CBC_Codeword* codeword = codewords->GetAt(i);
-    if (!codeword)
-      continue;
-
-    codeword->setRowNumberAsRowIndicatorColumn();
-    int32_t rowIndicatorValue = codeword->getValue() % 30;
-    int32_t codewordRowNumber = codeword->getRowNumber();
-    if (!m_isLeft) {
-      codewordRowNumber += 2;
-    }
-    switch (codewordRowNumber % 3) {
-      case 0:
-        barcodeRowCountUpperPart.setValue(rowIndicatorValue * 3 + 1);
-        break;
-      case 1:
-        barcodeECLevel.setValue(rowIndicatorValue / 3);
-        barcodeRowCountLowerPart.setValue(rowIndicatorValue % 3);
-        break;
-      case 2:
-        barcodeColumnCount.setValue(rowIndicatorValue + 1);
-        break;
-    }
-  }
-  if ((barcodeColumnCount.getValue()->GetSize() == 0) ||
-      (barcodeRowCountUpperPart.getValue()->GetSize() == 0) ||
-      (barcodeRowCountLowerPart.getValue()->GetSize() == 0) ||
-      (barcodeECLevel.getValue()->GetSize() == 0) ||
-      barcodeColumnCount.getValue()->GetAt(0) < 1 ||
-      barcodeRowCountUpperPart.getValue()->GetAt(0) +
-              barcodeRowCountLowerPart.getValue()->GetAt(0) <
-          CBC_PDF417Common::MIN_ROWS_IN_BARCODE ||
-      barcodeRowCountUpperPart.getValue()->GetAt(0) +
-              barcodeRowCountLowerPart.getValue()->GetAt(0) >
-          CBC_PDF417Common::MAX_ROWS_IN_BARCODE) {
-    return nullptr;
-  }
-  CBC_BarcodeMetadata* barcodeMetadata =
-      new CBC_BarcodeMetadata(barcodeColumnCount.getValue()->GetAt(0),
-                              barcodeRowCountUpperPart.getValue()->GetAt(0),
-                              barcodeRowCountLowerPart.getValue()->GetAt(0),
-                              barcodeECLevel.getValue()->GetAt(0));
-  removeIncorrectCodewords(codewords, *barcodeMetadata);
-  return barcodeMetadata;
-}
-FX_BOOL CBC_DetectionResultRowIndicatorColumn::isLeft() {
-  return m_isLeft;
-}
-CFX_ByteString CBC_DetectionResultRowIndicatorColumn::toString() {
-  return CFX_ByteString("IsLeft: ") + m_isLeft + '\n' +
-         CBC_DetectionResultColumn::toString();
-}
-void CBC_DetectionResultRowIndicatorColumn::removeIncorrectCodewords(
-    CFX_ArrayTemplate<CBC_Codeword*>* codewords,
-    CBC_BarcodeMetadata barcodeMetadata) {
-  for (int32_t codewordRow = 0; codewordRow < codewords->GetSize();
-       codewordRow++) {
-    CBC_Codeword* codeword = codewords->GetAt(codewordRow);
-    if (!codeword)
-      continue;
-
-    int32_t rowIndicatorValue = codeword->getValue() % 30;
-    int32_t codewordRowNumber = codeword->getRowNumber();
-    if (codewordRowNumber > barcodeMetadata.getRowCount()) {
-      codewords->SetAt(codewordRow, nullptr);
-      continue;
-    }
-    if (!m_isLeft) {
-      codewordRowNumber += 2;
-    }
-    switch (codewordRowNumber % 3) {
-      case 0:
-        if (rowIndicatorValue * 3 + 1 !=
-            barcodeMetadata.getRowCountUpperPart()) {
-          codewords->SetAt(codewordRow, nullptr);
-        }
-        break;
-      case 1:
-        if (rowIndicatorValue / 3 !=
-                barcodeMetadata.getErrorCorrectionLevel() ||
-            rowIndicatorValue % 3 != barcodeMetadata.getRowCountLowerPart()) {
-          codewords->SetAt(codewordRow, nullptr);
-        }
-        break;
-      case 2:
-        if (rowIndicatorValue + 1 != barcodeMetadata.getColumnCount()) {
-          codewords->SetAt(codewordRow, nullptr);
-        }
-        break;
-    }
-  }
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
deleted file mode 100644
index 23fbe74bc3..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
-
-class CBC_BarcodeMetadata;
-class CBC_BoundingBox;
-
-class CBC_DetectionResultRowIndicatorColumn : public CBC_DetectionResultColumn {
- public:
-  CBC_DetectionResultRowIndicatorColumn(CBC_BoundingBox* boundingBox,
-                                        FX_BOOL isLeft);
-  ~CBC_DetectionResultRowIndicatorColumn() override;
-
-  void setRowNumbers();
-  int32_t adjustCompleteIndicatorColumnRowNumbers(
-      CBC_BarcodeMetadata barcodeMetadata);
-  CFX_Int32Array* getRowHeights(int32_t& e);
-  int32_t adjustIncompleteIndicatorColumnRowNumbers(
-      CBC_BarcodeMetadata barcodeMetadata);
-  CBC_BarcodeMetadata* getBarcodeMetadata();
-  FX_BOOL isLeft();
-  CFX_ByteString toString();
-
- private:
-  void removeIncorrectCodewords(CFX_ArrayTemplate<CBC_Codeword*>* codewords,
-                                CBC_BarcodeMetadata barcodeMetadata);
-
-  FX_BOOL m_isLeft;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Detector.cpp
deleted file mode 100644
index 064f6cc30b..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Detector.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Detector.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-#include "xfa/fxbarcode/utils.h"
-
-#define INTEGER_MAX 2147483647
-
-int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5};
-int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3};
-int32_t CBC_Detector::INTEGER_MATH_SHIFT = 8;
-int32_t CBC_Detector::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1
-                                                          << INTEGER_MATH_SHIFT;
-int32_t CBC_Detector::MAX_AVG_VARIANCE =
-    (int32_t)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.42f);
-int32_t CBC_Detector::MAX_INDIVIDUAL_VARIANCE =
-    (int32_t)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.8f);
-int32_t CBC_Detector::START_PATTERN[] = {8, 1, 1, 1, 1, 1, 1, 3};
-int32_t CBC_Detector::STOP_PATTERN[] = {7, 1, 1, 3, 1, 1, 1, 2, 1};
-int32_t CBC_Detector::MAX_PIXEL_DRIFT = 3;
-int32_t CBC_Detector::MAX_PATTERN_DRIFT = 5;
-int32_t CBC_Detector::SKIPPED_ROW_COUNT_MAX = 25;
-int32_t CBC_Detector::ROW_STEP = 5;
-int32_t CBC_Detector::BARCODE_MIN_HEIGHT = 10;
-
-CBC_Detector::CBC_Detector() {}
-CBC_Detector::~CBC_Detector() {}
-
-CBC_PDF417DetectorResult* CBC_Detector::detect(CBC_BinaryBitmap* image,
-                                               int32_t hints,
-                                               FX_BOOL multiple,
-                                               int32_t& e) {
-  CBC_CommonBitMatrix* bitMatrix = image->GetBlackMatrix(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_ResultPointArrayArray* barcodeCoordinates = detect(multiple, bitMatrix);
-  if (barcodeCoordinates->GetSize() == 0) {
-    rotate180(bitMatrix);
-    barcodeCoordinates = detect(multiple, bitMatrix);
-  }
-  if (barcodeCoordinates->GetSize() == 0) {
-    e = BCExceptionUnSupportedBarcode;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return new CBC_PDF417DetectorResult(bitMatrix, barcodeCoordinates);
-}
-void CBC_Detector::rotate180(CBC_CommonBitMatrix* bitMatrix) {
-  int32_t width = bitMatrix->GetWidth();
-  int32_t height = bitMatrix->GetHeight();
-  CBC_CommonBitArray* firstRowBitArray = new CBC_CommonBitArray(width);
-  CBC_CommonBitArray* secondRowBitArray = new CBC_CommonBitArray(width);
-  CBC_CommonBitArray* tmpBitArray = new CBC_CommonBitArray(width);
-  for (int32_t y = 0; y<(height + 1)>> 1; y++) {
-    CBC_CommonBitArray* temp =
-        bitMatrix->GetRow(height - 1 - y, secondRowBitArray);
-    CBC_CommonBitArray* tempfirstRow = firstRowBitArray;
-    firstRowBitArray = bitMatrix->GetRow(y, tempfirstRow);
-    delete tempfirstRow;
-    CBC_CommonBitArray* row = mirror(temp, tmpBitArray);
-    delete temp;
-    bitMatrix->SetRow(y, row);
-    delete row;
-    CBC_CommonBitArray* rowfirstRow = mirror(firstRowBitArray, tmpBitArray);
-    bitMatrix->SetRow(height - 1 - y, rowfirstRow);
-    delete rowfirstRow;
-  }
-  delete tmpBitArray;
-  delete firstRowBitArray;
-  delete secondRowBitArray;
-}
-CBC_CommonBitArray* CBC_Detector::mirror(CBC_CommonBitArray* input,
-                                         CBC_CommonBitArray* result) {
-  CBC_CommonBitArray* array = new CBC_CommonBitArray(result->GetSize());
-  array->Clear();
-  int32_t size = input->GetSize();
-  for (int32_t i = 0; i < size; i++) {
-    if (input->Get(i)) {
-      array->Set(size - 1 - i);
-    }
-  }
-  return array;
-}
-
-CBC_ResultPointArrayArray* CBC_Detector::detect(
-    FX_BOOL multiple,
-    CBC_CommonBitMatrix* bitMatrix) {
-  CBC_ResultPointArrayArray* barcodeCoordinates = new CBC_ResultPointArrayArray;
-  int32_t row = 0;
-  int32_t column = 0;
-  FX_BOOL foundBarcodeInRow = FALSE;
-  while (row < bitMatrix->GetHeight()) {
-    CBC_ResultPointArray* vertices = findVertices(bitMatrix, row, column);
-    if (!vertices->GetAt(0) && !vertices->GetAt(3)) {
-      if (!foundBarcodeInRow) {
-        delete vertices;
-        break;
-      }
-      foundBarcodeInRow = FALSE;
-      column = 0;
-      for (int32_t i = 0; i < barcodeCoordinates->GetSize(); i++) {
-        CBC_ResultPointArray* barcodeCoordinate = barcodeCoordinates->GetAt(i);
-        if (barcodeCoordinate->GetAt(1)) {
-          row = row > barcodeCoordinate->GetAt(1)->GetY();
-        }
-        if (barcodeCoordinate->GetAt(3)) {
-          row = row > barcodeCoordinate->GetAt(3)->GetY();
-        }
-      }
-      row += ROW_STEP;
-      delete vertices;
-      continue;
-    }
-    foundBarcodeInRow = TRUE;
-    barcodeCoordinates->Add(vertices);
-    if (!multiple) {
-      break;
-    }
-    if (vertices->GetAt(2)) {
-      column = (int32_t)vertices->GetAt(2)->GetX();
-      row = (int32_t)vertices->GetAt(2)->GetY();
-    } else {
-      column = (int32_t)vertices->GetAt(4)->GetX();
-      row = (int32_t)vertices->GetAt(4)->GetY();
-    }
-  }
-  return barcodeCoordinates;
-}
-
-CBC_ResultPointArray* CBC_Detector::findVertices(CBC_CommonBitMatrix* matrix,
-                                                 int32_t startRow,
-                                                 int32_t startColumn) {
-  int32_t height = matrix->GetHeight();
-  int32_t width = matrix->GetWidth();
-  CBC_ResultPointArray* result = new CBC_ResultPointArray;
-  result->SetSize(8);
-  std::unique_ptr<CBC_ResultPointArray> startptr(
-      findRowsWithPattern(matrix, height, width, startRow, startColumn,
-                          START_PATTERN, FX_ArraySize(START_PATTERN)));
-  copyToResult(result, startptr.get(), INDEXES_START_PATTERN,
-               FX_ArraySize(INDEXES_START_PATTERN));
-  if (result->GetAt(4)) {
-    startColumn = (int32_t)result->GetAt(4)->GetX();
-    startRow = (int32_t)result->GetAt(4)->GetY();
-  }
-  std::unique_ptr<CBC_ResultPointArray> stopptr(
-      findRowsWithPattern(matrix, height, width, startRow, startColumn,
-                          STOP_PATTERN, FX_ArraySize(STOP_PATTERN)));
-  copyToResult(result, stopptr.get(), INDEXES_STOP_PATTERN,
-               FX_ArraySize(INDEXES_STOP_PATTERN));
-  return result;
-}
-
-void CBC_Detector::copyToResult(CBC_ResultPointArray* result,
-                                CBC_ResultPointArray* tmpResult,
-                                int32_t* destinationIndexes,
-                                int32_t destinationLength) {
-  for (int32_t i = 0; i < destinationLength; i++) {
-    result->SetAt(destinationIndexes[i], tmpResult->GetAt(i));
-  }
-}
-
-CBC_ResultPointArray* CBC_Detector::findRowsWithPattern(
-    CBC_CommonBitMatrix* matrix,
-    int32_t height,
-    int32_t width,
-    int32_t startRow,
-    int32_t startColumn,
-    int32_t* pattern,
-    int32_t patternLength) {
-  CBC_ResultPointArray* result = new CBC_ResultPointArray;
-  result->SetSize(4);
-  FX_BOOL found = FALSE;
-  CFX_Int32Array counters;
-  counters.SetSize(patternLength);
-  for (; startRow < height; startRow += ROW_STEP) {
-    CFX_Int32Array* loc =
-        findGuardPattern(matrix, startColumn, startRow, width, FALSE, pattern,
-                         patternLength, counters);
-    if (loc) {
-      while (startRow > 0) {
-        CFX_Int32Array* previousRowLoc =
-            findGuardPattern(matrix, startColumn, --startRow, width, FALSE,
-                             pattern, patternLength, counters);
-        if (previousRowLoc) {
-          delete loc;
-          loc = previousRowLoc;
-        } else {
-          startRow++;
-          break;
-        }
-      }
-      result->SetAt(
-          0, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(0), (FX_FLOAT)startRow));
-      result->SetAt(
-          1, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(1), (FX_FLOAT)startRow));
-      found = TRUE;
-      delete loc;
-      break;
-    }
-  }
-  int32_t stopRow = startRow + 1;
-  if (found) {
-    int32_t skippedRowCount = 0;
-    CFX_Int32Array previousRowLoc;
-    previousRowLoc.Add((int32_t)result->GetAt(0)->GetX());
-    previousRowLoc.Add((int32_t)result->GetAt(1)->GetX());
-    for (; stopRow < height; stopRow++) {
-      CFX_Int32Array* loc =
-          findGuardPattern(matrix, previousRowLoc[0], stopRow, width, FALSE,
-                           pattern, patternLength, counters);
-      if (loc && abs(previousRowLoc[0] - loc->GetAt(0)) < MAX_PATTERN_DRIFT &&
-          abs(previousRowLoc[1] - loc->GetAt(1)) < MAX_PATTERN_DRIFT) {
-        previousRowLoc.Copy(*loc);
-        skippedRowCount = 0;
-      } else {
-        if (skippedRowCount > SKIPPED_ROW_COUNT_MAX) {
-          delete loc;
-          break;
-        } else {
-          skippedRowCount++;
-        }
-      }
-      delete loc;
-    }
-    stopRow -= skippedRowCount + 1;
-    result->SetAt(2, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(0),
-                                         (FX_FLOAT)stopRow));
-    result->SetAt(3, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(1),
-                                         (FX_FLOAT)stopRow));
-  }
-  if (stopRow - startRow < BARCODE_MIN_HEIGHT) {
-    for (int32_t i = 0; i < result->GetSize(); i++) {
-      result->SetAt(i, nullptr);
-    }
-  }
-  return result;
-}
-CFX_Int32Array* CBC_Detector::findGuardPattern(CBC_CommonBitMatrix* matrix,
-                                               int32_t column,
-                                               int32_t row,
-                                               int32_t width,
-                                               FX_BOOL whiteFirst,
-                                               int32_t* pattern,
-                                               int32_t patternLength,
-                                               CFX_Int32Array& counters) {
-  for (int32_t i = 0; i < counters.GetSize(); i++) {
-    counters.SetAt(i, 0);
-  }
-  FX_BOOL isWhite = whiteFirst;
-  int32_t patternStart = column;
-  int32_t pixelDrift = 0;
-  CFX_Int32Array* intarray = new CFX_Int32Array;
-  while (matrix->Get(patternStart, row) && patternStart > 0 &&
-         pixelDrift++ < MAX_PIXEL_DRIFT) {
-    patternStart--;
-  }
-  int32_t x = patternStart;
-  int32_t counterPosition = 0;
-  for (; x < width; x++) {
-    FX_BOOL pixel = matrix->Get(x, row);
-    if (pixel ^ isWhite) {
-      counters[counterPosition]++;
-    } else {
-      if (counterPosition == patternLength - 1) {
-        if (patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE) <
-            MAX_AVG_VARIANCE) {
-          intarray->Add(patternStart);
-          intarray->Add(x);
-          return intarray;
-        }
-        patternStart += counters[0] + counters[1];
-        for (int32_t l = 2, k = 0; l < patternLength; l++, k++) {
-          counters.SetAt(k, counters.GetAt(l));
-        }
-        counters.SetAt(patternLength - 2, 0);
-        counters.SetAt(patternLength - 1, 0);
-        counterPosition--;
-      } else {
-        counterPosition++;
-      }
-      counters[counterPosition] = 1;
-      isWhite = !isWhite;
-    }
-  }
-  if (counterPosition == patternLength - 1) {
-    if (patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE) <
-        MAX_AVG_VARIANCE) {
-      intarray->Add(patternStart);
-      intarray->Add(x - 1);
-      return intarray;
-    }
-  }
-  delete intarray;
-  return nullptr;
-}
-int32_t CBC_Detector::patternMatchVariance(CFX_Int32Array& counters,
-                                           int32_t* pattern,
-                                           int32_t maxIndividualVariance) {
-  int32_t numCounters = counters.GetSize();
-  int32_t total = 0;
-  int32_t patternLength = 0;
-  for (int32_t i = 0; i < numCounters; i++) {
-    total += counters[i];
-    patternLength += pattern[i];
-  }
-  if (total < patternLength) {
-    return INTEGER_MAX;
-  }
-  int32_t unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength;
-  maxIndividualVariance =
-      (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT;
-  int32_t totalVariance = 0;
-  for (int32_t x = 0; x < numCounters; x++) {
-    int32_t counter = counters[x] << INTEGER_MATH_SHIFT;
-    int32_t scaledPattern = pattern[x] * unitBarWidth;
-    int32_t variance = counter > scaledPattern ? counter - scaledPattern
-                                               : scaledPattern - counter;
-    if (variance > maxIndividualVariance) {
-      return INTEGER_MAX;
-    }
-    totalVariance += variance;
-  }
-  return totalVariance / total;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/fxbarcode/pdf417/BC_PDF417Detector.h
deleted file mode 100644
index c7c21b2a22..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Detector.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-
-class CBC_BinaryBitmap;
-class CBC_CommonBitMatrix;
-class CBC_CommonBitArray;
-
-class CBC_Detector {
- public:
-  CBC_Detector();
-  virtual ~CBC_Detector();
-
-  static CBC_PDF417DetectorResult* detect(CBC_BinaryBitmap* image,
-                                          int32_t hints,
-                                          FX_BOOL multiple,
-                                          int32_t& e);
-  static void rotate180(CBC_CommonBitMatrix* bitMatrix);
-  static CBC_CommonBitArray* mirror(CBC_CommonBitArray* input,
-                                    CBC_CommonBitArray* result);
-
- private:
-  static int32_t INDEXES_START_PATTERN[];
-  static int32_t INDEXES_STOP_PATTERN[];
-  static int32_t INTEGER_MATH_SHIFT;
-  static int32_t PATTERN_MATCH_RESULT_SCALE_FACTOR;
-  static int32_t MAX_AVG_VARIANCE;
-  static int32_t MAX_INDIVIDUAL_VARIANCE;
-  static int32_t START_PATTERN[];
-  static int32_t STOP_PATTERN[];
-  static int32_t MAX_PIXEL_DRIFT;
-  static int32_t MAX_PATTERN_DRIFT;
-  static int32_t SKIPPED_ROW_COUNT_MAX;
-  static int32_t ROW_STEP;
-  static int32_t BARCODE_MIN_HEIGHT;
-  static CBC_ResultPointArrayArray* detect(FX_BOOL multiple,
-                                           CBC_CommonBitMatrix* bitMatrix);
-  static CBC_ResultPointArray* findVertices(CBC_CommonBitMatrix* matrix,
-                                            int32_t startRow,
-                                            int32_t startColumn);
-  static void copyToResult(CBC_ResultPointArray* result,
-                           CBC_ResultPointArray* tmpResult,
-                           int32_t* destinationIndexes,
-                           int32_t destinationLength);
-  static CBC_ResultPointArray* findRowsWithPattern(CBC_CommonBitMatrix* matrix,
-                                                   int32_t height,
-                                                   int32_t width,
-                                                   int32_t startRow,
-                                                   int32_t startColumn,
-                                                   int32_t* pattern,
-                                                   int32_t patternLength);
-  static CFX_Int32Array* findGuardPattern(CBC_CommonBitMatrix* matrix,
-                                          int32_t column,
-                                          int32_t row,
-                                          int32_t width,
-                                          FX_BOOL whiteFirst,
-                                          int32_t* pattern,
-                                          int32_t patternLength,
-                                          CFX_Int32Array& counters);
-  static int32_t patternMatchVariance(CFX_Int32Array& counters,
-                                      int32_t* pattern,
-                                      int32_t maxIndividualVariance);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
deleted file mode 100644
index 4b68bdf678..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-
-CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(
-    CBC_CommonBitMatrix* bits,
-    CBC_ResultPointArrayArray* points)
-    : m_bits(bits), m_points(points) {}
-
-CBC_PDF417DetectorResult::~CBC_PDF417DetectorResult() {
-  for (int32_t i = 0; i < m_points->GetSize(); i++) {
-    CBC_ResultPointArray* temp = m_points->GetAt(i);
-    for (int32_t j = 0; j < temp->GetSize(); j++)
-      delete temp->GetAt(j);
-
-    delete temp;
-  }
-}
-
-CBC_CommonBitMatrix* CBC_PDF417DetectorResult::getBits() const {
-  return m_bits;
-}
-
-CBC_ResultPointArrayArray* CBC_PDF417DetectorResult::getPoints() const {
-  return m_points.get();
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h
deleted file mode 100644
index afb200a4ea..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-
-class CBC_CommonBitMatrix;
-
-class CBC_PDF417DetectorResult final {
- public:
-  // Takes ownership of |points|.
-  CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits,
-                           CBC_ResultPointArrayArray* points);
-  ~CBC_PDF417DetectorResult();
-
-  CBC_CommonBitMatrix* getBits() const;
-  CBC_ResultPointArrayArray* getPoints() const;
-
- private:
-  CBC_CommonBitMatrix* m_bits;
-  std::unique_ptr<CBC_ResultPointArrayArray> m_points;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
deleted file mode 100644
index 3f0b3145b0..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h"
-
-CBC_Dimensions::CBC_Dimensions(int32_t minCols,
-                               int32_t maxCols,
-                               int32_t minRows,
-                               int32_t maxRows) {
-  m_minCols = minCols;
-  m_maxCols = maxCols;
-  m_minRows = minRows;
-  m_maxRows = maxRows;
-}
-CBC_Dimensions::~CBC_Dimensions() {}
-int32_t CBC_Dimensions::getMinCols() {
-  return m_minCols;
-}
-int32_t CBC_Dimensions::getMaxCols() {
-  return m_maxCols;
-}
-int32_t CBC_Dimensions::getMinRows() {
-  return m_minRows;
-}
-int32_t CBC_Dimensions::getMaxRows() {
-  return m_maxRows;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h
deleted file mode 100644
index dedbea3e58..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
-
-#include <stdint.h>
-
-class CBC_Dimensions {
- public:
-  CBC_Dimensions(int32_t minCols,
-                 int32_t maxCols,
-                 int32_t minRows,
-                 int32_t maxRows);
-  virtual ~CBC_Dimensions();
-
-  int32_t getMinCols();
-  int32_t getMaxCols();
-  int32_t getMinRows();
-  int32_t getMaxRows();
-
- private:
-  int32_t m_minCols;
-  int32_t m_maxCols;
-  int32_t m_minRows;
-  int32_t m_maxRows;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
deleted file mode 100644
index f7e1546f19..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = nullptr;
-
-void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) {
-  m_field =
-      new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
-}
-void CBC_PDF417ECErrorCorrection::Finalize() {
-  delete m_field;
-}
-CBC_PDF417ECErrorCorrection::CBC_PDF417ECErrorCorrection() {}
-CBC_PDF417ECErrorCorrection::~CBC_PDF417ECErrorCorrection() {}
-int32_t CBC_PDF417ECErrorCorrection::decode(CFX_Int32Array& received,
-                                            int32_t numECCodewords,
-                                            CFX_Int32Array& erasures,
-                                            int32_t& e) {
-  CBC_PDF417ECModulusPoly poly(m_field, received, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-  CFX_Int32Array S;
-  S.SetSize(numECCodewords);
-  FX_BOOL error = FALSE;
-  for (int32_t l = numECCodewords; l > 0; l--) {
-    int32_t eval = poly.evaluateAt(m_field->exp(l));
-    S[numECCodewords - l] = eval;
-    if (eval != 0) {
-      error = TRUE;
-    }
-  }
-  if (!error) {
-    return 0;
-  }
-  CBC_PDF417ECModulusPoly* syndrome =
-      new CBC_PDF417ECModulusPoly(m_field, S, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-  CBC_PDF417ECModulusPoly* buildmonomial =
-      m_field->buildMonomial(numECCodewords, 1, e);
-  if (e != BCExceptionNO) {
-    delete syndrome;
-    return -1;
-  }
-  CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* sigmaOmega =
-      runEuclideanAlgorithm(buildmonomial, syndrome, numECCodewords, e);
-  delete buildmonomial;
-  delete syndrome;
-  BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-  CBC_PDF417ECModulusPoly* sigma = sigmaOmega->GetAt(0);
-  CBC_PDF417ECModulusPoly* omega = sigmaOmega->GetAt(1);
-  CFX_Int32Array* errorLocations = findErrorLocations(sigma, e);
-  if (e != BCExceptionNO) {
-    for (int32_t i = 0; i < sigmaOmega->GetSize(); i++) {
-      delete sigmaOmega->GetAt(i);
-    }
-    sigmaOmega->RemoveAll();
-    delete sigmaOmega;
-    return -1;
-  }
-  CFX_Int32Array* errorMagnitudes =
-      findErrorMagnitudes(omega, sigma, *errorLocations, e);
-  if (e != BCExceptionNO) {
-    delete errorLocations;
-    for (int32_t i = 0; i < sigmaOmega->GetSize(); i++) {
-      delete sigmaOmega->GetAt(i);
-    }
-    sigmaOmega->RemoveAll();
-    delete sigmaOmega;
-    return -1;
-  }
-  for (int32_t i = 0; i < errorLocations->GetSize(); i++) {
-    int32_t log = m_field->log(errorLocations->GetAt(i), e);
-
-    BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-    int32_t position = received.GetSize() - 1 - log;
-    if (position < 0) {
-      e = BCExceptionChecksumException;
-      delete errorLocations;
-      delete errorMagnitudes;
-      for (int32_t j = 0; j < sigmaOmega->GetSize(); j++) {
-        delete sigmaOmega->GetAt(j);
-      }
-      sigmaOmega->RemoveAll();
-      delete sigmaOmega;
-      return -1;
-    }
-    received[position] =
-        m_field->subtract(received[position], errorMagnitudes->GetAt(i));
-  }
-  int32_t result = errorLocations->GetSize();
-  delete errorLocations;
-  delete errorMagnitudes;
-  for (int32_t k = 0; k < sigmaOmega->GetSize(); k++) {
-    delete sigmaOmega->GetAt(k);
-  }
-  sigmaOmega->RemoveAll();
-  delete sigmaOmega;
-  return result;
-}
-CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>*
-CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm(CBC_PDF417ECModulusPoly* a,
-                                                   CBC_PDF417ECModulusPoly* b,
-                                                   int32_t R,
-                                                   int32_t& e) {
-  if (a->getDegree() < b->getDegree()) {
-    CBC_PDF417ECModulusPoly* temp = a;
-    a = b;
-    b = temp;
-  }
-  CBC_PDF417ECModulusPoly* rLast = a;
-  CBC_PDF417ECModulusPoly* r = b;
-  CBC_PDF417ECModulusPoly* tLast = m_field->getZero();
-  CBC_PDF417ECModulusPoly* t = m_field->getOne();
-  CBC_PDF417ECModulusPoly* qtemp = nullptr;
-  CBC_PDF417ECModulusPoly* rtemp = nullptr;
-  CBC_PDF417ECModulusPoly* ttemp = nullptr;
-  int32_t i = 0;
-  int32_t j = 0;
-  int32_t m = 0;
-  int32_t n = 0;
-  while (r->getDegree() >= R / 2) {
-    CBC_PDF417ECModulusPoly* rLastLast = rLast;
-    CBC_PDF417ECModulusPoly* tLastLast = tLast;
-    rLast = r;
-    tLast = t;
-    m = i;
-    n = j;
-    if (rLast->isZero()) {
-      e = BCExceptionChecksumException;
-      delete qtemp;
-      delete rtemp;
-      delete ttemp;
-      return nullptr;
-    }
-    r = rLastLast;
-    CBC_PDF417ECModulusPoly* q = m_field->getZero();
-    int32_t denominatorLeadingTerm = rLast->getCoefficient(rLast->getDegree());
-    int32_t dltInverse = m_field->inverse(denominatorLeadingTerm, e);
-    if (e != BCExceptionNO) {
-      delete qtemp;
-      delete rtemp;
-      delete ttemp;
-      return nullptr;
-    }
-    while (r->getDegree() >= rLast->getDegree() && !r->isZero()) {
-      int32_t degreeDiff = r->getDegree() - rLast->getDegree();
-      int32_t scale =
-          m_field->multiply(r->getCoefficient(r->getDegree()), dltInverse);
-      CBC_PDF417ECModulusPoly* buildmonomial =
-          m_field->buildMonomial(degreeDiff, scale, e);
-      if (e != BCExceptionNO) {
-        delete qtemp;
-        delete rtemp;
-        delete ttemp;
-        return nullptr;
-      }
-      q = q->add(buildmonomial, e);
-      delete buildmonomial;
-      delete qtemp;
-      if (e != BCExceptionNO) {
-        delete rtemp;
-        delete ttemp;
-        return nullptr;
-      }
-      qtemp = q;
-      CBC_PDF417ECModulusPoly* multiply =
-          rLast->multiplyByMonomial(degreeDiff, scale, e);
-      if (e != BCExceptionNO) {
-        delete qtemp;
-        delete rtemp;
-        delete ttemp;
-        return nullptr;
-      }
-      CBC_PDF417ECModulusPoly* temp = r;
-      r = temp->subtract(multiply, e);
-      delete multiply;
-      if (m > 1 && i > m) {
-        delete temp;
-        temp = nullptr;
-      }
-      if (e != BCExceptionNO) {
-        delete qtemp;
-        delete rtemp;
-        delete ttemp;
-        return nullptr;
-      }
-      rtemp = r;
-      i = m + 1;
-    }
-    ttemp = q->multiply(tLast, e);
-    delete qtemp;
-    qtemp = nullptr;
-    if (e != BCExceptionNO) {
-      delete rtemp;
-      delete ttemp;
-      return nullptr;
-    }
-    t = ttemp->subtract(tLastLast, e);
-    if (n > 1 && j > n) {
-      delete tLastLast;
-    }
-    delete ttemp;
-    if (e != BCExceptionNO) {
-      delete rtemp;
-      return nullptr;
-    }
-    ttemp = t;
-    t = ttemp->negative(e);
-    delete ttemp;
-    if (e != BCExceptionNO) {
-      delete rtemp;
-      return nullptr;
-    }
-    ttemp = t;
-    j++;
-  }
-  int32_t sigmaTildeAtZero = t->getCoefficient(0);
-  if (sigmaTildeAtZero == 0) {
-    e = BCExceptionChecksumException;
-    delete rtemp;
-    delete ttemp;
-    return nullptr;
-  }
-  int32_t inverse = m_field->inverse(sigmaTildeAtZero, e);
-  if (e != BCExceptionNO) {
-    delete rtemp;
-    delete ttemp;
-    return nullptr;
-  }
-  CBC_PDF417ECModulusPoly* sigma = t->multiply(inverse, e);
-  delete ttemp;
-  if (e != BCExceptionNO) {
-    delete rtemp;
-    return nullptr;
-  }
-  CBC_PDF417ECModulusPoly* omega = r->multiply(inverse, e);
-  delete rtemp;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* modulusPoly =
-      new CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>();
-  modulusPoly->Add(sigma);
-  modulusPoly->Add(omega);
-  return modulusPoly;
-}
-CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorLocations(
-    CBC_PDF417ECModulusPoly* errorLocator,
-    int32_t& e) {
-  int32_t numErrors = errorLocator->getDegree();
-  CFX_Int32Array* result = new CFX_Int32Array;
-  result->SetSize(numErrors);
-  int32_t ee = 0;
-  for (int32_t i = 1; i < m_field->getSize() && ee < numErrors; i++) {
-    if (errorLocator->evaluateAt(i) == 0) {
-      result->SetAt(ee, m_field->inverse(i, e));
-      if (e != BCExceptionNO) {
-        delete result;
-        return nullptr;
-      }
-      ee++;
-    }
-  }
-  if (ee != numErrors) {
-    e = BCExceptionChecksumException;
-    delete result;
-    return nullptr;
-  }
-  return result;
-}
-CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorMagnitudes(
-    CBC_PDF417ECModulusPoly* errorEvaluator,
-    CBC_PDF417ECModulusPoly* errorLocator,
-    CFX_Int32Array& errorLocations,
-    int32_t& e) {
-  int32_t errorLocatorDegree = errorLocator->getDegree();
-  CFX_Int32Array formalDerivativeCoefficients;
-  formalDerivativeCoefficients.SetSize(errorLocatorDegree);
-  for (int32_t l = 1; l <= errorLocatorDegree; l++) {
-    formalDerivativeCoefficients[errorLocatorDegree - l] =
-        m_field->multiply(l, errorLocator->getCoefficient(l));
-  }
-  CBC_PDF417ECModulusPoly formalDerivative(m_field,
-                                           formalDerivativeCoefficients, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t s = errorLocations.GetSize();
-  CFX_Int32Array* result = new CFX_Int32Array;
-  result->SetSize(s);
-  for (int32_t i = 0; i < s; i++) {
-    int32_t xiInverse = m_field->inverse(errorLocations[i], e);
-    if (e != BCExceptionNO) {
-      delete result;
-      return nullptr;
-    }
-    int32_t numerator =
-        m_field->subtract(0, errorEvaluator->evaluateAt(xiInverse));
-    int32_t denominator =
-        m_field->inverse(formalDerivative.evaluateAt(xiInverse), e);
-    if (e != BCExceptionNO) {
-      delete result;
-      return nullptr;
-    }
-    result->SetAt(i, m_field->multiply(numerator, denominator));
-  }
-  return result;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
deleted file mode 100644
index 2503311c72..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
-
-class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECErrorCorrection {
- public:
-  CBC_PDF417ECErrorCorrection();
-  virtual ~CBC_PDF417ECErrorCorrection();
-
-  static void Initialize(int32_t& e);
-  static void Finalize();
-  static int32_t decode(CFX_Int32Array& received,
-                        int32_t numECCodewords,
-                        CFX_Int32Array& erasures,
-                        int32_t& e);
-
- private:
-  static CBC_PDF417ECModulusGF* m_field;
-  static CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* runEuclideanAlgorithm(
-      CBC_PDF417ECModulusPoly* a,
-      CBC_PDF417ECModulusPoly* b,
-      int32_t R,
-      int32_t& e);
-  static CFX_Int32Array* findErrorLocations(
-      CBC_PDF417ECModulusPoly* errorLocator,
-      int32_t& e);
-  static CFX_Int32Array* findErrorMagnitudes(
-      CBC_PDF417ECModulusPoly* errorEvaluator,
-      CBC_PDF417ECModulusPoly* errorLocator,
-      CFX_Int32Array& errorLocations,
-      int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
deleted file mode 100644
index 03879dbabb..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = nullptr;
-void CBC_PDF417ECModulusGF::Initialize(int32_t& e) {
-  PDF417_GF =
-      new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
-}
-void CBC_PDF417ECModulusGF::Finalize() {
-  delete PDF417_GF;
-}
-CBC_PDF417ECModulusGF::CBC_PDF417ECModulusGF(int32_t modulus,
-                                             int32_t generator,
-                                             int32_t& e) {
-  m_modulus = modulus;
-  m_expTable.SetSize(modulus);
-  m_logTable.SetSize(modulus);
-  int32_t x = 1;
-  for (int32_t i = 0; i < modulus; i++) {
-    m_expTable[i] = x;
-    x = (x * generator) % modulus;
-  }
-  for (int32_t j = 0; j < modulus - 1; j++) {
-    m_logTable[m_expTable[j]] = j;
-  }
-  CFX_Int32Array zero;
-  zero.Add(0);
-  m_zero = new CBC_PDF417ECModulusPoly(this, zero, e);
-  CFX_Int32Array one;
-  one.Add(1);
-  m_one = new CBC_PDF417ECModulusPoly(this, one, e);
-}
-CBC_PDF417ECModulusGF::~CBC_PDF417ECModulusGF() {
-  delete m_zero;
-  delete m_one;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::getZero() {
-  return m_zero;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::getOne() {
-  return m_one;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::buildMonomial(
-    int32_t degree,
-    int32_t coefficient,
-    int32_t& e) {
-  if (degree < 0) {
-    e = BCExceptionIllegalArgument;
-    return nullptr;
-  }
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (coefficient == 0) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(m_zero->getField(),
-                                              m_zero->getCoefficients(), e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  CFX_Int32Array coefficients;
-  coefficients.SetSize(degree + 1);
-  coefficients[0] = coefficient;
-  modulusPoly = new CBC_PDF417ECModulusPoly(this, coefficients, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-int32_t CBC_PDF417ECModulusGF::add(int32_t a, int32_t b) {
-  return (a + b) % m_modulus;
-}
-int32_t CBC_PDF417ECModulusGF::subtract(int32_t a, int32_t b) {
-  return (m_modulus + a - b) % m_modulus;
-}
-int32_t CBC_PDF417ECModulusGF::exp(int32_t a) {
-  return m_expTable[a];
-}
-int32_t CBC_PDF417ECModulusGF::log(int32_t a, int32_t& e) {
-  if (a == 0) {
-    e = BCExceptionIllegalArgument;
-    return -1;
-  }
-  return m_logTable[a];
-}
-int32_t CBC_PDF417ECModulusGF::inverse(int32_t a, int32_t& e) {
-  if (a == 0) {
-    e = BCExceptionIllegalArgument;
-    return -1;
-  }
-  return m_expTable[m_modulus - m_logTable[a] - 1];
-}
-int32_t CBC_PDF417ECModulusGF::multiply(int32_t a, int32_t b) {
-  if (a == 0 || b == 0) {
-    return 0;
-  }
-  return m_expTable[(m_logTable[a] + m_logTable[b]) % (m_modulus - 1)];
-}
-int32_t CBC_PDF417ECModulusGF::getSize() {
-  return m_modulus;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
deleted file mode 100644
index 3614f5355d..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
-
-class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECModulusGF {
- public:
-  CBC_PDF417ECModulusGF(int32_t modulus, int32_t generator, int32_t& e);
-  virtual ~CBC_PDF417ECModulusGF();
-
-  static void Initialize(int32_t& e);
-  static void Finalize();
-  CBC_PDF417ECModulusPoly* getZero();
-  CBC_PDF417ECModulusPoly* getOne();
-  CBC_PDF417ECModulusPoly* buildMonomial(int32_t degree,
-                                         int32_t coefficient,
-                                         int32_t& e);
-  int32_t add(int32_t a, int32_t b);
-  int32_t subtract(int32_t a, int32_t b);
-  int32_t exp(int32_t a);
-  int32_t log(int32_t a, int32_t& e);
-  int32_t inverse(int32_t a, int32_t& e);
-  int32_t multiply(int32_t a, int32_t b);
-  int32_t getSize();
-  static CBC_PDF417ECModulusGF* PDF417_GF;
-
- private:
-  CFX_Int32Array m_expTable;
-  CFX_Int32Array m_logTable;
-  CBC_PDF417ECModulusPoly* m_zero;
-  CBC_PDF417ECModulusPoly* m_one;
-  int32_t m_modulus;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
deleted file mode 100644
index a41eeea472..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <memory>
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_PDF417ECModulusPoly::CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field,
-                                                 CFX_Int32Array& coefficients,
-                                                 int32_t& e) {
-  if (coefficients.GetSize() == 0) {
-    e = BCExceptionIllegalArgument;
-  }
-  m_field = field;
-  int32_t coefficientsLength = coefficients.GetSize();
-  if (coefficientsLength > 1 && coefficients[0] == 0) {
-    int32_t firstNonZero = 1;
-    while (firstNonZero < coefficientsLength &&
-           coefficients[firstNonZero] == 0) {
-      firstNonZero++;
-    }
-    if (firstNonZero == coefficientsLength) {
-      m_coefficients = field->getZero()->m_coefficients;
-    } else {
-      m_coefficients.SetSize(coefficientsLength - firstNonZero);
-      int32_t l = 0;
-      for (int32_t i = firstNonZero;
-           i < firstNonZero + m_coefficients.GetSize(); i++) {
-        m_coefficients.SetAt(l, coefficients.GetAt(i));
-        l++;
-      }
-    }
-  } else {
-    m_coefficients.Copy(coefficients);
-  }
-}
-CBC_PDF417ECModulusPoly::~CBC_PDF417ECModulusPoly() {}
-CFX_Int32Array& CBC_PDF417ECModulusPoly::getCoefficients() {
-  return m_coefficients;
-}
-CBC_PDF417ECModulusGF* CBC_PDF417ECModulusPoly::getField() {
-  return m_field;
-}
-int32_t CBC_PDF417ECModulusPoly::getDegree() {
-  return m_coefficients.GetSize() - 1;
-}
-FX_BOOL CBC_PDF417ECModulusPoly::isZero() {
-  return m_coefficients[0] == 0;
-}
-int32_t CBC_PDF417ECModulusPoly::getCoefficient(int32_t degree) {
-  return m_coefficients[m_coefficients.GetSize() - 1 - degree];
-}
-int32_t CBC_PDF417ECModulusPoly::evaluateAt(int32_t a) {
-  if (a == 0) {
-    return getCoefficient(0);
-  }
-  int32_t size = m_coefficients.GetSize();
-  if (a == 1) {
-    int32_t result = 0;
-    for (int32_t l = 0; l < m_coefficients.GetSize(); l++) {
-      int32_t coefficient = m_coefficients.GetAt(l);
-      result = m_field->add(result, coefficient);
-    }
-    return result;
-  }
-  int32_t result = m_coefficients[0];
-  for (int32_t i = 1; i < size; i++) {
-    result = m_field->add(m_field->multiply(a, result), m_coefficients[i]);
-  }
-  return result;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::add(
-    CBC_PDF417ECModulusPoly* other,
-    int32_t& e) {
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (isZero()) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(other->getField(),
-                                              other->getCoefficients(), e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  if (other->isZero()) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  CFX_Int32Array smallerCoefficients;
-  smallerCoefficients.Copy(m_coefficients);
-  CFX_Int32Array largerCoefficients;
-  largerCoefficients.Copy(other->m_coefficients);
-  if (smallerCoefficients.GetSize() > largerCoefficients.GetSize()) {
-    CFX_Int32Array temp;
-    temp.Copy(smallerCoefficients);
-    smallerCoefficients.Copy(largerCoefficients);
-    largerCoefficients.Copy(temp);
-  }
-  CFX_Int32Array sumDiff;
-  sumDiff.SetSize(largerCoefficients.GetSize());
-  int32_t lengthDiff =
-      largerCoefficients.GetSize() - smallerCoefficients.GetSize();
-  for (int32_t l = 0; l < lengthDiff; l++) {
-    sumDiff.SetAt(l, largerCoefficients.GetAt(l));
-  }
-  for (int32_t i = lengthDiff; i < largerCoefficients.GetSize(); i++) {
-    sumDiff[i] = m_field->add(smallerCoefficients[i - lengthDiff],
-                              largerCoefficients[i]);
-  }
-  modulusPoly = new CBC_PDF417ECModulusPoly(m_field, sumDiff, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::subtract(
-    CBC_PDF417ECModulusPoly* other,
-    int32_t& e) {
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (other->isZero()) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  CBC_PDF417ECModulusPoly* poly = other->negative(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  modulusPoly = add(poly, e);
-  delete poly;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(
-    CBC_PDF417ECModulusPoly* other,
-    int32_t& e) {
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (isZero() || other->isZero()) {
-    modulusPoly =
-        new CBC_PDF417ECModulusPoly(m_field->getZero()->getField(),
-                                    m_field->getZero()->getCoefficients(), e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  CFX_Int32Array aCoefficients;
-  aCoefficients.Copy(m_coefficients);
-  int32_t aLength = aCoefficients.GetSize();
-  CFX_Int32Array bCoefficients;
-  bCoefficients.Copy(other->m_coefficients);
-  int32_t bLength = bCoefficients.GetSize();
-  CFX_Int32Array product;
-  product.SetSize(aLength + bLength - 1);
-  for (int32_t i = 0; i < aLength; i++) {
-    int32_t aCoeff = aCoefficients[i];
-    for (int32_t j = 0; j < bLength; j++) {
-      product[i + j] = m_field->add(
-          product[i + j], m_field->multiply(aCoeff, bCoefficients[j]));
-    }
-  }
-  modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::negative(int32_t& e) {
-  int32_t size = m_coefficients.GetSize();
-  CFX_Int32Array negativeCoefficients;
-  negativeCoefficients.SetSize(size);
-  for (int32_t i = 0; i < size; i++) {
-    negativeCoefficients[i] = m_field->subtract(0, m_coefficients[i]);
-  }
-  CBC_PDF417ECModulusPoly* modulusPoly =
-      new CBC_PDF417ECModulusPoly(m_field, negativeCoefficients, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(int32_t scalar,
-                                                           int32_t& e) {
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (scalar == 0) {
-    modulusPoly =
-        new CBC_PDF417ECModulusPoly(m_field->getZero()->getField(),
-                                    m_field->getZero()->getCoefficients(), e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  if (scalar == 1) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  int32_t size = m_coefficients.GetSize();
-  CFX_Int32Array product;
-  product.SetSize(size);
-  for (int32_t i = 0; i < size; i++) {
-    product[i] = m_field->multiply(m_coefficients[i], scalar);
-  }
-  modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-
-CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiplyByMonomial(
-    int32_t degree,
-    int32_t coefficient,
-    int32_t& e) {
-  if (degree < 0) {
-    e = BCExceptionIllegalArgument;
-    return nullptr;
-  }
-  CBC_PDF417ECModulusPoly* modulusPoly = nullptr;
-  if (coefficient == 0) {
-    modulusPoly = new CBC_PDF417ECModulusPoly(
-        m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return modulusPoly;
-  }
-  int32_t size = m_coefficients.GetSize();
-  CFX_Int32Array product;
-  product.SetSize(size + degree);
-  for (int32_t i = 0; i < size; i++) {
-    product[i] = m_field->multiply(m_coefficients[i], coefficient);
-  }
-  modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return modulusPoly;
-}
-
-CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* CBC_PDF417ECModulusPoly::divide(
-    CBC_PDF417ECModulusPoly* other,
-    int32_t& e) {
-  if (other->isZero()) {
-    e = BCExceptionDivideByZero;
-    return nullptr;
-  }
-  std::unique_ptr<CBC_PDF417ECModulusPoly> quotient(new CBC_PDF417ECModulusPoly(
-      m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  std::unique_ptr<CBC_PDF417ECModulusPoly> remainder(
-      new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e));
-  if (e != BCExceptionNO)
-    return nullptr;
-
-  int32_t denominatorLeadingTerm = other->getCoefficient(other->getDegree());
-  int32_t inverseDenominatorLeadingTerm =
-      m_field->inverse(denominatorLeadingTerm, e);
-  if (e != BCExceptionNO)
-    return nullptr;
-
-  while (remainder->getDegree() >= other->getDegree() && !remainder->isZero()) {
-    int32_t degreeDifference = remainder->getDegree() - other->getDegree();
-    int32_t scale =
-        m_field->multiply(remainder->getCoefficient(remainder->getDegree()),
-                          inverseDenominatorLeadingTerm);
-    std::unique_ptr<CBC_PDF417ECModulusPoly> term(
-        other->multiplyByMonomial(degreeDifference, scale, e));
-    if (e != BCExceptionNO)
-      return nullptr;
-
-    std::unique_ptr<CBC_PDF417ECModulusPoly> iterationQuotient(
-        m_field->buildMonomial(degreeDifference, scale, e));
-    if (e != BCExceptionNO)
-      return nullptr;
-
-    quotient.reset(quotient->add(iterationQuotient.get(), e));
-    if (e != BCExceptionNO)
-      return nullptr;
-
-    remainder.reset(remainder->subtract(term.get(), e));
-    if (e != BCExceptionNO)
-      return nullptr;
-  }
-
-  CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* modulusPoly =
-      new CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>();
-  modulusPoly->Add(quotient.release());
-  modulusPoly->Add(remainder.release());
-  return modulusPoly;
-}
-
-CFX_ByteString CBC_PDF417ECModulusPoly::toString() {
-  CFX_ByteString result;
-  for (int32_t degree = getDegree(); degree >= 0; degree--) {
-    int32_t coefficient = getCoefficient(degree);
-    if (coefficient != 0) {
-      if (coefficient < 0) {
-        result += " - ";
-        coefficient = -coefficient;
-      } else {
-        if (result.GetLength() > 0) {
-          result += " + ";
-        }
-      }
-      if (degree == 0 || coefficient != 1) {
-        result += coefficient;
-      }
-      if (degree != 0) {
-        if (degree == 1) {
-          result += 'x';
-        } else {
-          result += "x^";
-          result += degree;
-        }
-      }
-    }
-  }
-  return result;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
deleted file mode 100644
index 173972be6e..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
-
-class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusPoly final {
- public:
-  CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field,
-                          CFX_Int32Array& coefficients,
-                          int32_t& e);
-  ~CBC_PDF417ECModulusPoly();
-
-  CFX_Int32Array& getCoefficients();
-  CBC_PDF417ECModulusGF* getField();
-  int32_t getDegree();
-  FX_BOOL isZero();
-  int32_t getCoefficient(int32_t degree);
-  int32_t evaluateAt(int32_t a);
-  CBC_PDF417ECModulusPoly* add(CBC_PDF417ECModulusPoly* other, int32_t& e);
-  CBC_PDF417ECModulusPoly* subtract(CBC_PDF417ECModulusPoly* other, int32_t& e);
-  CBC_PDF417ECModulusPoly* multiply(CBC_PDF417ECModulusPoly* other, int32_t& e);
-  CBC_PDF417ECModulusPoly* negative(int32_t& e);
-  CBC_PDF417ECModulusPoly* multiply(int32_t scalar, int32_t& e);
-  CBC_PDF417ECModulusPoly* multiplyByMonomial(int32_t degree,
-                                              int32_t coefficient,
-                                              int32_t& e);
-  CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* divide(
-      CBC_PDF417ECModulusPoly* other,
-      int32_t& e);
-  CFX_ByteString toString();
-
- private:
-  CBC_PDF417ECModulusGF* m_field;
-  CFX_Int32Array m_coefficients;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp
deleted file mode 100644
index 7d1779657c..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <algorithm>
-#include <limits>
-#include <memory>
-
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Codeword.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Detector.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Reader.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_PDF417Reader::CBC_PDF417Reader() {}
-CBC_PDF417Reader::~CBC_PDF417Reader() {}
-
-CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
-  return Decode(image, 0, e);
-}
-CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image,
-                                        FX_BOOL multiple,
-                                        int32_t hints,
-                                        int32_t& e) {
-  CFX_ByteString results;
-  std::unique_ptr<CBC_PDF417DetectorResult> detectorResult(
-      CBC_Detector::detect(image, hints, multiple, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  for (int32_t i = 0; i < detectorResult->getPoints()->GetSize(); i++) {
-    CBC_ResultPointArray* points = detectorResult->getPoints()->GetAt(i);
-    std::unique_ptr<CBC_CommonDecoderResult> ResultTemp(
-        CBC_PDF417ScanningDecoder::decode(
-            detectorResult->getBits(), points->GetAt(4), points->GetAt(5),
-            points->GetAt(6), points->GetAt(7), getMinCodewordWidth(*points),
-            getMaxCodewordWidth(*points), e));
-    if (!ResultTemp) {
-      e = BCExceptiontNotFoundInstance;
-      return CFX_ByteString();
-    }
-    results += ResultTemp->GetText();
-  }
-  return results;
-}
-
-CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image,
-                                        int32_t hints,
-                                        int32_t& e) {
-  CFX_ByteString bs = Decode(image, FALSE, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return bs;
-}
-int32_t CBC_PDF417Reader::getMaxWidth(CBC_ResultPoint* p1,
-                                      CBC_ResultPoint* p2) {
-  if (!p1 || !p2)
-    return 0;
-  return (int32_t)FXSYS_fabs(p1->GetX() - p2->GetX());
-}
-int32_t CBC_PDF417Reader::getMinWidth(CBC_ResultPoint* p1,
-                                      CBC_ResultPoint* p2) {
-  if (!p1 || !p2)
-    return std::numeric_limits<int32_t>::max();
-  return (int32_t)FXSYS_fabs(p1->GetX() - p2->GetX());
-}
-
-int32_t CBC_PDF417Reader::getMaxCodewordWidth(
-    const CFX_ArrayTemplate<CBC_ResultPoint*>& p) {
-  int32_t a = getMaxWidth(p.GetAt(6), p.GetAt(2)) *
-              CBC_PDF417Common::MODULES_IN_CODEWORD /
-              CBC_PDF417Common::MODULES_IN_STOP_PATTERN;
-  int32_t b = getMaxWidth(p.GetAt(7), p.GetAt(3)) *
-              CBC_PDF417Common::MODULES_IN_CODEWORD /
-              CBC_PDF417Common::MODULES_IN_STOP_PATTERN;
-  int32_t c = std::min(a, getMaxWidth(p.GetAt(0), p.GetAt(4)));
-  int32_t d = std::min(b, getMaxWidth(p.GetAt(1), p.GetAt(5)));
-  return std::min(c, d);
-}
-
-int32_t CBC_PDF417Reader::getMinCodewordWidth(
-    const CFX_ArrayTemplate<CBC_ResultPoint*>& p) {
-  int32_t a = getMinWidth(p.GetAt(6), p.GetAt(2)) *
-              CBC_PDF417Common::MODULES_IN_CODEWORD /
-              CBC_PDF417Common::MODULES_IN_STOP_PATTERN;
-  int32_t b = getMinWidth(p.GetAt(7), p.GetAt(3)) *
-              CBC_PDF417Common::MODULES_IN_CODEWORD /
-              CBC_PDF417Common::MODULES_IN_STOP_PATTERN;
-  int32_t c = std::min(a, getMinWidth(p.GetAt(0), p.GetAt(4)));
-  int32_t d = std::min(b, getMinWidth(p.GetAt(1), p.GetAt(5)));
-  return std::min(c, d);
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h b/xfa/fxbarcode/pdf417/BC_PDF417Reader.h
deleted file mode 100644
index 193d7efdee..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417READER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417READER_H_
-
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-
-class CBC_BinaryBitmap;
-class CBC_ResultPoint;
-
-class CBC_PDF417Reader : public CBC_Reader {
- public:
-  CBC_PDF417Reader();
-  ~CBC_PDF417Reader() override;
-
-  // CBC_Reader
-  CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override;
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        int32_t hints,
-                        int32_t& e) override;
-
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        FX_BOOL multiple,
-                        int32_t hints,
-                        int32_t& e);
-
- private:
-  static int32_t getMaxWidth(CBC_ResultPoint* p1, CBC_ResultPoint* p2);
-  static int32_t getMinWidth(CBC_ResultPoint* p1, CBC_ResultPoint* p2);
-  static int32_t getMaxCodewordWidth(
-      const CFX_ArrayTemplate<CBC_ResultPoint*>& p);
-  static int32_t getMinCodewordWidth(
-      const CFX_ArrayTemplate<CBC_ResultPoint*>& p);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417READER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
deleted file mode 100644
index 083d63e2d2..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
-
-CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {}
-CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {}
-int32_t CBC_PDF417ResultMetadata::getSegmentIndex() {
-  return m_segmentIndex;
-}
-void CBC_PDF417ResultMetadata::setSegmentIndex(int32_t segmentIndex) {
-  m_segmentIndex = segmentIndex;
-}
-CFX_ByteString CBC_PDF417ResultMetadata::getFileId() {
-  return m_fileId;
-}
-void CBC_PDF417ResultMetadata::setFileId(CFX_ByteString fileId) {
-  m_fileId = fileId;
-}
-CFX_Int32Array& CBC_PDF417ResultMetadata::getOptionalData() {
-  return m_optionalData;
-}
-void CBC_PDF417ResultMetadata::setOptionalData(CFX_Int32Array& optionalData) {
-  m_optionalData.Copy(optionalData);
-}
-FX_BOOL CBC_PDF417ResultMetadata::isLastSegment() {
-  return m_lastSegment;
-}
-void CBC_PDF417ResultMetadata::setLastSegment(FX_BOOL lastSegment) {
-  m_lastSegment = lastSegment;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
deleted file mode 100644
index 92f4ea4966..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_PDF417ResultMetadata {
- public:
-  CBC_PDF417ResultMetadata();
-  virtual ~CBC_PDF417ResultMetadata();
-
-  int32_t getSegmentIndex();
-  void setSegmentIndex(int32_t segmentIndex);
-  CFX_ByteString getFileId();
-  void setFileId(CFX_ByteString fileId);
-  CFX_Int32Array& getOptionalData();
-  void setOptionalData(CFX_Int32Array& optionalData);
-  FX_BOOL isLastSegment();
-  void setLastSegment(FX_BOOL lastSegment);
-
- private:
-  int32_t m_segmentIndex;
-  CFX_ByteString m_fileId;
-  CFX_Int32Array m_optionalData;
-  FX_BOOL m_lastSegment;
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
deleted file mode 100644
index fb33fe0d3f..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
+++ /dev/null
@@ -1,735 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Codeword.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Common.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
-#include "xfa/fxbarcode/utils.h"
-
-int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2;
-int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3;
-int32_t CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512;
-CBC_PDF417ECErrorCorrection* CBC_PDF417ScanningDecoder::errorCorrection =
-    nullptr;
-
-CBC_PDF417ScanningDecoder::CBC_PDF417ScanningDecoder() {}
-CBC_PDF417ScanningDecoder::~CBC_PDF417ScanningDecoder() {}
-void CBC_PDF417ScanningDecoder::Initialize() {
-  errorCorrection = new CBC_PDF417ECErrorCorrection;
-}
-void CBC_PDF417ScanningDecoder::Finalize() {
-  delete errorCorrection;
-}
-CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decode(
-    CBC_CommonBitMatrix* image,
-    CBC_ResultPoint* imageTopLeft,
-    CBC_ResultPoint* imageBottomLeft,
-    CBC_ResultPoint* imageTopRight,
-    CBC_ResultPoint* imageBottomRight,
-    int32_t minCodewordWidth,
-    int32_t maxCodewordWidth,
-    int32_t& e) {
-  CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
-      image, imageTopLeft, imageBottomLeft, imageTopRight, imageBottomRight, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn = nullptr;
-  CBC_DetectionResultRowIndicatorColumn* rightRowIndicatorColumn = nullptr;
-  CBC_DetectionResult* detectionResult = nullptr;
-  for (int32_t i = 0; i < 2; i++) {
-    if (imageTopLeft) {
-      leftRowIndicatorColumn =
-          getRowIndicatorColumn(image, boundingBox, *imageTopLeft, TRUE,
-                                minCodewordWidth, maxCodewordWidth);
-    }
-    if (imageTopRight) {
-      rightRowIndicatorColumn =
-          getRowIndicatorColumn(image, boundingBox, *imageTopRight, FALSE,
-                                minCodewordWidth, maxCodewordWidth);
-    }
-    detectionResult = merge(leftRowIndicatorColumn, rightRowIndicatorColumn, e);
-    if (e != BCExceptionNO) {
-      e = BCExceptiontNotFoundInstance;
-      delete leftRowIndicatorColumn;
-      delete rightRowIndicatorColumn;
-      delete boundingBox;
-      return nullptr;
-    }
-    if (i == 0 && (detectionResult->getBoundingBox()->getMinY() <
-                       boundingBox->getMinY() ||
-                   detectionResult->getBoundingBox()->getMaxY() >
-                       boundingBox->getMaxY())) {
-      delete boundingBox;
-      boundingBox = detectionResult->getBoundingBox();
-    } else {
-      detectionResult->setBoundingBox(boundingBox);
-      break;
-    }
-  }
-  int32_t maxBarcodeColumn = detectionResult->getBarcodeColumnCount() + 1;
-  detectionResult->setDetectionResultColumn(0, leftRowIndicatorColumn);
-  detectionResult->setDetectionResultColumn(maxBarcodeColumn,
-                                            rightRowIndicatorColumn);
-  FX_BOOL leftToRight = !!leftRowIndicatorColumn;
-  for (int32_t barcodeColumnCount = 1; barcodeColumnCount <= maxBarcodeColumn;
-       barcodeColumnCount++) {
-    int32_t barcodeColumn = leftToRight ? barcodeColumnCount
-                                        : maxBarcodeColumn - barcodeColumnCount;
-    if (detectionResult->getDetectionResultColumn(barcodeColumn)) {
-      continue;
-    }
-    CBC_DetectionResultColumn* detectionResultColumn = nullptr;
-    if (barcodeColumn == 0 || barcodeColumn == maxBarcodeColumn) {
-      detectionResultColumn = new CBC_DetectionResultRowIndicatorColumn(
-          boundingBox, barcodeColumn == 0);
-    } else {
-      detectionResultColumn = new CBC_DetectionResultColumn(boundingBox);
-    }
-    detectionResult->setDetectionResultColumn(barcodeColumn,
-                                              detectionResultColumn);
-    int32_t startColumn = -1;
-    int32_t previousStartColumn = startColumn;
-    for (int32_t imageRow = boundingBox->getMinY();
-         imageRow <= boundingBox->getMaxY(); imageRow++) {
-      startColumn =
-          getStartColumn(detectionResult, barcodeColumn, imageRow, leftToRight);
-      if (startColumn < 0 || startColumn > boundingBox->getMaxX()) {
-        if (previousStartColumn == -1) {
-          continue;
-        }
-        startColumn = previousStartColumn;
-      }
-      CBC_Codeword* codeword = detectCodeword(
-          image, boundingBox->getMinX(), boundingBox->getMaxX(), leftToRight,
-          startColumn, imageRow, minCodewordWidth, maxCodewordWidth);
-      if (codeword) {
-        detectionResultColumn->setCodeword(imageRow, codeword);
-        previousStartColumn = startColumn;
-        minCodewordWidth = minCodewordWidth < codeword->getWidth()
-                               ? minCodewordWidth
-                               : codeword->getWidth();
-        maxCodewordWidth = maxCodewordWidth > codeword->getWidth()
-                               ? maxCodewordWidth
-                               : codeword->getWidth();
-      }
-    }
-  }
-  CBC_CommonDecoderResult* decoderresult =
-      createDecoderResult(detectionResult, e);
-  if (e != BCExceptionNO) {
-    delete detectionResult;
-    return nullptr;
-  }
-  return decoderresult;
-}
-
-CFX_ByteString CBC_PDF417ScanningDecoder::toString(
-    CBC_BarcodeValueArrayArray* barcodeMatrix) {
-  CFX_ByteString result;
-  for (int32_t row = 0; row < barcodeMatrix->GetSize(); row++) {
-    result += row;
-    for (int32_t l = 0; l < barcodeMatrix->GetAt(row)->GetSize(); l++) {
-      CBC_BarcodeValue* barcodeValue = barcodeMatrix->GetAt(row)->GetAt(l);
-      if (barcodeValue->getValue()->GetSize() == 0) {
-        result += "";
-      } else {
-        result += barcodeValue->getValue()->GetAt(0);
-        result +=
-            barcodeValue->getConfidence(barcodeValue->getValue()->GetAt(0));
-      }
-    }
-  }
-  return result;
-}
-
-CBC_DetectionResult* CBC_PDF417ScanningDecoder::merge(
-    CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn,
-    CBC_DetectionResultRowIndicatorColumn* rightRowIndicatorColumn,
-    int32_t& e) {
-  if (!leftRowIndicatorColumn && !rightRowIndicatorColumn) {
-    e = BCExceptionIllegalArgument;
-    return nullptr;
-  }
-  CBC_BarcodeMetadata* barcodeMetadata =
-      getBarcodeMetadata(leftRowIndicatorColumn, rightRowIndicatorColumn);
-  if (!barcodeMetadata) {
-    e = BCExceptionCannotMetadata;
-    return nullptr;
-  }
-  CBC_BoundingBox* leftboundingBox =
-      adjustBoundingBox(leftRowIndicatorColumn, e);
-  if (e != BCExceptionNO) {
-    delete barcodeMetadata;
-    return nullptr;
-  }
-  CBC_BoundingBox* rightboundingBox =
-      adjustBoundingBox(rightRowIndicatorColumn, e);
-  if (e != BCExceptionNO) {
-    delete barcodeMetadata;
-    return nullptr;
-  }
-  CBC_BoundingBox* boundingBox =
-      CBC_BoundingBox::merge(leftboundingBox, rightboundingBox, e);
-  if (e != BCExceptionNO) {
-    delete barcodeMetadata;
-    return nullptr;
-  }
-  CBC_DetectionResult* detectionresult =
-      new CBC_DetectionResult(barcodeMetadata, boundingBox);
-  return detectionresult;
-}
-CBC_BoundingBox* CBC_PDF417ScanningDecoder::adjustBoundingBox(
-    CBC_DetectionResultRowIndicatorColumn* rowIndicatorColumn,
-    int32_t& e) {
-  if (!rowIndicatorColumn)
-    return nullptr;
-
-  CFX_Int32Array* rowHeights = rowIndicatorColumn->getRowHeights(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t maxRowHeight = getMax(*rowHeights);
-  int32_t missingStartRows = 0;
-  for (int32_t i = 0; i < rowHeights->GetSize(); i++) {
-    int32_t rowHeight = rowHeights->GetAt(i);
-    missingStartRows += maxRowHeight - rowHeight;
-    if (rowHeight > 0) {
-      break;
-    }
-  }
-  CFX_ArrayTemplate<CBC_Codeword*>* codewords =
-      rowIndicatorColumn->getCodewords();
-  for (int32_t row = 0; missingStartRows > 0 && !codewords->GetAt(row); row++) {
-    missingStartRows--;
-  }
-  int32_t missingEndRows = 0;
-  for (int32_t row1 = rowHeights->GetSize() - 1; row1 >= 0; row1--) {
-    missingEndRows += maxRowHeight - rowHeights->GetAt(row1);
-    if (rowHeights->GetAt(row1) > 0) {
-      break;
-    }
-  }
-  for (int32_t row2 = codewords->GetSize() - 1;
-       missingEndRows > 0 && !codewords->GetAt(row2); row2--) {
-    missingEndRows--;
-  }
-  CBC_BoundingBox* boundingBox =
-      rowIndicatorColumn->getBoundingBox()->addMissingRows(
-          missingStartRows, missingEndRows, rowIndicatorColumn->isLeft(), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return boundingBox;
-}
-int32_t CBC_PDF417ScanningDecoder::getMax(CFX_Int32Array& values) {
-  int32_t maxValue = -1;
-  for (int32_t i = 0; i < values.GetSize(); i++) {
-    int32_t value = values.GetAt(i);
-    maxValue = maxValue > value ? maxValue : value;
-  }
-  return maxValue;
-}
-CBC_BarcodeMetadata* CBC_PDF417ScanningDecoder::getBarcodeMetadata(
-    CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn,
-    CBC_DetectionResultRowIndicatorColumn* rightRowIndicatorColumn) {
-  CBC_BarcodeMetadata* leftBarcodeMetadata =
-      leftRowIndicatorColumn ? leftRowIndicatorColumn->getBarcodeMetadata()
-                             : nullptr;
-  if (!leftBarcodeMetadata) {
-    return rightRowIndicatorColumn
-               ? rightRowIndicatorColumn->getBarcodeMetadata()
-               : nullptr;
-  }
-
-  CBC_BarcodeMetadata* rightBarcodeMetadata =
-      rightRowIndicatorColumn ? rightRowIndicatorColumn->getBarcodeMetadata()
-                              : nullptr;
-  if (!rightBarcodeMetadata) {
-    return leftRowIndicatorColumn ? leftRowIndicatorColumn->getBarcodeMetadata()
-                                  : nullptr;
-  }
-
-  if (leftBarcodeMetadata->getColumnCount() !=
-          rightBarcodeMetadata->getColumnCount() &&
-      leftBarcodeMetadata->getErrorCorrectionLevel() !=
-          rightBarcodeMetadata->getErrorCorrectionLevel() &&
-      leftBarcodeMetadata->getRowCount() !=
-          rightBarcodeMetadata->getRowCount()) {
-    delete leftBarcodeMetadata;
-    delete rightBarcodeMetadata;
-    return nullptr;
-  }
-  delete rightBarcodeMetadata;
-  return leftBarcodeMetadata;
-}
-CBC_DetectionResultRowIndicatorColumn*
-CBC_PDF417ScanningDecoder::getRowIndicatorColumn(CBC_CommonBitMatrix* image,
-                                                 CBC_BoundingBox* boundingBox,
-                                                 CBC_ResultPoint startPoint,
-                                                 FX_BOOL leftToRight,
-                                                 int32_t minCodewordWidth,
-                                                 int32_t maxCodewordWidth) {
-  CBC_DetectionResultRowIndicatorColumn* rowIndicatorColumn =
-      new CBC_DetectionResultRowIndicatorColumn(boundingBox, leftToRight);
-  for (int32_t i = 0; i < 2; i++) {
-    int32_t increment = i == 0 ? 1 : -1;
-    int32_t startColumn = (int32_t)startPoint.GetX();
-    for (int32_t imageRow = (int32_t)startPoint.GetY();
-         imageRow <= boundingBox->getMaxY() &&
-         imageRow >= boundingBox->getMinY();
-         imageRow += increment) {
-      CBC_Codeword* codeword =
-          detectCodeword(image, 0, image->GetWidth(), leftToRight, startColumn,
-                         imageRow, minCodewordWidth, maxCodewordWidth);
-      if (codeword) {
-        rowIndicatorColumn->setCodeword(imageRow, codeword);
-        if (leftToRight) {
-          startColumn = codeword->getStartX();
-        } else {
-          startColumn = codeword->getEndX();
-        }
-      }
-    }
-  }
-  return rowIndicatorColumn;
-}
-
-void CBC_PDF417ScanningDecoder::adjustCodewordCount(
-    CBC_DetectionResult* detectionResult,
-    CBC_BarcodeValueArrayArray* barcodeMatrix,
-    int32_t& e) {
-  std::unique_ptr<CFX_Int32Array> numberOfCodewords(
-      barcodeMatrix->GetAt(0)->GetAt(1)->getValue());
-  int32_t calculatedNumberOfCodewords =
-      detectionResult->getBarcodeColumnCount() *
-          detectionResult->getBarcodeRowCount() -
-      getNumberOfECCodeWords(detectionResult->getBarcodeECLevel());
-  if (numberOfCodewords->GetSize() == 0) {
-    if (calculatedNumberOfCodewords < 1 ||
-        calculatedNumberOfCodewords >
-            CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE) {
-      e = BCExceptiontNotFoundInstance;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    barcodeMatrix->GetAt(0)->GetAt(1)->setValue(calculatedNumberOfCodewords);
-  } else if (numberOfCodewords->GetAt(0) != calculatedNumberOfCodewords) {
-    barcodeMatrix->GetAt(0)->GetAt(1)->setValue(calculatedNumberOfCodewords);
-  }
-}
-
-CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::createDecoderResult(
-    CBC_DetectionResult* detectionResult,
-    int32_t& e) {
-  std::unique_ptr<CBC_BarcodeValueArrayArray> barcodeMatrix(
-      createBarcodeMatrix(detectionResult));
-  adjustCodewordCount(detectionResult, barcodeMatrix.get(), e);
-  if (e != BCExceptionNO) {
-    for (int32_t i = 0; i < barcodeMatrix->GetSize(); i++) {
-      CBC_BarcodeValueArray* temp = barcodeMatrix->GetAt(i);
-      for (int32_t j = 0; j < temp->GetSize(); j++)
-        delete temp->GetAt(j);
-      delete temp;
-    }
-    return nullptr;
-  }
-  CFX_Int32Array erasures;
-  CFX_Int32Array codewords;
-  codewords.SetSize(detectionResult->getBarcodeRowCount() *
-                    detectionResult->getBarcodeColumnCount());
-  CFX_ArrayTemplate<CFX_Int32Array*> ambiguousIndexValuesList;
-  CFX_Int32Array ambiguousIndexesList;
-  for (int32_t row = 0; row < detectionResult->getBarcodeRowCount(); row++) {
-    for (int32_t l = 0; l < detectionResult->getBarcodeColumnCount(); l++) {
-      CFX_Int32Array* values =
-          barcodeMatrix->GetAt(row)->GetAt(l + 1)->getValue();
-      int32_t codewordIndex =
-          row * detectionResult->getBarcodeColumnCount() + l;
-      if (values->GetSize() == 0) {
-        erasures.Add(codewordIndex);
-      } else if (values->GetSize() == 1) {
-        codewords[codewordIndex] = values->GetAt(0);
-      } else {
-        ambiguousIndexesList.Add(codewordIndex);
-        ambiguousIndexValuesList.Add(values);
-      }
-    }
-  }
-  CFX_ArrayTemplate<CFX_Int32Array*> ambiguousIndexValues;
-  ambiguousIndexValues.SetSize(ambiguousIndexValuesList.GetSize());
-  for (int32_t i = 0; i < ambiguousIndexValues.GetSize(); i++) {
-    ambiguousIndexValues.SetAt(i, ambiguousIndexValuesList.GetAt(i));
-  }
-  for (int32_t l = 0; l < barcodeMatrix->GetSize(); l++) {
-    CBC_BarcodeValueArray* temp = barcodeMatrix->GetAt(l);
-    for (int32_t j = 0; j < temp->GetSize(); j++)
-      delete temp->GetAt(j);
-    temp->RemoveAll();
-    delete temp;
-  }
-  CBC_CommonDecoderResult* decoderResult =
-      createDecoderResultFromAmbiguousValues(
-          detectionResult->getBarcodeECLevel(), codewords, erasures,
-          ambiguousIndexesList, ambiguousIndexValues, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return decoderResult;
-}
-
-CBC_CommonDecoderResult*
-CBC_PDF417ScanningDecoder::createDecoderResultFromAmbiguousValues(
-    int32_t ecLevel,
-    CFX_Int32Array& codewords,
-    CFX_Int32Array& erasureArray,
-    CFX_Int32Array& ambiguousIndexes,
-    CFX_ArrayTemplate<CFX_Int32Array*>& ambiguousIndexValues,
-    int32_t& e) {
-  CFX_Int32Array ambiguousIndexCount;
-  ambiguousIndexCount.SetSize(ambiguousIndexes.GetSize());
-  int32_t tries = 100;
-  while (tries-- > 0) {
-    for (int32_t l = 0; l < ambiguousIndexCount.GetSize(); l++) {
-      codewords[ambiguousIndexes[l]] =
-          ambiguousIndexValues.GetAt(l)->GetAt(ambiguousIndexCount[l]);
-    }
-    CBC_CommonDecoderResult* decoderResult =
-        decodeCodewords(codewords, ecLevel, erasureArray, e);
-    if (e == BCExceptionNO)
-      return decoderResult;
-
-    e = BCExceptionNO;
-    if (ambiguousIndexCount.GetSize() == 0) {
-      e = BCExceptionChecksumInstance;
-      return nullptr;
-    }
-    for (int32_t i = 0; i < ambiguousIndexCount.GetSize(); i++) {
-      if (ambiguousIndexCount[i] <
-          ambiguousIndexValues.GetAt(i)->GetSize() - 1) {
-        ambiguousIndexCount[i]++;
-        break;
-      } else {
-        ambiguousIndexCount[i] = 0;
-        if (i == ambiguousIndexCount.GetSize() - 1) {
-          e = BCExceptionChecksumInstance;
-          return nullptr;
-        }
-      }
-    }
-  }
-  e = BCExceptionChecksumInstance;
-  return nullptr;
-}
-CBC_BarcodeValueArrayArray* CBC_PDF417ScanningDecoder::createBarcodeMatrix(
-    CBC_DetectionResult* detectionResult) {
-  CBC_BarcodeValueArrayArray* barcodeMatrix = new CBC_BarcodeValueArrayArray;
-  barcodeMatrix->SetSize(detectionResult->getBarcodeRowCount());
-  for (int32_t row = 0; row < barcodeMatrix->GetSize(); row++) {
-    CBC_BarcodeValueArray* temp = new CBC_BarcodeValueArray;
-    temp->SetSize(detectionResult->getBarcodeColumnCount() + 2);
-    for (int32_t column = 0;
-         column < detectionResult->getBarcodeColumnCount() + 2; column++) {
-      temp->SetAt(column, new CBC_BarcodeValue());
-    }
-    barcodeMatrix->SetAt(row, temp);
-  }
-  for (int32_t i = 0;
-       i < detectionResult->getDetectionResultColumns().GetSize(); i++) {
-    CBC_DetectionResultColumn* detectionResultColumn =
-        detectionResult->getDetectionResultColumns().GetAt(i);
-    if (!detectionResultColumn)
-      continue;
-
-    CFX_ArrayTemplate<CBC_Codeword*>* temp =
-        detectionResultColumn->getCodewords();
-    for (int32_t l = 0; l < temp->GetSize(); l++) {
-      CBC_Codeword* codeword = temp->GetAt(l);
-      if (!codeword || codeword->getRowNumber() == -1)
-        continue;
-
-      barcodeMatrix->GetAt(codeword->getRowNumber())
-          ->GetAt(i)
-          ->setValue(codeword->getValue());
-    }
-  }
-  return barcodeMatrix;
-}
-FX_BOOL CBC_PDF417ScanningDecoder::isValidBarcodeColumn(
-    CBC_DetectionResult* detectionResult,
-    int32_t barcodeColumn) {
-  return barcodeColumn >= 0 &&
-         barcodeColumn <= detectionResult->getBarcodeColumnCount() + 1;
-}
-int32_t CBC_PDF417ScanningDecoder::getStartColumn(
-    CBC_DetectionResult* detectionResult,
-    int32_t barcodeColumn,
-    int32_t imageRow,
-    FX_BOOL leftToRight) {
-  int32_t offset = leftToRight ? 1 : -1;
-  CBC_Codeword* codeword = nullptr;
-  if (isValidBarcodeColumn(detectionResult, barcodeColumn - offset)) {
-    codeword = detectionResult->getDetectionResultColumn(barcodeColumn - offset)
-                   ->getCodeword(imageRow);
-  }
-  if (codeword) {
-    return leftToRight ? codeword->getEndX() : codeword->getStartX();
-  }
-  codeword = detectionResult->getDetectionResultColumn(barcodeColumn)
-                 ->getCodewordNearby(imageRow);
-  if (codeword) {
-    return leftToRight ? codeword->getStartX() : codeword->getEndX();
-  }
-  if (isValidBarcodeColumn(detectionResult, barcodeColumn - offset)) {
-    codeword = detectionResult->getDetectionResultColumn(barcodeColumn - offset)
-                   ->getCodewordNearby(imageRow);
-  }
-  if (codeword) {
-    return leftToRight ? codeword->getEndX() : codeword->getStartX();
-  }
-  int32_t skippedColumns = 0;
-  while (isValidBarcodeColumn(detectionResult, barcodeColumn - offset)) {
-    barcodeColumn -= offset;
-    for (int32_t i = 0;
-         i < detectionResult->getDetectionResultColumn(barcodeColumn)
-                 ->getCodewords()
-                 ->GetSize();
-         i++) {
-      CBC_Codeword* previousRowCodeword =
-          detectionResult->getDetectionResultColumn(barcodeColumn)
-              ->getCodewords()
-              ->GetAt(i);
-      if (previousRowCodeword) {
-        return (leftToRight ? previousRowCodeword->getEndX()
-                            : previousRowCodeword->getStartX()) +
-               offset * skippedColumns * (previousRowCodeword->getEndX() -
-                                          previousRowCodeword->getStartX());
-      }
-    }
-    skippedColumns++;
-  }
-  return leftToRight ? detectionResult->getBoundingBox()->getMinX()
-                     : detectionResult->getBoundingBox()->getMaxX();
-}
-CBC_Codeword* CBC_PDF417ScanningDecoder::detectCodeword(
-    CBC_CommonBitMatrix* image,
-    int32_t minColumn,
-    int32_t maxColumn,
-    FX_BOOL leftToRight,
-    int32_t startColumn,
-    int32_t imageRow,
-    int32_t minCodewordWidth,
-    int32_t maxCodewordWidth) {
-  startColumn = adjustCodewordStartColumn(image, minColumn, maxColumn,
-                                          leftToRight, startColumn, imageRow);
-  CFX_Int32Array* moduleBitCount = getModuleBitCount(
-      image, minColumn, maxColumn, leftToRight, startColumn, imageRow);
-  if (!moduleBitCount)
-    return nullptr;
-
-  int32_t endColumn;
-  int32_t codewordBitCount = CBC_PDF417Common::getBitCountSum(*moduleBitCount);
-  if (leftToRight) {
-    endColumn = startColumn + codewordBitCount;
-  } else {
-    for (int32_t i = 0; i<moduleBitCount->GetSize()>> 1; i++) {
-      int32_t tmpCount = moduleBitCount->GetAt(i);
-      moduleBitCount->SetAt(
-          i, moduleBitCount->GetAt(moduleBitCount->GetSize() - 1 - i));
-      moduleBitCount->SetAt(moduleBitCount->GetSize() - 1 - i, tmpCount);
-    }
-    endColumn = startColumn;
-    startColumn = endColumn - codewordBitCount;
-  }
-  int32_t decodedValue =
-      CBC_PDF417CodewordDecoder::getDecodedValue(*moduleBitCount);
-  int32_t codeword = CBC_PDF417Common::getCodeword(decodedValue);
-  delete moduleBitCount;
-  if (codeword == -1) {
-    return nullptr;
-  }
-  return new CBC_Codeword(startColumn, endColumn,
-                          getCodewordBucketNumber(decodedValue), codeword);
-}
-CFX_Int32Array* CBC_PDF417ScanningDecoder::getModuleBitCount(
-    CBC_CommonBitMatrix* image,
-    int32_t minColumn,
-    int32_t maxColumn,
-    FX_BOOL leftToRight,
-    int32_t startColumn,
-    int32_t imageRow) {
-  int32_t imageColumn = startColumn;
-  CFX_Int32Array* moduleBitCount = new CFX_Int32Array;
-  moduleBitCount->SetSize(8);
-  int32_t moduleNumber = 0;
-  int32_t increment = leftToRight ? 1 : -1;
-  FX_BOOL previousPixelValue = leftToRight;
-  while (((leftToRight && imageColumn < maxColumn) ||
-          (!leftToRight && imageColumn >= minColumn)) &&
-         moduleNumber < moduleBitCount->GetSize()) {
-    if (image->Get(imageColumn, imageRow) == previousPixelValue) {
-      moduleBitCount->SetAt(moduleNumber,
-                            moduleBitCount->GetAt(moduleNumber) + 1);
-      imageColumn += increment;
-    } else {
-      moduleNumber++;
-      previousPixelValue = !previousPixelValue;
-    }
-  }
-  if (moduleNumber == moduleBitCount->GetSize() ||
-      (((leftToRight && imageColumn == maxColumn) ||
-        (!leftToRight && imageColumn == minColumn)) &&
-       moduleNumber == moduleBitCount->GetSize() - 1)) {
-    return moduleBitCount;
-  }
-  delete moduleBitCount;
-  return nullptr;
-}
-int32_t CBC_PDF417ScanningDecoder::getNumberOfECCodeWords(
-    int32_t barcodeECLevel) {
-  return 2 << barcodeECLevel;
-}
-int32_t CBC_PDF417ScanningDecoder::adjustCodewordStartColumn(
-    CBC_CommonBitMatrix* image,
-    int32_t minColumn,
-    int32_t maxColumn,
-    FX_BOOL leftToRight,
-    int32_t codewordStartColumn,
-    int32_t imageRow) {
-  int32_t correctedStartColumn = codewordStartColumn;
-  int32_t increment = leftToRight ? -1 : 1;
-  for (int32_t i = 0; i < 2; i++) {
-    while (((leftToRight && correctedStartColumn >= minColumn) ||
-            (!leftToRight && correctedStartColumn < maxColumn)) &&
-           leftToRight == image->Get(correctedStartColumn, imageRow)) {
-      if (abs(codewordStartColumn - correctedStartColumn) >
-          CODEWORD_SKEW_SIZE) {
-        return codewordStartColumn;
-      }
-      correctedStartColumn += increment;
-    }
-    increment = -increment;
-    leftToRight = !leftToRight;
-  }
-  return correctedStartColumn;
-}
-FX_BOOL CBC_PDF417ScanningDecoder::checkCodewordSkew(int32_t codewordSize,
-                                                     int32_t minCodewordWidth,
-                                                     int32_t maxCodewordWidth) {
-  return minCodewordWidth - CODEWORD_SKEW_SIZE <= codewordSize &&
-         codewordSize <= maxCodewordWidth + CODEWORD_SKEW_SIZE;
-}
-CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decodeCodewords(
-    CFX_Int32Array& codewords,
-    int32_t ecLevel,
-    CFX_Int32Array& erasures,
-    int32_t& e) {
-  if (codewords.GetSize() == 0) {
-    e = BCExceptionFormatInstance;
-    return nullptr;
-  }
-  int32_t numECCodewords = 1 << (ecLevel + 1);
-  correctErrors(codewords, erasures, numECCodewords, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  verifyCodewordCount(codewords, numECCodewords, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CFX_ByteString bytestring;
-  CBC_CommonDecoderResult* decoderResult = CBC_DecodedBitStreamPaser::decode(
-      codewords, bytestring.FormatInteger(ecLevel), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return decoderResult;
-}
-int32_t CBC_PDF417ScanningDecoder::correctErrors(CFX_Int32Array& codewords,
-                                                 CFX_Int32Array& erasures,
-                                                 int32_t numECCodewords,
-                                                 int32_t& e) {
-  if ((erasures.GetSize() != 0 &&
-       erasures.GetSize() > (numECCodewords / 2 + MAX_ERRORS)) ||
-      numECCodewords < 0 || numECCodewords > MAX_EC_CODEWORDS) {
-    e = BCExceptionChecksumInstance;
-    return -1;
-  }
-  int32_t result = CBC_PDF417ECErrorCorrection::decode(
-      codewords, numECCodewords, erasures, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, -1);
-  return result;
-}
-void CBC_PDF417ScanningDecoder::verifyCodewordCount(CFX_Int32Array& codewords,
-                                                    int32_t numECCodewords,
-                                                    int32_t& e) {
-  if (codewords.GetSize() < 4) {
-    e = BCExceptionFormatInstance;
-    return;
-  }
-  int32_t numberOfCodewords = codewords.GetAt(0);
-  if (numberOfCodewords > codewords.GetSize()) {
-    e = BCExceptionFormatInstance;
-    return;
-  }
-  if (numberOfCodewords == 0) {
-    if (numECCodewords < codewords.GetSize()) {
-      codewords[0] = codewords.GetSize() - numECCodewords;
-    } else {
-      e = BCExceptionFormatInstance;
-      return;
-    }
-  }
-}
-CFX_Int32Array* CBC_PDF417ScanningDecoder::getBitCountForCodeword(
-    int32_t codeword) {
-  CFX_Int32Array* result = new CFX_Int32Array;
-  result->SetSize(8);
-  int32_t previousValue = 0;
-  int32_t i = result->GetSize() - 1;
-  while (TRUE) {
-    if ((codeword & 0x1) != previousValue) {
-      previousValue = codeword & 0x1;
-      i--;
-      if (i < 0) {
-        break;
-      }
-    }
-    result->SetAt(i, result->GetAt(i) + 1);
-    codeword >>= 1;
-  }
-  return result;
-}
-int32_t CBC_PDF417ScanningDecoder::getCodewordBucketNumber(int32_t codeword) {
-  CFX_Int32Array* array = getBitCountForCodeword(codeword);
-  int32_t result = getCodewordBucketNumber(*array);
-  delete array;
-  return result;
-}
-int32_t CBC_PDF417ScanningDecoder::getCodewordBucketNumber(
-    CFX_Int32Array& moduleBitCount) {
-  return (moduleBitCount.GetAt(0) - moduleBitCount.GetAt(2) +
-          moduleBitCount.GetAt(4) - moduleBitCount.GetAt(6) + 9) %
-         9;
-}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
deleted file mode 100644
index d136630003..0000000000
--- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
-
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
-
-class CBC_CommonDecoderResult;
-class CBC_CommonBitMatrix;
-class CBC_Codeword;
-class CBC_BoundingBox;
-class CBC_ResultPoint;
-class CBC_BarcodeMetadata;
-class CBC_DetectionResult;
-class CBC_DetectionResultRowIndicatorColumn;
-
-class CBC_PDF417ScanningDecoder {
- public:
-  CBC_PDF417ScanningDecoder();
-  virtual ~CBC_PDF417ScanningDecoder();
-
-  static void Initialize();
-  static void Finalize();
-  static CBC_CommonDecoderResult* decode(CBC_CommonBitMatrix* image,
-                                         CBC_ResultPoint* imageTopLeft,
-                                         CBC_ResultPoint* imageBottomLeft,
-                                         CBC_ResultPoint* imageTopRight,
-                                         CBC_ResultPoint* imageBottomRight,
-                                         int32_t minCodewordWidth,
-                                         int32_t maxCodewordWidth,
-                                         int32_t& e);
-  static CFX_ByteString toString(CBC_BarcodeValueArrayArray* barcodeMatrix);
-
- private:
-  static int32_t CODEWORD_SKEW_SIZE;
-  static int32_t MAX_ERRORS;
-  static int32_t MAX_EC_CODEWORDS;
-  static CBC_PDF417ECErrorCorrection* errorCorrection;
-  static CBC_DetectionResult* merge(
-      CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn,
-      CBC_DetectionResultRowIndicatorColumn* rightRowIndicatorColumn,
-      int32_t& e);
-  static CBC_BoundingBox* adjustBoundingBox(
-      CBC_DetectionResultRowIndicatorColumn* rowIndicatorColumn,
-      int32_t& e);
-  static int32_t getMax(CFX_Int32Array& values);
-  static CBC_BarcodeMetadata* getBarcodeMetadata(
-      CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn,
-      CBC_DetectionResultRowIndicatorColumn* rightRowIndicatorColumn);
-  static CBC_DetectionResultRowIndicatorColumn* getRowIndicatorColumn(
-      CBC_CommonBitMatrix* image,
-      CBC_BoundingBox* boundingBox,
-      CBC_ResultPoint startPoint,
-      FX_BOOL leftToRight,
-      int32_t minCodewordWidth,
-      int32_t maxCodewordWidth);
-  static void adjustCodewordCount(CBC_DetectionResult* detectionResult,
-                                  CBC_BarcodeValueArrayArray* barcodeMatrix,
-                                  int32_t& e);
-  static CBC_CommonDecoderResult* createDecoderResult(
-      CBC_DetectionResult* detectionResult,
-      int32_t& e);
-  static CBC_CommonDecoderResult* createDecoderResultFromAmbiguousValues(
-      int32_t ecLevel,
-      CFX_Int32Array& codewords,
-      CFX_Int32Array& erasureArray,
-      CFX_Int32Array& ambiguousIndexes,
-      CFX_ArrayTemplate<CFX_Int32Array*>& ambiguousIndexValues,
-      int32_t& e);
-  static CBC_BarcodeValueArrayArray* createBarcodeMatrix(
-      CBC_DetectionResult* detectionResult);
-  static FX_BOOL isValidBarcodeColumn(CBC_DetectionResult* detectionResult,
-                                      int32_t barcodeColumn);
-  static int32_t getStartColumn(CBC_DetectionResult* detectionResult,
-                                int32_t barcodeColumn,
-                                int32_t imageRow,
-                                FX_BOOL leftToRight);
-  static CBC_Codeword* detectCodeword(CBC_CommonBitMatrix* image,
-                                      int32_t minColumn,
-                                      int32_t maxColumn,
-                                      FX_BOOL leftToRight,
-                                      int32_t startColumn,
-                                      int32_t imageRow,
-                                      int32_t minCodewordWidth,
-                                      int32_t maxCodewordWidth);
-  static CFX_Int32Array* getModuleBitCount(CBC_CommonBitMatrix* image,
-                                           int32_t minColumn,
-                                           int32_t maxColumn,
-                                           FX_BOOL leftToRight,
-                                           int32_t startColumn,
-                                           int32_t imageRow);
-  static int32_t getNumberOfECCodeWords(int32_t barcodeECLevel);
-  static int32_t adjustCodewordStartColumn(CBC_CommonBitMatrix* image,
-                                           int32_t minColumn,
-                                           int32_t maxColumn,
-                                           FX_BOOL leftToRight,
-                                           int32_t codewordStartColumn,
-                                           int32_t imageRow);
-  static FX_BOOL checkCodewordSkew(int32_t codewordSize,
-                                   int32_t minCodewordWidth,
-                                   int32_t maxCodewordWidth);
-  static CBC_CommonDecoderResult* decodeCodewords(CFX_Int32Array& codewords,
-                                                  int32_t ecLevel,
-                                                  CFX_Int32Array& erasures,
-                                                  int32_t& e);
-  static int32_t correctErrors(CFX_Int32Array& codewords,
-                               CFX_Int32Array& erasures,
-                               int32_t numECCodewords,
-                               int32_t& e);
-  static void verifyCodewordCount(CFX_Int32Array& codewords,
-                                  int32_t numECCodewords,
-                                  int32_t& e);
-  static CFX_Int32Array* getBitCountForCodeword(int32_t codeword);
-  static int32_t getCodewordBucketNumber(int32_t codeword);
-  static int32_t getCodewordBucketNumber(CFX_Int32Array& moduleBitCount);
-};
-
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
deleted file mode 100644
index 63b3ab790d..0000000000
--- a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPattern.h"
-
-CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(
-    CFX_ArrayTemplate<CBC_QRFinderPattern*>* patternCenters) {
-  m_bottomLeft = (*patternCenters)[0];
-  m_topLeft = (*patternCenters)[1];
-  m_topRight = (*patternCenters)[2];
-}
-
-CBC_QRFinderPatternInfo::~CBC_QRFinderPatternInfo() {}
-
-CBC_QRFinderPattern* CBC_QRFinderPatternInfo::GetBottomLeft() const {
-  return m_bottomLeft;
-}
-
-CBC_QRFinderPattern* CBC_QRFinderPatternInfo::GetTopLeft() const {
-  return m_topLeft;
-}
-
-CBC_QRFinderPattern* CBC_QRFinderPatternInfo::GetTopRight() const {
-  return m_topRight;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h
deleted file mode 100644
index 6d0cb60f2f..0000000000
--- a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
-#define XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_QRFinderPattern;
-
-class CBC_QRFinderPatternInfo {
- public:
-  explicit CBC_QRFinderPatternInfo(
-      CFX_ArrayTemplate<CBC_QRFinderPattern*>* patternCenters);
-  ~CBC_QRFinderPatternInfo();
-
-  CBC_QRFinderPattern* GetBottomLeft() const;
-  CBC_QRFinderPattern* GetTopLeft() const;
-  CBC_QRFinderPattern* GetTopRight() const;
-
- private:
-  CBC_QRFinderPattern* m_bottomLeft;
-  CBC_QRFinderPattern* m_topLeft;
-  CBC_QRFinderPattern* m_topRight;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
deleted file mode 100644
index 4d5a36e250..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
-
-CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX,
-                                               FX_FLOAT posY,
-                                               FX_FLOAT estimateModuleSize)
-    : CBC_ResultPoint(posX, posY), m_moduleSize(estimateModuleSize) {}
-CBC_QRAlignmentPattern::~CBC_QRAlignmentPattern() {}
-FX_FLOAT CBC_QRAlignmentPattern::GetX() {
-  return m_x;
-}
-FX_FLOAT CBC_QRAlignmentPattern::GetY() {
-  return m_y;
-}
-FX_BOOL CBC_QRAlignmentPattern::AboutEquals(FX_FLOAT moduleSize,
-                                            FX_FLOAT i,
-                                            FX_FLOAT j) {
-  if ((FXSYS_fabs(i - GetY()) <= moduleSize) &&
-      (FXSYS_fabs(j - GetX()) <= moduleSize)) {
-    FX_FLOAT moduleSizeDiff = FXSYS_fabs(moduleSize - m_moduleSize);
-    return (moduleSizeDiff <= 1.0f) || (moduleSizeDiff / m_moduleSize <= 1.0f);
-  }
-  return FALSE;
-}
-CBC_QRAlignmentPattern* CBC_QRAlignmentPattern::Clone() {
-  return new CBC_QRAlignmentPattern(m_x, m_y, m_moduleSize);
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h b/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h
deleted file mode 100644
index 7006b72c9c..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
-class CBC_ResultPoint;
-class CBC_QRAlignmentPattern : public CBC_ResultPoint {
- private:
-  FX_FLOAT m_moduleSize;
-
- public:
-  CBC_QRAlignmentPattern(FX_FLOAT posX,
-                         FX_FLOAT posY,
-                         FX_FLOAT estimateModuleSize);
-  ~CBC_QRAlignmentPattern() override;
-
-  // CBC_ResultPoint
-  FX_FLOAT GetX() override;
-  FX_FLOAT GetY() override;
-
-  FX_BOOL AboutEquals(FX_FLOAT moduleSize, FX_FLOAT i, FX_FLOAT j);
-
-  CBC_QRAlignmentPattern* Clone();
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
deleted file mode 100644
index efc1014188..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
-#include "xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
-
-CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder(
-    CBC_CommonBitMatrix* image,
-    int32_t startX,
-    int32_t startY,
-    int32_t width,
-    int32_t height,
-    FX_FLOAT moduleSize)
-    : m_image(image),
-      m_startX(startX),
-      m_startY(startY),
-      m_width(width),
-      m_height(height),
-      m_moduleSize(moduleSize) {
-  m_crossCheckStateCount.SetSize(3);
-}
-
-CBC_QRAlignmentPatternFinder::~CBC_QRAlignmentPatternFinder() {
-  for (int32_t i = 0; i < m_possibleCenters.GetSize(); i++)
-    delete m_possibleCenters[i];
-}
-
-CBC_QRAlignmentPattern* CBC_QRAlignmentPatternFinder::Find(int32_t& e) {
-  int32_t startX = m_startX;
-  int32_t height = m_height;
-  int32_t maxJ = startX + m_width;
-  int32_t middleI = m_startY + (height >> 1);
-  CFX_Int32Array stateCount;
-  stateCount.SetSize(3);
-  for (int32_t iGen = 0; iGen < height; iGen++) {
-    int32_t i =
-        middleI + ((iGen & 0x01) == 0 ? ((iGen + 1) >> 1) : -((iGen + 1) >> 1));
-    stateCount[0] = 0;
-    stateCount[1] = 0;
-    stateCount[2] = 0;
-    int32_t j = startX;
-    while (j < maxJ && !m_image->Get(j, i)) {
-      j++;
-    }
-    int32_t currentState = 0;
-    while (j < maxJ) {
-      if (m_image->Get(j, i)) {
-        if (currentState == 1) {
-          stateCount[currentState]++;
-        } else {
-          if (currentState == 2) {
-            if (FoundPatternCross(stateCount)) {
-              CBC_QRAlignmentPattern* confirmed =
-                  HandlePossibleCenter(stateCount, i, j);
-              if (confirmed) {
-                return confirmed;
-              }
-            }
-            stateCount[0] = stateCount[2];
-            stateCount[1] = 1;
-            stateCount[2] = 0;
-            currentState = 1;
-          } else {
-            stateCount[++currentState]++;
-          }
-        }
-      } else {
-        if (currentState == 1) {
-          currentState++;
-        }
-        stateCount[currentState]++;
-      }
-      j++;
-    }
-    if (FoundPatternCross(stateCount)) {
-      CBC_QRAlignmentPattern* confirmed =
-          HandlePossibleCenter(stateCount, i, maxJ);
-      if (confirmed) {
-        return confirmed;
-      }
-    }
-  }
-  if (m_possibleCenters.GetSize() != 0) {
-    return m_possibleCenters[0]->Clone();
-  }
-  e = BCExceptionRead;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return nullptr;
-}
-FX_FLOAT CBC_QRAlignmentPatternFinder::CenterFromEnd(
-    const CFX_Int32Array& stateCount,
-    int32_t end) {
-  return (FX_FLOAT)(end - stateCount[2]) - stateCount[1] / 2.0f;
-}
-FX_BOOL CBC_QRAlignmentPatternFinder::FoundPatternCross(
-    const CFX_Int32Array& stateCount) {
-  FX_FLOAT moduleSize = m_moduleSize;
-  FX_FLOAT maxVariance = moduleSize / 2.0f;
-  for (int32_t i = 0; i < 3; i++) {
-    if (fabs(moduleSize - stateCount[i]) >= maxVariance) {
-      return false;
-    }
-  }
-  return TRUE;
-}
-FX_FLOAT CBC_QRAlignmentPatternFinder::CrossCheckVertical(
-    int32_t startI,
-    int32_t centerJ,
-    int32_t maxCount,
-    int32_t originalStateCountTotal) {
-  int32_t maxI = m_image->GetHeight();
-  CFX_Int32Array stateCount;
-  stateCount.Copy(m_crossCheckStateCount);
-  stateCount[0] = 0;
-  stateCount[1] = 0;
-  stateCount[2] = 0;
-  int32_t i = startI;
-  while (i >= 0 && m_image->Get(centerJ, i) && stateCount[1] <= maxCount) {
-    stateCount[1]++;
-    i--;
-  }
-  if (i < 0 || stateCount[1] > maxCount) {
-    return FXSYS_nan();
-  }
-  while (i >= 0 && !m_image->Get(centerJ, i) && stateCount[0] <= maxCount) {
-    stateCount[0]++;
-    i--;
-  }
-  if (stateCount[0] > maxCount) {
-    return FXSYS_nan();
-  }
-  i = startI + 1;
-  while (i < maxI && m_image->Get(centerJ, i) && stateCount[1] <= maxCount) {
-    stateCount[1]++;
-    i++;
-  }
-  if (i == maxI || stateCount[1] > maxCount) {
-    return FXSYS_nan();
-  }
-  while (i < maxI && !m_image->Get(centerJ, i) && stateCount[2] <= maxCount) {
-    stateCount[2]++;
-    i++;
-  }
-  if (stateCount[2] > maxCount) {
-    return FXSYS_nan();
-  }
-  int32_t stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2];
-  if (5 * abs(stateCountTotal - originalStateCountTotal) >=
-      originalStateCountTotal) {
-    return FXSYS_nan();
-  }
-  return FoundPatternCross(stateCount) ? CenterFromEnd(stateCount, i)
-                                       : FXSYS_nan();
-}
-CBC_QRAlignmentPattern* CBC_QRAlignmentPatternFinder::HandlePossibleCenter(
-    const CFX_Int32Array& stateCount,
-    int32_t i,
-    int32_t j) {
-  int32_t stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2];
-  FX_FLOAT centerJ = CenterFromEnd(stateCount, j);
-  FX_FLOAT centerI = CrossCheckVertical(i, (int32_t)centerJ, 2 * stateCount[1],
-                                        stateCountTotal);
-  if (!FXSYS_isnan(centerI)) {
-    FX_FLOAT estimatedModuleSize =
-        (FX_FLOAT)(stateCount[0] + stateCount[1] + stateCount[2]) / 3.0f;
-    int32_t max = m_possibleCenters.GetSize();
-    for (int32_t index = 0; index < max; index++) {
-      CBC_QRAlignmentPattern* center = m_possibleCenters[index];
-      if (center->AboutEquals(estimatedModuleSize, centerI, centerJ)) {
-        return new CBC_QRAlignmentPattern(centerJ, centerI,
-                                          estimatedModuleSize);
-      }
-    }
-    m_possibleCenters.Add(
-        new CBC_QRAlignmentPattern(centerJ, centerI, estimatedModuleSize));
-  }
-  return nullptr;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
deleted file mode 100644
index e524c4bdaf..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/utils.h"
-
-class CBC_CommonBitMatrix;
-class CBC_QRAlignmentPattern;
-
-class CBC_QRAlignmentPatternFinder {
- public:
-  CBC_QRAlignmentPatternFinder(CBC_CommonBitMatrix* image,
-                               int32_t startX,
-                               int32_t startY,
-                               int32_t width,
-                               int32_t height,
-                               FX_FLOAT moduleSize);
-  virtual ~CBC_QRAlignmentPatternFinder();
-  FX_BOOL FoundPatternCross(const CFX_Int32Array& stateCount);
-  FX_FLOAT CrossCheckVertical(int32_t startI,
-                              int32_t startJ,
-                              int32_t maxCount,
-                              int32_t originalStateCountTotal);
-  CBC_QRAlignmentPattern* Find(int32_t& e);
-  CBC_QRAlignmentPattern* HandlePossibleCenter(const CFX_Int32Array& stateCount,
-                                               int32_t i,
-                                               int32_t j);
-  static FX_FLOAT CenterFromEnd(const CFX_Int32Array& stateCount, int32_t end);
-
- private:
-  CBC_CommonBitMatrix* m_image;
-  CFX_ArrayTemplate<CBC_QRAlignmentPattern*> m_possibleCenters;
-  int32_t m_startX;
-  int32_t m_startY;
-  int32_t m_width;
-  int32_t m_height;
-  FX_FLOAT m_moduleSize;
-  CFX_Int32Array m_crossCheckStateCount;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
deleted file mode 100644
index 81d27538bf..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDataMask.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {}
-void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) {
-  m_dimension = bitMatrix->GetDimension(e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  m_tempBitMatrix = bitMatrix;
-  if (m_dimension < 21 || (m_dimension & 0x03) != 1) {
-    e = BCExceptionRead;
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-  }
-  m_bitMatrix = m_tempBitMatrix;
-  m_parsedFormatInfo = nullptr;
-  m_version = nullptr;
-}
-CBC_QRBitMatrixParser::~CBC_QRBitMatrixParser() {
-  delete m_parsedFormatInfo;
-}
-CBC_QRCoderFormatInformation* CBC_QRBitMatrixParser::ReadFormatInformation(
-    int32_t& e) {
-  if (m_parsedFormatInfo) {
-    return m_parsedFormatInfo;
-  }
-  int32_t formatInfoBits = 0;
-  int32_t j;
-  for (j = 0; j < 6; j++) {
-    formatInfoBits = CopyBit(8, j, formatInfoBits);
-  }
-  formatInfoBits = CopyBit(8, 7, formatInfoBits);
-  formatInfoBits = CopyBit(8, 8, formatInfoBits);
-  formatInfoBits = CopyBit(7, 8, formatInfoBits);
-  for (int32_t i = 5; i >= 0; i--) {
-    formatInfoBits = CopyBit(i, 8, formatInfoBits);
-  }
-  m_parsedFormatInfo =
-      CBC_QRCoderFormatInformation::DecodeFormatInformation(formatInfoBits);
-  if (m_parsedFormatInfo) {
-    return m_parsedFormatInfo;
-  }
-  int32_t dimension = m_bitMatrix->GetDimension(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  formatInfoBits = 0;
-  int32_t iMin = dimension - 8;
-  for (j = dimension - 1; j >= iMin; j--) {
-    formatInfoBits = CopyBit(j, 8, formatInfoBits);
-  }
-  for (int32_t k = dimension - 7; k < dimension; k++) {
-    formatInfoBits = CopyBit(8, k, formatInfoBits);
-  }
-  m_parsedFormatInfo =
-      CBC_QRCoderFormatInformation::DecodeFormatInformation(formatInfoBits);
-  if (m_parsedFormatInfo) {
-    return m_parsedFormatInfo;
-  }
-  e = BCExceptionRead;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return nullptr;
-}
-CBC_QRCoderVersion* CBC_QRBitMatrixParser::ReadVersion(int32_t& e) {
-  if (m_version) {
-    return m_version;
-  }
-  int32_t dimension = m_bitMatrix->GetDimension(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t provisionVersion = (dimension - 17) >> 2;
-  if (provisionVersion <= 6) {
-    CBC_QRCoderVersion* qrv =
-        CBC_QRCoderVersion::GetVersionForNumber(provisionVersion, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    return qrv;
-  }
-  int32_t versionBits = 0;
-  for (int32_t i = 5; i >= 0; i--) {
-    int32_t jMin = dimension - 11;
-    for (int32_t j = dimension - 9; j >= jMin; j--) {
-      versionBits = CopyBit(i, j, versionBits);
-    }
-  }
-  m_version = CBC_QRCoderVersion::DecodeVersionInformation(versionBits, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  if (m_version && m_version->GetDimensionForVersion() == dimension) {
-    return m_version;
-  }
-  versionBits = 0;
-  for (int32_t j = 5; j >= 0; j--) {
-    int32_t iMin = dimension - 11;
-    for (int32_t i = dimension - 9; i >= iMin; i--) {
-      versionBits = CopyBit(i, j, versionBits);
-    }
-  }
-  m_version = CBC_QRCoderVersion::DecodeVersionInformation(versionBits, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  if (m_version && m_version->GetDimensionForVersion() == dimension) {
-    return m_version;
-  }
-  e = BCExceptionRead;
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return nullptr;
-}
-int32_t CBC_QRBitMatrixParser::CopyBit(int32_t i,
-                                       int32_t j,
-                                       int32_t versionBits) {
-  return m_bitMatrix->Get(j, i) ? (versionBits << 1) | 0x1 : versionBits << 1;
-}
-CFX_ByteArray* CBC_QRBitMatrixParser::ReadCodewords(int32_t& e) {
-  CBC_QRCoderFormatInformation* formatInfo = ReadFormatInformation(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr) CBC_QRCoderVersion* version =
-      ReadVersion(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRDataMask* dataMask =
-      CBC_QRDataMask::ForReference((int32_t)(formatInfo->GetDataMask()), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t dimension = m_bitMatrix->GetDimension(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  dataMask->UnmaskBitMatrix(m_bitMatrix, dimension);
-  std::unique_ptr<CBC_CommonBitMatrix> functionPattern(
-      version->BuildFunctionPattern(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  FX_BOOL readingUp = TRUE;
-  std::unique_ptr<CFX_ByteArray> result(new CFX_ByteArray);
-  result->SetSize(version->GetTotalCodeWords());
-  int32_t resultOffset = 0;
-  int32_t currentByte = 0;
-  int32_t bitsRead = 0;
-  for (int32_t j = dimension - 1; j > 0; j -= 2) {
-    if (j == 6) {
-      j--;
-    }
-    for (int32_t count = 0; count < dimension; count++) {
-      int32_t i = readingUp ? dimension - 1 - count : count;
-      for (int32_t col = 0; col < 2; col++) {
-        if (!functionPattern->Get(j - col, i)) {
-          bitsRead++;
-          currentByte <<= 1;
-          if (m_bitMatrix->Get(j - col, i)) {
-            currentByte |= 1;
-          }
-          if (bitsRead == 8) {
-            (*result)[resultOffset++] = (uint8_t)currentByte;
-            bitsRead = 0;
-            currentByte = 0;
-          }
-        }
-      }
-    }
-    readingUp ^= TRUE;
-  }
-  if (resultOffset != version->GetTotalCodeWords()) {
-    e = BCExceptionRead;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return result.release();
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h
deleted file mode 100644
index 66b28d924b..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_QRCoderVersion;
-class CBC_QRCoderFormatInformation;
-
-class CBC_QRBitMatrixParser {
- private:
-  CBC_CommonBitMatrix* m_bitMatrix;
-  CBC_CommonBitMatrix* m_tempBitMatrix;
-  CBC_QRCoderVersion* m_version;
-  CBC_QRCoderFormatInformation* m_parsedFormatInfo;
-  int32_t m_dimension;
-
- public:
-  CBC_QRBitMatrixParser();
-  virtual ~CBC_QRBitMatrixParser();
-  CBC_QRCoderFormatInformation* ReadFormatInformation(int32_t& e);
-  CBC_QRCoderVersion* ReadVersion(int32_t& e);
-  int32_t CopyBit(int32_t i, int32_t j, int32_t versionBits);
-  CFX_ByteArray* ReadCodewords(int32_t& e);
-  virtual void Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/fxbarcode/qrcode/BC_QRCodeReader.cpp
deleted file mode 100644
index 0f9c44f0c5..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCodeReader.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRCodeReader.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/BC_Binarizer.h"
-#include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
-#include "xfa/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDataMask.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
-
-CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(nullptr) {}
-void CBC_QRCodeReader::Init() {
-  m_decoder = new CBC_QRCoderDecoder;
-  m_decoder->Init();
-}
-CBC_QRCodeReader::~CBC_QRCodeReader() {
-  delete m_decoder;
-}
-CFX_ByteString CBC_QRCodeReader::Decode(CBC_BinaryBitmap* image,
-                                        int32_t hints,
-                                        int32_t& e) {
-  CBC_CommonBitMatrix* matrix = image->GetMatrix(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CBC_QRDetector detector(matrix);
-  std::unique_ptr<CBC_QRDetectorResult> detectorResult(
-      detector.Detect(hints, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  std::unique_ptr<CBC_CommonDecoderResult> decodeResult(
-      m_decoder->Decode(detectorResult->GetBits(), 0, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return (decodeResult->GetText());
-}
-CFX_ByteString CBC_QRCodeReader::Decode(const CFX_WideString& filename,
-                                        int32_t hints,
-                                        int32_t byteModeDecode,
-                                        int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(filename);
-  source.Init(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString bs = Decode(&bitmap, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return bs;
-}
-CFX_ByteString CBC_QRCodeReader::Decode(CFX_DIBitmap* pBitmap,
-                                        int32_t hints,
-                                        int32_t byteModeDecode,
-                                        int32_t& e) {
-  CBC_BufferedImageLuminanceSource source(pBitmap);
-  CBC_GlobalHistogramBinarizer binarizer(&source);
-  CBC_BinaryBitmap bitmap(&binarizer);
-  CFX_ByteString bs = Decode(&bitmap, hints, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return bs;
-}
-CFX_ByteString CBC_QRCodeReader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
-  CFX_ByteString bs = Decode(image, 0, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  return bs;
-}
-void CBC_QRCodeReader::ReleaseAll() {
-  delete CBC_ReedSolomonGF256::QRCodeFild;
-  CBC_ReedSolomonGF256::QRCodeFild = nullptr;
-  delete CBC_ReedSolomonGF256::DataMatrixField;
-  CBC_ReedSolomonGF256::DataMatrixField = nullptr;
-  CBC_QRCoderMode::Destroy();
-  CBC_QRCoderErrorCorrectionLevel::Destroy();
-  CBC_QRDataMask::Destroy();
-  CBC_QRCoderVersion::Destroy();
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h b/xfa/fxbarcode/qrcode/BC_QRCodeReader.h
deleted file mode 100644
index b3a72b4d18..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
-
-#include <stdint.h>
-
-#include "core/fxcrt/include/fx_string.h"
-#include "xfa/fxbarcode/BC_Reader.h"
-
-class CBC_BinaryBitmap;
-class CBC_QRCoderDecoder;
-class CFX_DIBitmap;
-
-class CBC_QRCodeReader : public CBC_Reader {
- private:
-  CBC_QRCoderDecoder* m_decoder;
-
- public:
-  CBC_QRCodeReader();
-  ~CBC_QRCodeReader() override;
-
-  CFX_ByteString Decode(CFX_DIBitmap* pBitmap,
-                        int32_t hints,
-                        int32_t byteModeDecode,
-                        int32_t& e);
-  CFX_ByteString Decode(const CFX_WideString& filename,
-                        int32_t hints,
-                        int32_t byteModeDecode,
-                        int32_t& e);
-  static void ReleaseAll();
-
-  // CBC_Reader
-  CFX_ByteString Decode(CBC_BinaryBitmap* image,
-                        int32_t hints,
-                        int32_t& e) override;
-  CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override;
-  virtual void Init();
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index 8e1d6edb70..c9f16cafd1 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -20,14 +20,15 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_TwoDimWriter.h"
 #include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCodeReader.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h"
+#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h"
 
 CBC_QRCodeWriter::CBC_QRCodeWriter() {
   m_bFixedSize = TRUE;
@@ -36,7 +37,13 @@ CBC_QRCodeWriter::CBC_QRCodeWriter() {
 }
 CBC_QRCodeWriter::~CBC_QRCodeWriter() {}
 void CBC_QRCodeWriter::ReleaseAll() {
-  CBC_QRCodeReader::ReleaseAll();
+  delete CBC_ReedSolomonGF256::QRCodeFild;
+  CBC_ReedSolomonGF256::QRCodeFild = nullptr;
+  delete CBC_ReedSolomonGF256::DataMatrixField;
+  CBC_ReedSolomonGF256::DataMatrixField = nullptr;
+  CBC_QRCoderMode::Destroy();
+  CBC_QRCoderErrorCorrectionLevel::Destroy();
+  CBC_QRCoderVersion::Destroy();
 }
 FX_BOOL CBC_QRCodeWriter::SetVersion(int32_t version) {
   if (version < 0 || version > 40) {
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
deleted file mode 100644
index 97219ddd72..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDataBlock.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
-
-CBC_QRCoderDecoder::CBC_QRCoderDecoder() {
-  m_rsDecoder = nullptr;
-}
-
-void CBC_QRCoderDecoder::Init() {
-  m_rsDecoder = new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::QRCodeFild);
-}
-CBC_QRCoderDecoder::~CBC_QRCoderDecoder() {
-  delete m_rsDecoder;
-}
-CBC_CommonDecoderResult* CBC_QRCoderDecoder::Decode(FX_BOOL* image,
-                                                    int32_t width,
-                                                    int32_t height,
-                                                    int32_t& e) {
-  CBC_CommonBitMatrix bits;
-  bits.Init(width);
-  for (int32_t i = 0; i < width; i++) {
-    for (int32_t j = 0; j < height; j++) {
-      if (image[i * width + j]) {
-        bits.Set(j, i);
-      }
-    }
-  }
-  CBC_CommonDecoderResult* cdr = Decode(&bits, height, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return cdr;
-}
-CBC_CommonDecoderResult* CBC_QRCoderDecoder::Decode(CBC_CommonBitMatrix* bits,
-                                                    int32_t byteModeDecode,
-                                                    int32_t& e) {
-  CBC_QRBitMatrixParser parser;
-  parser.Init(bits, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRCoderVersion* version = parser.ReadVersion(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRCoderFormatInformation* temp = parser.ReadFormatInformation(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRCoderErrorCorrectionLevel* ecLevel = temp->GetErrorCorrectionLevel();
-  std::unique_ptr<CFX_ByteArray> codewords(parser.ReadCodewords(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CFX_ArrayTemplate<CBC_QRDataBlock*>* dataBlocks =
-      CBC_QRDataBlock::GetDataBlocks(codewords.get(), version, ecLevel, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t totalBytes = 0;
-  for (int32_t i = 0; i < dataBlocks->GetSize(); i++) {
-    totalBytes += (*dataBlocks)[i]->GetNumDataCodewords();
-  }
-  CFX_ByteArray resultBytes;
-  for (int32_t j = 0; j < dataBlocks->GetSize(); j++) {
-    CBC_QRDataBlock* dataBlock = (*dataBlocks)[j];
-    CFX_ByteArray* codewordBytes = dataBlock->GetCodewords();
-    int32_t numDataCodewords = dataBlock->GetNumDataCodewords();
-    CorrectErrors(codewordBytes, numDataCodewords, e);
-    if (e != BCExceptionNO) {
-      for (int32_t k = 0; k < dataBlocks->GetSize(); k++) {
-        delete (*dataBlocks)[k];
-      }
-      delete dataBlocks;
-      return nullptr;
-    }
-    for (int32_t i = 0; i < numDataCodewords; i++) {
-      resultBytes.Add((*codewordBytes)[i]);
-    }
-  }
-  for (int32_t k = 0; k < dataBlocks->GetSize(); k++) {
-    delete (*dataBlocks)[k];
-  }
-  delete dataBlocks;
-  CBC_CommonDecoderResult* cdr = CBC_QRDecodedBitStreamParser::Decode(
-      &resultBytes, version, ecLevel, byteModeDecode, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return cdr;
-}
-void CBC_QRCoderDecoder::CorrectErrors(CFX_ByteArray* codewordBytes,
-                                       int32_t numDataCodewords,
-                                       int32_t& e) {
-  int32_t numCodewords = codewordBytes->GetSize();
-  CFX_Int32Array codewordsInts;
-  codewordsInts.SetSize(numCodewords);
-  for (int32_t i = 0; i < numCodewords; i++) {
-    codewordsInts[i] = (int32_t)((*codewordBytes)[i] & 0xff);
-  }
-  int32_t numECCodewords = codewordBytes->GetSize() - numDataCodewords;
-  m_rsDecoder->Decode(&codewordsInts, numECCodewords, e);
-  BC_EXCEPTION_CHECK_ReturnVoid(e);
-  for (int32_t k = 0; k < numDataCodewords; k++) {
-    (*codewordBytes)[k] = (uint8_t)codewordsInts[k];
-  }
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h
deleted file mode 100644
index 3a588b6293..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_ReedSolomonDecoder;
-class CBC_CommonDecoderResult;
-
-class CBC_QRCoderDecoder {
- private:
-  CBC_ReedSolomonDecoder* m_rsDecoder;
-
- public:
-  CBC_QRCoderDecoder();
-  virtual ~CBC_QRCoderDecoder();
-
-  CBC_CommonDecoderResult* Decode(FX_BOOL* image,
-                                  int32_t width,
-                                  int32_t height,
-                                  int32_t& e);
-  CBC_CommonDecoderResult* Decode(CBC_CommonBitMatrix* bits,
-                                  int32_t byteModeDecode,
-                                  int32_t& e);
-  void CorrectErrors(CFX_ByteArray* codewordBytes,
-                     int32_t numDataCodewords,
-                     int32_t& e);
-  virtual void Init();
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
deleted file mode 100644
index 1c85aa16d7..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
-
-#include <limits>
-
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/utils.h"
-
-namespace {
-
-const uint16_t FORMAT_INFO_MASK_QR = 0X5412;
-
-struct DecodeInfo {
-  uint16_t target;
-  uint16_t format;
-};
-const DecodeInfo FORMAT_INFO_DECODE_LOOKUP[32] = {
-    {0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03},
-    {0x45F9, 0x04}, {0x40CE, 0x05}, {0x4F97, 0x06}, {0x4AA0, 0x07},
-    {0x77C4, 0x08}, {0x72F3, 0x09}, {0x7DAA, 0x0A}, {0x789D, 0x0B},
-    {0x662F, 0x0C}, {0x6318, 0x0D}, {0x6C41, 0x0E}, {0x6976, 0x0F},
-    {0x1689, 0x10}, {0x13BE, 0x11}, {0x1CE7, 0x12}, {0x19D0, 0x13},
-    {0x0762, 0x14}, {0x0255, 0x15}, {0x0D0C, 0x16}, {0x083B, 0x17},
-    {0x355F, 0x18}, {0x3068, 0x19}, {0x3F31, 0x1A}, {0x3A06, 0x1B},
-    {0x24B4, 0x1C}, {0x2183, 0x1D}, {0x2EDA, 0x1E}, {0x2BED, 0x1F},
-};
-const uint8_t BITS_SET_IN_HALF_BYTE[] = {0, 1, 1, 2, 1, 2, 2, 3,
-                                         1, 2, 2, 3, 2, 3, 3, 4};
-
-CBC_QRCoderFormatInformation* DoDecodeFormatInformation(
-    int32_t maskedFormatInfo) {
-  int32_t bestDifference = std::numeric_limits<int32_t>::max();
-  int32_t bestFormatInfo = 0;
-  for (int32_t i = 0; i < 32; ++i) {
-    const DecodeInfo& decodeInfo = FORMAT_INFO_DECODE_LOOKUP[i];
-    if (decodeInfo.target == maskedFormatInfo)
-      return new CBC_QRCoderFormatInformation(decodeInfo.format);
-
-    int32_t bitsDifference = CBC_QRCoderFormatInformation::NumBitsDiffering(
-        maskedFormatInfo, decodeInfo.target);
-    if (bitsDifference < bestDifference) {
-      bestFormatInfo = decodeInfo.format;
-      bestDifference = bitsDifference;
-    }
-  }
-  if (bestDifference > 3)
-    return nullptr;
-  return new CBC_QRCoderFormatInformation(bestFormatInfo);
-}
-
-}  // namespace
-
-CBC_QRCoderFormatInformation::CBC_QRCoderFormatInformation(int32_t formatInfo)
-    : m_dataMask(static_cast<uint8_t>(formatInfo & 0x07)) {
-  m_errorCorrectLevel =
-      CBC_QRCoderErrorCorrectionLevel::ForBits((formatInfo >> 3) & 0x03);
-}
-
-CBC_QRCoderFormatInformation::~CBC_QRCoderFormatInformation() {}
-int32_t CBC_QRCoderFormatInformation::NumBitsDiffering(int32_t a, int32_t b) {
-  a ^= b;
-  return BITS_SET_IN_HALF_BYTE[a & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 4) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 8) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 12) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 16) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 20) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 24) & 0x0F] +
-         BITS_SET_IN_HALF_BYTE[(a >> 28) & 0x0F];
-}
-uint8_t CBC_QRCoderFormatInformation::GetDataMask() const {
-  return m_dataMask;
-}
-
-// static
-CBC_QRCoderErrorCorrectionLevel*
-CBC_QRCoderFormatInformation::GetErrorCorrectionLevel() {
-  return m_errorCorrectLevel;
-}
-
-// static
-CBC_QRCoderFormatInformation*
-CBC_QRCoderFormatInformation::DecodeFormatInformation(
-    int32_t maskedFormatInfo) {
-  CBC_QRCoderFormatInformation* formatInfo =
-      DoDecodeFormatInformation(maskedFormatInfo);
-  if (formatInfo)
-    return formatInfo;
-  return DoDecodeFormatInformation(maskedFormatInfo ^ FORMAT_INFO_MASK_QR);
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
deleted file mode 100644
index b069795ce1..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
-
-#include <stdint.h>
-
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderFormatInformation {
- public:
-  explicit CBC_QRCoderFormatInformation(int32_t formatInfo);
-  ~CBC_QRCoderFormatInformation();
-
-  uint8_t GetDataMask() const;
-  CBC_QRCoderErrorCorrectionLevel* GetErrorCorrectionLevel();
-
-  static int32_t NumBitsDiffering(int32_t a, int32_t b);
-  static CBC_QRCoderFormatInformation* DecodeFormatInformation(
-      int32_t maskedFormatInfo);
-
- private:
-  CBC_QRCoderErrorCorrectionLevel* m_errorCorrectLevel;
-  const uint8_t m_dataMask;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index cae0d54c7c..b0b445bede 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -25,10 +25,28 @@
 #include "xfa/fxbarcode/qrcode/BC_QRCoderECB.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
 #include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
 #include "xfa/fxbarcode/utils.h"
 
+namespace {
+
+const uint8_t BITS_SET_IN_HALF_BYTE[] = {0, 1, 1, 2, 1, 2, 2, 3,
+                                         1, 2, 2, 3, 2, 3, 3, 4};
+
+int32_t NumBitsDiffering(int32_t a, int32_t b) {
+  a ^= b;
+  return BITS_SET_IN_HALF_BYTE[a & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 4) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 8) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 12) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 16) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 20) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 24) & 0x0F] +
+         BITS_SET_IN_HALF_BYTE[(a >> 28) & 0x0F];
+}
+
+}  // namespace
+
 const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = {
     0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847,
     0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6,
@@ -372,8 +390,7 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::DecodeVersionInformation(
       BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
       return qcv;
     }
-    int32_t bitsDifference = CBC_QRCoderFormatInformation::NumBitsDiffering(
-        versionBits, targetVersion);
+    int32_t bitsDifference = NumBitsDiffering(versionBits, targetVersion);
     if (bitsDifference < bestDifference) {
       bestVersion = i + 7;
       bestDifference = bitsDifference;
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/fxbarcode/qrcode/BC_QRDataBlock.cpp
deleted file mode 100644
index 0be3c8d61e..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDataBlock.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRDataBlock.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECB.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords,
-                                 CFX_ByteArray* codewords)
-    : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {}
-CBC_QRDataBlock::~CBC_QRDataBlock() {
-  delete m_codewords;
-}
-int32_t CBC_QRDataBlock::GetNumDataCodewords() {
-  return m_numDataCodewords;
-}
-CFX_ByteArray* CBC_QRDataBlock::GetCodewords() {
-  return m_codewords;
-}
-CFX_ArrayTemplate<CBC_QRDataBlock*>* CBC_QRDataBlock::GetDataBlocks(
-    CFX_ByteArray* rawCodewords,
-    CBC_QRCoderVersion* version,
-    CBC_QRCoderErrorCorrectionLevel* ecLevel,
-    int32_t& e) {
-  if (rawCodewords->GetSize() != version->GetTotalCodeWords()) {
-    e = BCExceptionIllegalArgument;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  CBC_QRCoderECBlocks* ecBlocks = version->GetECBlocksForLevel(ecLevel);
-  int32_t totalBlocks = 0;
-  CFX_ArrayTemplate<CBC_QRCoderECB*>* ecBlockArray = ecBlocks->GetECBlocks();
-  int32_t i = 0;
-  for (i = 0; i < ecBlockArray->GetSize(); i++) {
-    totalBlocks += (*ecBlockArray)[i]->GetCount();
-  }
-  std::unique_ptr<CFX_ArrayTemplate<CBC_QRDataBlock*>> result(
-      new CFX_ArrayTemplate<CBC_QRDataBlock*>());
-  result->SetSize(totalBlocks);
-  int32_t numResultBlocks = 0;
-  for (int32_t j = 0; j < ecBlockArray->GetSize(); j++) {
-    CBC_QRCoderECB* ecBlock = (*ecBlockArray)[j];
-    for (int32_t k = 0; k < ecBlock->GetCount(); k++) {
-      int32_t numDataCodewords = ecBlock->GetDataCodeWords();
-      int32_t numBlockCodewords =
-          ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
-      CFX_ByteArray* bytearray = new CFX_ByteArray();
-      bytearray->SetSize(numBlockCodewords);
-      (*result)[numResultBlocks++] =
-          new CBC_QRDataBlock(numDataCodewords, bytearray);
-    }
-  }
-  int32_t shorterBlocksTotalCodewords = (*result)[0]->m_codewords->GetSize();
-  int32_t longerBlocksStartAt = result->GetSize() - 1;
-  while (longerBlocksStartAt >= 0) {
-    int32_t numCodewords =
-        (*result)[longerBlocksStartAt]->m_codewords->GetSize();
-    if (numCodewords == shorterBlocksTotalCodewords) {
-      break;
-    }
-    longerBlocksStartAt--;
-  }
-  longerBlocksStartAt++;
-  int32_t shorterBlocksNumDataCodewords =
-      shorterBlocksTotalCodewords - ecBlocks->GetECCodeWordsPerBlock();
-  int32_t rawCodewordsOffset = 0;
-  int32_t x = 0;
-  for (int32_t k = 0; k < shorterBlocksNumDataCodewords; k++) {
-    for (x = 0; x < numResultBlocks; x++) {
-      (*((*result)[x]->m_codewords))[k] = (*rawCodewords)[rawCodewordsOffset++];
-    }
-  }
-  for (x = longerBlocksStartAt; x < numResultBlocks; x++) {
-    (*((*result)[x]->m_codewords))[shorterBlocksNumDataCodewords] =
-        (*rawCodewords)[rawCodewordsOffset++];
-  }
-  int32_t max = (*result)[0]->m_codewords->GetSize();
-  for (i = shorterBlocksNumDataCodewords; i < max; i++) {
-    for (int32_t y = 0; y < numResultBlocks; y++) {
-      int32_t iOffset = y < longerBlocksStartAt ? i : i + 1;
-      (*((*result)[y]->m_codewords))[iOffset] =
-          (*rawCodewords)[rawCodewordsOffset++];
-    }
-  }
-  return result.release();
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/fxbarcode/qrcode/BC_QRDataBlock.h
deleted file mode 100644
index 014018dec0..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderVersion;
-
-class CBC_QRDataBlock final {
- public:
-  ~CBC_QRDataBlock();
-  int32_t GetNumDataCodewords();
-  CFX_ByteArray* GetCodewords();
-  static CFX_ArrayTemplate<CBC_QRDataBlock*>* GetDataBlocks(
-      CFX_ByteArray* rawCodewords,
-      CBC_QRCoderVersion* version,
-      CBC_QRCoderErrorCorrectionLevel* ecLevel,
-      int32_t& e);
-
- private:
-  CBC_QRDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords);
-
-  int32_t m_numDataCodewords;
-  CFX_ByteArray* m_codewords;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/fxbarcode/qrcode/BC_QRDataMask.cpp
deleted file mode 100644
index e21b5d2d37..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDataMask.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDataMask.h"
-#include "xfa/fxbarcode/utils.h"
-
-namespace {
-
-int32_t N_DATA_MASKS = 0;
-CFX_ArrayTemplate<CBC_QRDataMask*>* DATA_MASKS = nullptr;
-
-}  // namespace
-
-void CBC_QRDataMask::Initialize() {
-  DATA_MASKS = new CFX_ArrayTemplate<CBC_QRDataMask*>();
-  N_DATA_MASKS = BuildDataMasks();
-}
-
-void CBC_QRDataMask::Finalize() {
-  Destroy();
-  delete DATA_MASKS;
-  DATA_MASKS = nullptr;
-}
-
-void CBC_QRDataMask::Destroy() {
-  for (int32_t i = 0; i < N_DATA_MASKS; ++i)
-    delete (*DATA_MASKS)[i];
-}
-
-void CBC_QRDataMask::UnmaskBitMatrix(CBC_CommonBitMatrix* bits,
-                                     int32_t dimension) {
-  for (int32_t i = 0; i < dimension; i++) {
-    for (int32_t j = 0; j < dimension; j++) {
-      if (IsMasked(i, j))
-        bits->Flip(j, i);
-    }
-  }
-}
-
-CBC_QRDataMask* CBC_QRDataMask::ForReference(int32_t reference, int32_t& e) {
-  if (reference < 0 || reference > 7) {
-    e = BCExceptionReferenceMustBeBetween0And7;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  return (*DATA_MASKS)[reference];
-}
-
-class DataMask000 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask001 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask010 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask011 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask100 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask101 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask110 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-class DataMask111 : public CBC_QRDataMask {
- public:
-  // CBC_QRDataMask
-  FX_BOOL IsMasked(int32_t x, int32_t y) override;
-};
-
-int32_t CBC_QRDataMask::BuildDataMasks() {
-  DATA_MASKS->Add(new DataMask000);
-  DATA_MASKS->Add(new DataMask001);
-  DATA_MASKS->Add(new DataMask010);
-  DATA_MASKS->Add(new DataMask011);
-  DATA_MASKS->Add(new DataMask100);
-  DATA_MASKS->Add(new DataMask101);
-  DATA_MASKS->Add(new DataMask110);
-  DATA_MASKS->Add(new DataMask111);
-  return DATA_MASKS->GetSize();
-}
-
-CBC_QRDataMask::CBC_QRDataMask() {}
-
-CBC_QRDataMask::~CBC_QRDataMask() {}
-
-FX_BOOL DataMask000::IsMasked(int32_t x, int32_t y) {
-  return ((x + y) % 2) == 0;
-}
-
-FX_BOOL DataMask001::IsMasked(int32_t x, int32_t y) {
-  return (x % 2) == 0;
-}
-
-FX_BOOL DataMask010::IsMasked(int32_t x, int32_t y) {
-  return y % 3 == 0;
-}
-
-FX_BOOL DataMask011::IsMasked(int32_t x, int32_t y) {
-  return (x + y) % 3 == 0;
-}
-
-FX_BOOL DataMask100::IsMasked(int32_t x, int32_t y) {
-  return (((x >> 1) + (y / 3)) % 2) == 0;
-}
-
-FX_BOOL DataMask101::IsMasked(int32_t x, int32_t y) {
-  size_t temp = x * y;
-  return (temp % 2) + (temp % 3) == 0;
-}
-
-FX_BOOL DataMask110::IsMasked(int32_t x, int32_t y) {
-  size_t temp = x * y;
-  return (((temp % 2) + (temp % 3)) % 2) == 0;
-}
-
-FX_BOOL DataMask111::IsMasked(int32_t x, int32_t y) {
-  return ((((x + y) % 2) + ((x * y) % 3)) % 2) == 0;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/fxbarcode/qrcode/BC_QRDataMask.h
deleted file mode 100644
index dc8cf498b3..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDataMask.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-
-class CBC_QRDataMask {
- public:
-  CBC_QRDataMask();
-  virtual ~CBC_QRDataMask();
-
-  static void Initialize();
-  static void Finalize();
-  static CBC_QRDataMask* ForReference(int32_t reference, int32_t& e);
-  static int32_t BuildDataMasks();
-  static void Destroy();
-
-  virtual FX_BOOL IsMasked(int32_t i, int32_t j) = 0;
-  void UnmaskBitMatrix(CBC_CommonBitMatrix* bits, int32_t dimension);
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
deleted file mode 100644
index 062b326bd7..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/common/BC_CommonBitSource.h"
-#include "xfa/fxbarcode/common/BC_CommonCharacterSetECI.h"
-#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
-#include "xfa/fxbarcode/common/BC_CommonECI.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
-
-const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";
-const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
-    'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z', ' ', '$', '%', '*', '+', '-', '.', '/', ':'};
-
-CBC_QRDecodedBitStreamParser::CBC_QRDecodedBitStreamParser() {}
-CBC_QRDecodedBitStreamParser::~CBC_QRDecodedBitStreamParser() {}
-CBC_CommonDecoderResult* CBC_QRDecodedBitStreamParser::Decode(
-    CFX_ByteArray* bytes,
-    CBC_QRCoderVersion* version,
-    CBC_QRCoderErrorCorrectionLevel* ecLevel,
-    int32_t byteModeDecode,
-    int32_t& e) {
-  CBC_CommonBitSource bits(bytes);
-  CFX_ByteString result;
-  CBC_CommonCharacterSetECI* currentCharacterSetECI = nullptr;
-  FX_BOOL fc1Infact = FALSE;
-  CFX_Int32Array byteSegments;
-  CBC_QRCoderMode* mode = nullptr;
-  do {
-    if (bits.Available() < 4) {
-      mode = CBC_QRCoderMode::sTERMINATOR;
-    } else {
-      int32_t iTemp1 = bits.ReadBits(4, e);
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      mode = CBC_QRCoderMode::ForBits(iTemp1, e);
-      BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      if (!mode) {
-        e = BCExceptionUnSupportMode;
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      }
-    }
-    if (!(mode == CBC_QRCoderMode::sTERMINATOR)) {
-      if (mode == CBC_QRCoderMode::sFNC1_FIRST_POSITION ||
-          mode == CBC_QRCoderMode::sFNC1_SECOND_POSITION) {
-        fc1Infact = TRUE;
-      } else if (mode == CBC_QRCoderMode::sSTRUCTURED_APPEND) {
-        bits.ReadBits(16, e);
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-      } else if (mode == CBC_QRCoderMode::sECI) {
-        int32_t value = ParseECIValue(&bits, e);
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        currentCharacterSetECI =
-            CBC_CommonCharacterSetECI::GetCharacterSetECIByValue(value);
-      } else {
-        if (mode == CBC_QRCoderMode::sGBK) {
-          bits.ReadBits(4, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        }
-        int32_t numBits = mode->GetCharacterCountBits(version, e);
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        int32_t count = bits.ReadBits(numBits, e);
-        BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        if (mode == CBC_QRCoderMode::sNUMERIC) {
-          DecodeNumericSegment(&bits, result, count, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        } else if (mode == CBC_QRCoderMode::sALPHANUMERIC) {
-          DecodeAlphanumericSegment(&bits, result, count, fc1Infact, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        } else if (mode == CBC_QRCoderMode::sBYTE) {
-          DecodeByteSegment(&bits, result, count, currentCharacterSetECI,
-                            &byteSegments, byteModeDecode, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        } else if (mode == CBC_QRCoderMode::sGBK) {
-          DecodeGBKSegment(&bits, result, count, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        } else if (mode == CBC_QRCoderMode::sKANJI) {
-          DecodeKanjiSegment(&bits, result, count, e);
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        } else {
-          e = BCExceptionUnSupportMode;
-          BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-        }
-      }
-    }
-  } while (!(mode == CBC_QRCoderMode::sTERMINATOR));
-  CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
-  tempCd->Init(*bytes, result, byteSegments, ecLevel, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return tempCd;
-}
-void CBC_QRDecodedBitStreamParser::DecodeGBKSegment(CBC_CommonBitSource* bits,
-                                                    CFX_ByteString& result,
-                                                    int32_t count,
-                                                    int32_t& e) {
-  CFX_ByteString buffer;
-  while (count > 0) {
-    int32_t twoBytes = bits->ReadBits(13, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    int32_t assembledTwoBytes = ((twoBytes / 0x060) << 8) | (twoBytes % 0x060);
-    if (assembledTwoBytes <= 0x0095d) {
-      assembledTwoBytes += 0x0a1a1;
-    } else {
-      assembledTwoBytes += 0x0a6a1;
-    }
-    buffer += (uint8_t)(assembledTwoBytes >> 8);
-    buffer += (uint8_t)assembledTwoBytes;
-    count--;
-  }
-  CBC_UtilCodingConvert::LocaleToUtf8(buffer, result);
-}
-void CBC_QRDecodedBitStreamParser::DecodeKanjiSegment(CBC_CommonBitSource* bits,
-                                                      CFX_ByteString& result,
-                                                      int32_t count,
-                                                      int32_t& e) {
-  CFX_ByteString buffer;
-  while (count > 0) {
-    int32_t twoBytes = bits->ReadBits(13, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    int32_t assembledTwoBytes = ((twoBytes / 0x0c0) << 8) | (twoBytes % 0x0c0);
-    if (assembledTwoBytes <= 0x01f00) {
-      assembledTwoBytes += 0x08140;
-    } else {
-      assembledTwoBytes += 0x0c140;
-    }
-    buffer += (uint8_t)(assembledTwoBytes >> 8);
-    buffer += (uint8_t)assembledTwoBytes;
-    count--;
-  }
-  CBC_UtilCodingConvert::LocaleToUtf8(buffer, result);
-}
-void CBC_QRDecodedBitStreamParser::DecodeByteSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t count,
-    CBC_CommonCharacterSetECI* currentCharacterSetECI,
-    CFX_Int32Array* byteSegments,
-    int32_t byteModeDecode,
-    int32_t& e) {
-  if (count < 0) {
-    e = BCExceptionNotFound;
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-  }
-  if ((count << 3) > bits->Available()) {
-    e = BCExceptionRead;
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-  }
-  uint8_t* readBytes = FX_Alloc(uint8_t, count);
-  FXSYS_memset(readBytes, 0x00, count);
-  for (int32_t i = 0; i < count; i++) {
-    readBytes[i] = (uint8_t)bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-  }
-  CFX_ByteString bs(readBytes, count);
-  result += bs;
-  FX_Free(readBytes);
-}
-void CBC_QRDecodedBitStreamParser::DecodeAlphanumericSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t count,
-    FX_BOOL fac1InEffect,
-    int32_t& e) {
-  int32_t start = result.GetLength();
-  while (count > 1) {
-    int32_t nextTwoCharsBits = bits->ReadBits(11, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    BC_FX_ByteString_Append(result, 1,
-                            ALPHANUMERIC_CHARS[nextTwoCharsBits / 45]);
-    BC_FX_ByteString_Append(result, 1,
-                            ALPHANUMERIC_CHARS[nextTwoCharsBits % 45]);
-    count -= 2;
-  }
-  if (count == 1) {
-    int32_t itemp = bits->ReadBits(6, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    BC_FX_ByteString_Append(result, 1, ALPHANUMERIC_CHARS[itemp]);
-  }
-  if (fac1InEffect) {
-    for (int32_t i = start; i < result.GetLength(); i++) {
-      if (result[i] == '%') {
-        if ((i < result.GetLength() - 1) && result[i + 1] == '%') {
-          result.Delete(i + 1, 1);
-        } else {
-          result.SetAt(i, (FX_CHAR)0x1d);
-        }
-      }
-    }
-  }
-}
-void CBC_QRDecodedBitStreamParser::DecodeNumericSegment(
-    CBC_CommonBitSource* bits,
-    CFX_ByteString& result,
-    int32_t count,
-    int32_t& e) {
-  while (count >= 3) {
-    int32_t threeDigitsBits = bits->ReadBits(10, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (threeDigitsBits >= 1000) {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    BC_FX_ByteString_Append(result, 1,
-                            ALPHANUMERIC_CHARS[threeDigitsBits / 100]);
-    BC_FX_ByteString_Append(result, 1,
-                            ALPHANUMERIC_CHARS[(threeDigitsBits / 10) % 10]);
-    BC_FX_ByteString_Append(result, 1,
-                            ALPHANUMERIC_CHARS[threeDigitsBits % 10]);
-    count -= 3;
-  }
-  if (count == 2) {
-    int32_t twoDigitBits = bits->ReadBits(7, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (twoDigitBits >= 100) {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    BC_FX_ByteString_Append(result, 1, ALPHANUMERIC_CHARS[twoDigitBits / 10]);
-    BC_FX_ByteString_Append(result, 1, ALPHANUMERIC_CHARS[twoDigitBits % 10]);
-  } else if (count == 1) {
-    int32_t digitBits = bits->ReadBits(4, e);
-    BC_EXCEPTION_CHECK_ReturnVoid(e);
-    if (digitBits >= 10) {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    BC_FX_ByteString_Append(result, 1, ALPHANUMERIC_CHARS[digitBits]);
-  }
-}
-const CFX_ByteString CBC_QRDecodedBitStreamParser::GuessEncoding(
-    CFX_ByteArray* bytes) {
-  return *UTF_8;
-}
-int32_t CBC_QRDecodedBitStreamParser::ParseECIValue(CBC_CommonBitSource* bits,
-                                                    int32_t& e) {
-  int32_t firstByte = bits->ReadBits(8, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  if ((firstByte & 0x80) == 0) {
-    return firstByte & 0x7f;
-  } else if ((firstByte & 0xc0) == 0x80) {
-    int32_t secondByte = bits->ReadBits(8, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    return ((firstByte & 0x3f) << 8) | secondByte;
-  } else if ((firstByte & 0xe0) == 0xc0) {
-    int32_t secondThirdByte = bits->ReadBits(16, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    return ((firstByte & 0x1f) << 16) | secondThirdByte;
-  }
-  e = BCExceptionBadECI;
-  BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-  return 0;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
deleted file mode 100644
index 0943bc0a4e..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
-
-class CBC_CommonDecoderResult;
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_CommonBitSource;
-class CBC_QRCoderVersion;
-class CBC_CommonCharacterSetECI;
-class CBC_QRDecodedBitStreamParser {
- private:
-  static const FX_CHAR ALPHANUMERIC_CHARS[45];
-  static const FX_CHAR* UTF_8;
-  CBC_QRDecodedBitStreamParser();
-
- public:
-  virtual ~CBC_QRDecodedBitStreamParser();
-  static CBC_CommonDecoderResult* Decode(
-      CFX_ByteArray* bytes,
-      CBC_QRCoderVersion* version,
-      CBC_QRCoderErrorCorrectionLevel* ecLevel,
-      int32_t byteModeDecode,
-      int32_t& e);
-
-  static const CFX_ByteString GuessEncoding(CFX_ByteArray* bytes);
-  static int32_t ParseECIValue(CBC_CommonBitSource* bits, int32_t& e);
-  static void DecodeGBKSegment(CBC_CommonBitSource* bits,
-                               CFX_ByteString& result,
-                               int32_t count,
-                               int32_t& e);
-  static void DecodeKanjiSegment(CBC_CommonBitSource* bits,
-                                 CFX_ByteString& result,
-                                 int32_t count,
-                                 int32_t& e);
-  static void DecodeNumericSegment(CBC_CommonBitSource* bits,
-                                   CFX_ByteString& result,
-                                   int32_t count,
-                                   int32_t& e);
-  static void DecodeAlphanumericSegment(CBC_CommonBitSource* bits,
-                                        CFX_ByteString& result,
-                                        int32_t count,
-                                        FX_BOOL fac1InEffect,
-                                        int32_t& e);
-  static void DecodeByteSegment(
-      CBC_CommonBitSource* bits,
-      CFX_ByteString& result,
-      int32_t count,
-      CBC_CommonCharacterSetECI* currentCharacterSetECI,
-      CFX_Int32Array* byteSegments,
-      int32_t byteModeDecode,
-      int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/fxbarcode/qrcode/BC_QRDetector.cpp
deleted file mode 100644
index a5be32a232..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDetector.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRDetector.h"
-
-#include <algorithm>
-#include <memory>
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h"
-#include "xfa/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
-#include "xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPattern.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRGridSampler.h"
-
-CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix* image) : m_image(image) {}
-CBC_QRDetector::~CBC_QRDetector() {}
-CBC_QRDetectorResult* CBC_QRDetector::Detect(int32_t hints, int32_t& e) {
-  CBC_QRFinderPatternFinder finder(m_image);
-  std::unique_ptr<CBC_QRFinderPatternInfo> info(finder.Find(hints, e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRDetectorResult* qdr = ProcessFinderPatternInfo(info.get(), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return qdr;
-}
-CBC_QRDetectorResult* CBC_QRDetector::ProcessFinderPatternInfo(
-    CBC_QRFinderPatternInfo* info,
-    int32_t& e) {
-  std::unique_ptr<CBC_QRFinderPattern> topLeft(info->GetTopLeft());
-  std::unique_ptr<CBC_QRFinderPattern> topRight(info->GetTopRight());
-  std::unique_ptr<CBC_QRFinderPattern> bottomLeft(info->GetBottomLeft());
-  FX_FLOAT moduleSize =
-      CalculateModuleSize(topLeft.get(), topRight.get(), bottomLeft.get());
-  if (moduleSize < 1.0f) {
-    e = BCExceptionRead;
-    return nullptr;
-  }
-  int32_t dimension = ComputeDimension(topLeft.get(), topRight.get(),
-                                       bottomLeft.get(), moduleSize, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  CBC_QRCoderVersion* provisionalVersion =
-      CBC_QRCoderVersion::GetProvisionalVersionForDimension(dimension, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  int32_t modulesBetweenFPCenters =
-      provisionalVersion->GetDimensionForVersion() - 7;
-  CBC_QRAlignmentPattern* alignmentPattern = nullptr;
-  if (provisionalVersion->GetAlignmentPatternCenters()->GetSize() > 0) {
-    FX_FLOAT bottomRightX =
-        topRight->GetX() - topLeft->GetX() + bottomLeft->GetX();
-    FX_FLOAT bottomRightY =
-        topRight->GetY() - topLeft->GetY() + bottomLeft->GetY();
-    FX_FLOAT correctionToTopLeft =
-        1.0f - 3.0f / (FX_FLOAT)modulesBetweenFPCenters;
-    FX_FLOAT xtemp = (topLeft->GetX() +
-                      correctionToTopLeft * (bottomRightX - topLeft->GetX()));
-    int32_t estAlignmentX = (int32_t)xtemp;
-    FX_FLOAT ytemp = (topLeft->GetY() +
-                      correctionToTopLeft * (bottomRightY - topLeft->GetY()));
-    int32_t estAlignmentY = (int32_t)ytemp;
-    for (int32_t i = 4; i <= 16; i <<= 1) {
-      CBC_QRAlignmentPattern* temp = FindAlignmentInRegion(
-          moduleSize, estAlignmentX, estAlignmentY, (FX_FLOAT)i, e);
-      if (temp) {
-        alignmentPattern = temp;
-        break;
-      }
-    }
-  }
-  CBC_CommonBitMatrix* bits =
-      SampleGrid(m_image, topLeft.get(), topRight.get(), bottomLeft.get(),
-                 alignmentPattern, dimension, e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-
-  CFX_ArrayTemplate<CBC_ResultPoint*>* points =
-      new CFX_ArrayTemplate<CBC_ResultPoint*>();
-  points->Add(bottomLeft.release());
-  points->Add(topLeft.release());
-  points->Add(topRight.release());
-  if (alignmentPattern)
-    points->Add(alignmentPattern);
-  return new CBC_QRDetectorResult(bits, points);
-}
-CBC_CommonBitMatrix* CBC_QRDetector::SampleGrid(
-    CBC_CommonBitMatrix* image,
-    CBC_ResultPoint* topLeft,
-    CBC_ResultPoint* topRight,
-    CBC_ResultPoint* bottomLeft,
-    CBC_ResultPoint* alignmentPattern,
-    int32_t dimension,
-    int32_t& e) {
-  FX_FLOAT dimMinusThree = (FX_FLOAT)dimension - 3.5f;
-  FX_FLOAT bottomRightX;
-  FX_FLOAT bottomRightY;
-  FX_FLOAT sourceBottomRightX;
-  FX_FLOAT sourceBottomRightY;
-  if (alignmentPattern) {
-    bottomRightX = alignmentPattern->GetX();
-    bottomRightY = alignmentPattern->GetY();
-    sourceBottomRightX = sourceBottomRightY = dimMinusThree - 3.0f;
-  } else {
-    bottomRightX = (topRight->GetX() - topLeft->GetX()) + bottomLeft->GetX();
-    bottomRightY = (topRight->GetY() - topLeft->GetY()) + bottomLeft->GetY();
-    sourceBottomRightX = sourceBottomRightY = dimMinusThree;
-  }
-  CBC_QRGridSampler& sampler = CBC_QRGridSampler::GetInstance();
-  CBC_CommonBitMatrix* cbm = sampler.SampleGrid(
-      image, dimension, dimension, 3.5f, 3.5f, dimMinusThree, 3.5f,
-      sourceBottomRightX, sourceBottomRightY, 3.5f, dimMinusThree,
-      topLeft->GetX(), topLeft->GetY(), topRight->GetX(), topRight->GetY(),
-      bottomRightX, bottomRightY, bottomLeft->GetX(), bottomLeft->GetY(), e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return cbm;
-}
-int32_t CBC_QRDetector::ComputeDimension(CBC_ResultPoint* topLeft,
-                                         CBC_ResultPoint* topRight,
-                                         CBC_ResultPoint* bottomLeft,
-                                         FX_FLOAT moduleSize,
-                                         int32_t& e) {
-  int32_t tltrCentersDimension = Round(
-      CBC_QRFinderPatternFinder::Distance(topLeft, topRight) / moduleSize);
-  int32_t tlblCentersDimension = Round(
-      CBC_QRFinderPatternFinder::Distance(topLeft, bottomLeft) / moduleSize);
-  int32_t dimension = ((tltrCentersDimension + tlblCentersDimension) >> 1) + 7;
-  switch (dimension & 0x03) {
-    case 0:
-      dimension++;
-      break;
-    case 2:
-      dimension--;
-      break;
-    case 3: {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnValue(e, 0);
-    }
-  }
-  return dimension;
-}
-FX_FLOAT CBC_QRDetector::CalculateModuleSize(CBC_ResultPoint* topLeft,
-                                             CBC_ResultPoint* topRight,
-                                             CBC_ResultPoint* bottomLeft) {
-  return (CalculateModuleSizeOneWay(topLeft, topRight) +
-          CalculateModuleSizeOneWay(topLeft, bottomLeft)) /
-         2.0f;
-}
-FX_FLOAT CBC_QRDetector::CalculateModuleSizeOneWay(
-    CBC_ResultPoint* pattern,
-    CBC_ResultPoint* otherPattern) {
-  FX_FLOAT moduleSizeEst1 = SizeOfBlackWhiteBlackRunBothWays(
-      (int32_t)pattern->GetX(), (int32_t)pattern->GetY(),
-      (int32_t)otherPattern->GetX(), (int32_t)otherPattern->GetY());
-  FX_FLOAT moduleSizeEst2 = SizeOfBlackWhiteBlackRunBothWays(
-      (int32_t)otherPattern->GetX(), (int32_t)otherPattern->GetY(),
-      (int32_t)pattern->GetX(), (int32_t)pattern->GetY());
-  if (FXSYS_isnan(moduleSizeEst1)) {
-    return moduleSizeEst2;
-  }
-  if (FXSYS_isnan(moduleSizeEst2)) {
-    return moduleSizeEst1;
-  }
-  return (moduleSizeEst1 + moduleSizeEst2) / 14.0f;
-}
-int32_t CBC_QRDetector::Round(FX_FLOAT d) {
-  return (int32_t)(d + 0.5f);
-}
-FX_FLOAT CBC_QRDetector::SizeOfBlackWhiteBlackRunBothWays(int32_t fromX,
-                                                          int32_t fromY,
-                                                          int32_t toX,
-                                                          int32_t toY) {
-  FX_FLOAT result = SizeOfBlackWhiteBlackRun(fromX, fromY, toX, toY);
-  int32_t otherToX = fromX - (toX - fromX);
-  if (otherToX < 0) {
-    otherToX = -1;
-  } else if (otherToX >= m_image->GetWidth()) {
-    otherToX = m_image->GetWidth();
-  }
-  int32_t otherToY = fromY - (toY - fromY);
-  if (otherToY < 0) {
-    otherToY = -1;
-  } else if (otherToY >= m_image->GetHeight()) {
-    otherToY = m_image->GetHeight();
-  }
-  result += SizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY);
-  return result - 1.0f;
-}
-FX_FLOAT CBC_QRDetector::SizeOfBlackWhiteBlackRun(int32_t fromX,
-                                                  int32_t fromY,
-                                                  int32_t toX,
-                                                  int32_t toY) {
-  FX_BOOL steep = FXSYS_abs(toY - fromY) > FXSYS_abs(toX - fromX);
-  if (steep) {
-    int32_t temp = fromX;
-    fromX = fromY;
-    fromY = temp;
-    temp = toX;
-    toX = toY;
-    toY = temp;
-  }
-  int32_t dx = FXSYS_abs(toX - fromX);
-  int32_t dy = FXSYS_abs(toY - fromY);
-  int32_t error = -dx >> 1;
-  int32_t ystep = fromY < toY ? 1 : -1;
-  int32_t xstep = fromX < toX ? 1 : -1;
-  int32_t state = 0;
-  for (int32_t x = fromX, y = fromY; x != toX; x += xstep) {
-    int32_t realX = steep ? y : x;
-    int32_t realY = steep ? x : y;
-    if (state == 1) {
-      if (m_image->Get(realX, realY)) {
-        state++;
-      }
-    } else {
-      if (!m_image->Get(realX, realY)) {
-        state++;
-      }
-    }
-    if (state == 3) {
-      int32_t diffX = x - fromX;
-      int32_t diffY = y - fromY;
-      return (FX_FLOAT)sqrt((double)(diffX * diffX + diffY * diffY));
-    }
-    error += dy;
-    if (error > 0) {
-      y += ystep;
-      error -= dx;
-    }
-  }
-  int32_t diffX = toX - fromX;
-  int32_t diffY = toY - fromY;
-  return (FX_FLOAT)sqrt((double)(diffX * diffX + diffY * diffY));
-}
-CBC_QRAlignmentPattern* CBC_QRDetector::FindAlignmentInRegion(
-    FX_FLOAT overallEstModuleSize,
-    int32_t estAlignmentX,
-    int32_t estAlignmentY,
-    FX_FLOAT allowanceFactor,
-    int32_t& e) {
-  int32_t allowance = (int32_t)(allowanceFactor * overallEstModuleSize);
-  int32_t alignmentAreaLeftX = std::max(0, estAlignmentX - allowance);
-  int32_t alignmentAreaRightX =
-      std::min(m_image->GetWidth() - 1, estAlignmentX + allowance);
-  if (alignmentAreaRightX - alignmentAreaLeftX < overallEstModuleSize * 3) {
-    e = BCExceptionRead;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  int32_t alignmentAreaTopY = std::max(0, estAlignmentY - allowance);
-  int32_t alignmentAreaBottomY =
-      std::min(m_image->GetHeight() - 1, estAlignmentY + allowance);
-  CBC_QRAlignmentPatternFinder alignmentFinder(
-      m_image, alignmentAreaLeftX, alignmentAreaTopY,
-      alignmentAreaRightX - alignmentAreaLeftX,
-      alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize);
-  CBC_QRAlignmentPattern* qap = alignmentFinder.Find(e);
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  return qap;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetector.h b/xfa/fxbarcode/qrcode/BC_QRDetector.h
deleted file mode 100644
index 91eed25415..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDetector.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_ResultPoint;
-class CBC_CommonBitMatrix;
-class CBC_QRDetectorResult;
-class CBC_QRFinderPatternInfo;
-class CBC_QRAlignmentPattern;
-
-class CBC_QRDetector {
- private:
-  CBC_CommonBitMatrix* m_image;
-
- public:
-  CBC_QRDetector(CBC_CommonBitMatrix* image);
-  virtual ~CBC_QRDetector();
-
-  CBC_CommonBitMatrix* GetImage();
-  CBC_QRDetectorResult* Detect(int32_t hints, int32_t& e);
-  CBC_QRDetectorResult* ProcessFinderPatternInfo(CBC_QRFinderPatternInfo* info,
-                                                 int32_t& e);
-  FX_FLOAT CalculateModuleSize(CBC_ResultPoint* topLeft,
-                               CBC_ResultPoint* topRight,
-                               CBC_ResultPoint* bottomLeft);
-  FX_FLOAT CalculateModuleSizeOneWay(CBC_ResultPoint* pattern,
-                                     CBC_ResultPoint* otherPattern);
-  FX_FLOAT SizeOfBlackWhiteBlackRunBothWays(int32_t fromX,
-                                            int32_t fromY,
-                                            int32_t toX,
-                                            int32_t toY);
-  FX_FLOAT SizeOfBlackWhiteBlackRun(int32_t fromX,
-                                    int32_t fromY,
-                                    int32_t toX,
-                                    int32_t toY);
-  CBC_QRAlignmentPattern* FindAlignmentInRegion(FX_FLOAT overallEstModuleSize,
-                                                int32_t estAlignmentX,
-                                                int32_t estAlignmentY,
-                                                FX_FLOAT allowanceFactor,
-                                                int32_t& e);
-  static int32_t Round(FX_FLOAT d);
-  static int32_t ComputeDimension(CBC_ResultPoint* topLeft,
-                                  CBC_ResultPoint* topRight,
-                                  CBC_ResultPoint* bottomLeft,
-                                  FX_FLOAT moduleSize,
-                                  int32_t& e);
-  static CBC_CommonBitMatrix* SampleGrid(CBC_CommonBitMatrix* image,
-                                         CBC_ResultPoint* topLeft,
-                                         CBC_ResultPoint* topRight,
-                                         CBC_ResultPoint* bottomLeft,
-                                         CBC_ResultPoint* alignmentPattern,
-                                         int32_t dimension,
-                                         int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.cpp
deleted file mode 100644
index 5ce2e75762..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
-
-CBC_QRDetectorResult::CBC_QRDetectorResult(
-    CBC_CommonBitMatrix* bits,
-    CFX_ArrayTemplate<CBC_ResultPoint*>* points)
-    : m_bits(bits), m_points(points) {}
-
-CBC_QRDetectorResult::~CBC_QRDetectorResult() {
-  for (int32_t i = 0; i < m_points->GetSize(); i++)
-    delete (*m_points)[i];
-}
-
-CBC_CommonBitMatrix* CBC_QRDetectorResult::GetBits() const {
-  return m_bits.get();
-}
-
-CFX_ArrayTemplate<CBC_ResultPoint*>* CBC_QRDetectorResult::GetPoints() const {
-  return m_points.get();
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h
deleted file mode 100644
index 5948c2a01c..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
-
-#include <memory>
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_ResultPoint;
-
-class CBC_QRDetectorResult final {
- public:
-  // Takes ownership of |bits| and |points|.
-  CBC_QRDetectorResult(CBC_CommonBitMatrix* bits,
-                       CFX_ArrayTemplate<CBC_ResultPoint*>* points);
-  ~CBC_QRDetectorResult();
-
-  CBC_CommonBitMatrix* GetBits() const;
-  CFX_ArrayTemplate<CBC_ResultPoint*>* GetPoints() const;
-
- private:
-  std::unique_ptr<CBC_CommonBitMatrix> m_bits;
-  std::unique_ptr<CFX_ArrayTemplate<CBC_ResultPoint*>> m_points;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/fxbarcode/qrcode/BC_QRFinderPattern.cpp
deleted file mode 100644
index 1bc9648835..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPattern.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPattern.h"
-
-CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x,
-                                         FX_FLOAT posY,
-                                         FX_FLOAT estimatedModuleSize)
-    : CBC_ResultPoint(x, posY),
-      m_estimatedModuleSize(estimatedModuleSize),
-      m_count(1) {}
-CBC_QRFinderPattern::~CBC_QRFinderPattern() {
-  m_count = 0;
-  m_x = 0.0f;
-  m_y = 0.0f;
-  m_estimatedModuleSize = 0.0f;
-}
-CBC_QRFinderPattern* CBC_QRFinderPattern::Clone() {
-  CBC_QRFinderPattern* temp =
-      new CBC_QRFinderPattern(m_x, m_y, m_estimatedModuleSize);
-  temp->m_count = m_count;
-  return temp;
-}
-FX_FLOAT CBC_QRFinderPattern::GetEstimatedModuleSize() {
-  return m_estimatedModuleSize;
-}
-int32_t CBC_QRFinderPattern::GetCount() const {
-  return m_count;
-}
-void CBC_QRFinderPattern::IncrementCount() {
-  m_count++;
-}
-FX_BOOL CBC_QRFinderPattern::AboutEquals(FX_FLOAT moduleSize,
-                                         FX_FLOAT i,
-                                         FX_FLOAT j) {
-  if ((fabs(i - GetY()) <= moduleSize) && (fabs(j - GetX()) <= moduleSize)) {
-    FX_FLOAT moduleSizeDiff = fabs(moduleSize - m_estimatedModuleSize);
-    return (moduleSizeDiff <= 1.0f) ||
-           (moduleSizeDiff / m_estimatedModuleSize <= 1.0f);
-  }
-  return false;
-}
-FX_FLOAT CBC_QRFinderPattern::GetX() {
-  return m_x;
-}
-FX_FLOAT CBC_QRFinderPattern::GetY() {
-  return m_y;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPattern.h b/xfa/fxbarcode/qrcode/BC_QRFinderPattern.h
deleted file mode 100644
index f02a229121..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPattern.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
-
-class CBC_ResultPoint;
-class CBC_QRFinderPattern;
-class CBC_QRFinderPattern : public CBC_ResultPoint {
- private:
-  FX_FLOAT m_estimatedModuleSize;
-  int32_t m_count;
-
- public:
-  CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, FX_FLOAT estimatedModuleSize);
-  ~CBC_QRFinderPattern() override;
-
-  // CBC_ResultPoint
-  FX_FLOAT GetX() override;
-  FX_FLOAT GetY() override;
-
-  int32_t GetCount() const;
-  FX_FLOAT GetEstimatedModuleSize();
-  void IncrementCount();
-  FX_BOOL AboutEquals(FX_FLOAT moduleSize, FX_FLOAT i, FX_FLOAT j);
-  CBC_QRFinderPattern* Clone();
-};
-typedef CBC_QRFinderPattern FinderPattern;
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
deleted file mode 100644
index 5ceeefac53..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
-
-#include <memory>
-
-#include "core/fxcrt/include/fx_basic.h"
-#include "xfa/fxbarcode/BC_ResultPoint.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h"
-#include "xfa/fxbarcode/qrcode/BC_QRFinderPattern.h"
-#include "xfa/fxbarcode/utils.h"
-
-const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2;
-const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3;
-const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57;
-const int32_t CBC_QRFinderPatternFinder::INTEGER_MATH_SHIFT = 8;
-
-CBC_QRFinderPatternFinder::CBC_QRFinderPatternFinder(
-    CBC_CommonBitMatrix* image) {
-  m_image = image;
-  m_crossCheckStateCount.SetSize(5);
-  m_hasSkipped = FALSE;
-}
-
-CBC_QRFinderPatternFinder::~CBC_QRFinderPatternFinder() {
-  for (int32_t i = 0; i < m_possibleCenters.GetSize(); i++)
-    delete m_possibleCenters[i];
-}
-
-class ClosestToAverageComparator {
- private:
-  FX_FLOAT m_averageModuleSize;
-
- public:
-  ClosestToAverageComparator(FX_FLOAT averageModuleSize)
-      : m_averageModuleSize(averageModuleSize) {}
-  int32_t operator()(FinderPattern* a, FinderPattern* b) {
-    FX_FLOAT dA =
-        (FX_FLOAT)fabs(a->GetEstimatedModuleSize() - m_averageModuleSize);
-    FX_FLOAT dB =
-        (FX_FLOAT)fabs(b->GetEstimatedModuleSize() - m_averageModuleSize);
-    return dA < dB ? -1 : dA > dB ? 1 : 0;
-  }
-};
-class CenterComparator {
- public:
-  int32_t operator()(FinderPattern* a, FinderPattern* b) {
-    return b->GetCount() - a->GetCount();
-  }
-};
-CBC_CommonBitMatrix* CBC_QRFinderPatternFinder::GetImage() {
-  return m_image;
-}
-CFX_Int32Array& CBC_QRFinderPatternFinder::GetCrossCheckStateCount() {
-  m_crossCheckStateCount[0] = 0;
-  m_crossCheckStateCount[1] = 0;
-  m_crossCheckStateCount[2] = 0;
-  m_crossCheckStateCount[3] = 0;
-  m_crossCheckStateCount[4] = 0;
-  return m_crossCheckStateCount;
-}
-
-CFX_ArrayTemplate<CBC_QRFinderPattern*>*
-CBC_QRFinderPatternFinder::GetPossibleCenters() {
-  return &m_possibleCenters;
-}
-
-CBC_QRFinderPatternInfo* CBC_QRFinderPatternFinder::Find(int32_t hint,
-                                                         int32_t& e) {
-  int32_t maxI = m_image->GetHeight();
-  int32_t maxJ = m_image->GetWidth();
-  int32_t iSkip = (3 * maxI) / (4 * MAX_MODULES);
-  if (iSkip < MIN_SKIP || 0) {
-    iSkip = MIN_SKIP;
-  }
-  FX_BOOL done = FALSE;
-  CFX_Int32Array stateCount;
-  stateCount.SetSize(5);
-  for (int32_t i = iSkip - 1; i < maxI && !done; i += iSkip) {
-    stateCount[0] = 0;
-    stateCount[1] = 0;
-    stateCount[2] = 0;
-    stateCount[3] = 0;
-    stateCount[4] = 0;
-    int32_t currentState = 0;
-    for (int32_t j = 0; j < maxJ; j++) {
-      if (m_image->Get(j, i)) {
-        if ((currentState & 1) == 1) {
-          currentState++;
-        }
-        stateCount[currentState]++;
-      } else {
-        if ((currentState & 1) == 0) {
-          if (currentState == 4) {
-            if (FoundPatternCross(stateCount)) {
-              FX_BOOL confirmed = HandlePossibleCenter(stateCount, i, j);
-              if (confirmed) {
-                iSkip = 2;
-                if (m_hasSkipped) {
-                  done = HaveMultiplyConfirmedCenters();
-                } else {
-                  int32_t rowSkip = FindRowSkip();
-                  if (rowSkip > stateCount[2]) {
-                    i += rowSkip - stateCount[2] - iSkip;
-                    j = maxJ - 1;
-                  }
-                }
-              } else {
-                do {
-                  j++;
-                } while (j < maxJ && !m_image->Get(j, i));
-                j--;
-              }
-              currentState = 0;
-              stateCount[0] = 0;
-              stateCount[1] = 0;
-              stateCount[2] = 0;
-              stateCount[3] = 0;
-              stateCount[4] = 0;
-            } else {
-              stateCount[0] = stateCount[2];
-              stateCount[1] = stateCount[3];
-              stateCount[2] = stateCount[4];
-              stateCount[3] = 1;
-              stateCount[4] = 0;
-              currentState = 3;
-            }
-          } else {
-            stateCount[++currentState]++;
-          }
-        } else {
-          stateCount[currentState]++;
-        }
-      }
-    }
-    if (FoundPatternCross(stateCount)) {
-      FX_BOOL confirmed = HandlePossibleCenter(stateCount, i, maxJ);
-      if (confirmed) {
-        iSkip = stateCount[0];
-        if (m_hasSkipped) {
-          done = HaveMultiplyConfirmedCenters();
-        }
-      }
-    }
-  }
-  std::unique_ptr<CFX_ArrayTemplate<CBC_QRFinderPattern*>> patternInfo(
-      SelectBestpatterns(e));
-  BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  OrderBestPatterns(patternInfo.get());
-  return new CBC_QRFinderPatternInfo(patternInfo.get());
-}
-void CBC_QRFinderPatternFinder::OrderBestPatterns(
-    CFX_ArrayTemplate<CBC_QRFinderPattern*>* patterns) {
-  FX_FLOAT abDistance = Distance((*patterns)[0], (*patterns)[1]);
-  FX_FLOAT bcDistance = Distance((*patterns)[1], (*patterns)[2]);
-  FX_FLOAT acDistance = Distance((*patterns)[0], (*patterns)[2]);
-  CBC_QRFinderPattern* topLeft;
-  CBC_QRFinderPattern* topRight;
-  CBC_QRFinderPattern* bottomLeft;
-  if (bcDistance >= abDistance && bcDistance >= acDistance) {
-    topLeft = (*patterns)[0];
-    topRight = (*patterns)[1];
-    bottomLeft = (*patterns)[2];
-  } else if (acDistance >= bcDistance && acDistance >= abDistance) {
-    topLeft = (*patterns)[1];
-    topRight = (*patterns)[0];
-    bottomLeft = (*patterns)[2];
-  } else {
-    topLeft = (*patterns)[2];
-    topRight = (*patterns)[0];
-    bottomLeft = (*patterns)[1];
-  }
-  if ((bottomLeft->GetY() - topLeft->GetY()) *
-          (topRight->GetX() - topLeft->GetX()) <
-      (bottomLeft->GetX() - topLeft->GetX()) *
-          (topRight->GetY() - topLeft->GetY())) {
-    CBC_QRFinderPattern* temp = topRight;
-    topRight = bottomLeft;
-    bottomLeft = temp;
-  }
-  (*patterns)[0] = bottomLeft;
-  (*patterns)[1] = topLeft;
-  (*patterns)[2] = topRight;
-}
-FX_FLOAT CBC_QRFinderPatternFinder::Distance(CBC_ResultPoint* point1,
-                                             CBC_ResultPoint* point2) {
-  FX_FLOAT dx = point1->GetX() - point2->GetX();
-  FX_FLOAT dy = point1->GetY() - point2->GetY();
-  return (FX_FLOAT)FXSYS_sqrt(dx * dx + dy * dy);
-}
-FX_FLOAT CBC_QRFinderPatternFinder::CenterFromEnd(
-    const CFX_Int32Array& stateCount,
-    int32_t end) {
-  return (FX_FLOAT)(end - stateCount[4] - stateCount[3]) - stateCount[2] / 2.0f;
-}
-FX_BOOL CBC_QRFinderPatternFinder::FoundPatternCross(
-    const CFX_Int32Array& stateCount) {
-  int32_t totalModuleSize = 0;
-  for (int32_t i = 0; i < 5; i++) {
-    int32_t count = stateCount[i];
-    if (count == 0) {
-      return FALSE;
-    }
-    totalModuleSize += count;
-  }
-  if (totalModuleSize < 7) {
-    return FALSE;
-  }
-  int32_t moduleSize = (totalModuleSize << INTEGER_MATH_SHIFT) / 7;
-  int32_t maxVariance = moduleSize / 2;
-  return FXSYS_abs(moduleSize - (stateCount[0] << INTEGER_MATH_SHIFT)) <
-             maxVariance &&
-         FXSYS_abs(moduleSize - (stateCount[1] << INTEGER_MATH_SHIFT)) <
-             maxVariance &&
-         FXSYS_abs(3 * moduleSize - (stateCount[2] << INTEGER_MATH_SHIFT)) <
-             3 * maxVariance &&
-         FXSYS_abs(moduleSize - (stateCount[3] << INTEGER_MATH_SHIFT)) <
-             maxVariance &&
-         FXSYS_abs(moduleSize - (stateCount[4] << INTEGER_MATH_SHIFT)) <
-             maxVariance;
-}
-FX_FLOAT CBC_QRFinderPatternFinder::CrossCheckVertical(
-    int32_t startI,
-    int32_t centerJ,
-    int32_t maxCount,
-    int32_t originalStateCountTotal) {
-  CBC_CommonBitMatrix* image = m_image;
-  int32_t maxI = image->GetHeight();
-  CFX_Int32Array& stateCount = GetCrossCheckStateCount();
-  int32_t i = startI;
-  while (i >= 0 && image->Get(centerJ, i)) {
-    stateCount[2]++;
-    i--;
-  }
-  if (i < 0) {
-    return FXSYS_nan();
-  }
-  while (i >= 0 && !image->Get(centerJ, i) && stateCount[1] <= maxCount) {
-    stateCount[1]++;
-    i--;
-  }
-  if (i < 0 || stateCount[1] > maxCount) {
-    return FXSYS_nan();
-  }
-  while (i >= 0 && image->Get(centerJ, i) && stateCount[0] <= maxCount) {
-    stateCount[0]++;
-    i--;
-  }
-  if (stateCount[0] > maxCount) {
-    return FXSYS_nan();
-  }
-  i = startI + 1;
-  while (i < maxI && image->Get(centerJ, i)) {
-    stateCount[2]++;
-    i++;
-  }
-  if (i == maxI) {
-    return FXSYS_nan();
-  }
-  while (i < maxI && !image->Get(centerJ, i) && stateCount[3] < maxCount) {
-    stateCount[3]++;
-    i++;
-  }
-  if (i == maxI || stateCount[3] >= maxCount) {
-    return FXSYS_nan();
-  }
-  while (i < maxI && image->Get(centerJ, i) && stateCount[4] < maxCount) {
-    stateCount[4]++;
-    i++;
-  }
-  if (stateCount[4] >= maxCount) {
-    return FXSYS_nan();
-  }
-  int32_t stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] +
-                            stateCount[3] + stateCount[4];
-  if (5 * FXSYS_abs(stateCountTotal - originalStateCountTotal) >=
-      originalStateCountTotal) {
-    return FXSYS_nan();
-  }
-  return FoundPatternCross(stateCount) ? CenterFromEnd(stateCount, i)
-                                       : FXSYS_nan();
-}
-FX_FLOAT CBC_QRFinderPatternFinder::CrossCheckHorizontal(
-    int32_t startJ,
-    int32_t centerI,
-    int32_t maxCount,
-    int32_t originalStateCountTotal) {
-  CBC_CommonBitMatrix* image = m_image;
-  int32_t maxJ = image->GetWidth();
-  CFX_Int32Array& stateCount = GetCrossCheckStateCount();
-  int32_t j = startJ;
-  while (j >= 0 && image->Get(j, centerI)) {
-    stateCount[2]++;
-    j--;
-  }
-  if (j < 0) {
-    return FXSYS_nan();
-  }
-  while (j >= 0 && !image->Get(j, centerI) && stateCount[1] <= maxCount) {
-    stateCount[1]++;
-    j--;
-  }
-  if (j < 0 || stateCount[1] > maxCount) {
-    return FXSYS_nan();
-  }
-  while (j >= 0 && image->Get(j, centerI) && stateCount[0] <= maxCount) {
-    stateCount[0]++;
-    j--;
-  }
-  if (stateCount[0] > maxCount) {
-    return FXSYS_nan();
-  }
-  j = startJ + 1;
-  while (j < maxJ && image->Get(j, centerI)) {
-    stateCount[2]++;
-    j++;
-  }
-  if (j == maxJ) {
-    return FXSYS_nan();
-  }
-  while (j < maxJ && !image->Get(j, centerI) && stateCount[3] < maxCount) {
-    stateCount[3]++;
-    j++;
-  }
-  if (j == maxJ || stateCount[3] >= maxCount) {
-    return FXSYS_nan();
-  }
-  while (j < maxJ && image->Get(j, centerI) && stateCount[4] < maxCount) {
-    stateCount[4]++;
-    j++;
-  }
-  if (stateCount[4] >= maxCount) {
-    return FXSYS_nan();
-  }
-  int32_t stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] +
-                            stateCount[3] + stateCount[4];
-  if (5 * FXSYS_abs(stateCountTotal - originalStateCountTotal) >=
-      originalStateCountTotal) {
-    return FXSYS_nan();
-  }
-  return FoundPatternCross(stateCount) ? CenterFromEnd(stateCount, j)
-                                       : FXSYS_nan();
-}
-FX_BOOL CBC_QRFinderPatternFinder::HandlePossibleCenter(
-    const CFX_Int32Array& stateCount,
-    int32_t i,
-    int32_t j) {
-  int32_t stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] +
-                            stateCount[3] + stateCount[4];
-  FX_FLOAT centerJ = CenterFromEnd(stateCount, j);
-  FX_FLOAT centerI =
-      CrossCheckVertical(i, (int32_t)centerJ, stateCount[2], stateCountTotal);
-  if (!FXSYS_isnan(centerI)) {
-    centerJ = CrossCheckHorizontal((int32_t)centerJ, (int32_t)centerI,
-                                   stateCount[2], stateCountTotal);
-    if (!FXSYS_isnan(centerJ)) {
-      FX_FLOAT estimatedModuleSize = (FX_FLOAT)stateCountTotal / 7.0f;
-      FX_BOOL found = FALSE;
-      int32_t max = m_possibleCenters.GetSize();
-      for (int32_t index = 0; index < max; index++) {
-        CBC_QRFinderPattern* center = m_possibleCenters[index];
-        if (center->AboutEquals(estimatedModuleSize, centerI, centerJ)) {
-          center->IncrementCount();
-          found = TRUE;
-          break;
-        }
-      }
-      if (!found) {
-        m_possibleCenters.Add(
-            new CBC_QRFinderPattern(centerJ, centerI, estimatedModuleSize));
-      }
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-int32_t CBC_QRFinderPatternFinder::FindRowSkip() {
-  int32_t max = m_possibleCenters.GetSize();
-  if (max <= 1) {
-    return 0;
-  }
-  FinderPattern* firstConfirmedCenter = nullptr;
-  for (int32_t i = 0; i < max; i++) {
-    CBC_QRFinderPattern* center = m_possibleCenters[i];
-    if (center->GetCount() >= CENTER_QUORUM) {
-      if (firstConfirmedCenter) {
-        m_hasSkipped = TRUE;
-        return (int32_t)((fabs(firstConfirmedCenter->GetX() - center->GetX()) -
-                          fabs(firstConfirmedCenter->GetY() - center->GetY())) /
-                         2);
-      }
-      firstConfirmedCenter = center;
-    }
-  }
-  return 0;
-}
-FX_BOOL CBC_QRFinderPatternFinder::HaveMultiplyConfirmedCenters() {
-  int32_t confirmedCount = 0;
-  FX_FLOAT totalModuleSize = 0.0f;
-  int32_t max = m_possibleCenters.GetSize();
-  int32_t i;
-  for (i = 0; i < max; i++) {
-    CBC_QRFinderPattern* pattern = m_possibleCenters[i];
-    if (pattern->GetCount() >= CENTER_QUORUM) {
-      confirmedCount++;
-      totalModuleSize += pattern->GetEstimatedModuleSize();
-    }
-  }
-  if (confirmedCount < 3) {
-    return FALSE;
-  }
-  FX_FLOAT average = totalModuleSize / (FX_FLOAT)max;
-  FX_FLOAT totalDeviation = 0.0f;
-  for (i = 0; i < max; i++) {
-    CBC_QRFinderPattern* pattern = m_possibleCenters[i];
-    totalDeviation += fabs(pattern->GetEstimatedModuleSize() - average);
-  }
-  return totalDeviation <= 0.05f * totalModuleSize;
-}
-
-CFX_ArrayTemplate<CBC_QRFinderPattern*>*
-CBC_QRFinderPatternFinder::SelectBestpatterns(int32_t& e) {
-  int32_t startSize = m_possibleCenters.GetSize();
-  if (m_possibleCenters.GetSize() < 3) {
-    e = BCExceptionRead;
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-  }
-  FX_FLOAT average = 0.0f;
-  if (startSize > 3) {
-    FX_FLOAT totalModuleSize = 0.0f;
-    for (int32_t i = 0; i < startSize; i++)
-      totalModuleSize += m_possibleCenters[i]->GetEstimatedModuleSize();
-
-    average = totalModuleSize / (FX_FLOAT)startSize;
-    for (int32_t j = 0;
-         j < m_possibleCenters.GetSize() && m_possibleCenters.GetSize() > 3;
-         j++) {
-      CBC_QRFinderPattern* pattern = m_possibleCenters[j];
-      if (fabs(pattern->GetEstimatedModuleSize() - average) > 0.2f * average) {
-        delete pattern;
-        m_possibleCenters.RemoveAt(j);
-        j--;
-      }
-    }
-  }
-  if (m_possibleCenters.GetSize() > 3) {
-    std::sort(m_possibleCenters.GetData(),
-              m_possibleCenters.GetData() + m_possibleCenters.GetSize(),
-              [](const CBC_QRFinderPattern* a, CBC_QRFinderPattern* b) {
-                return a->GetCount() > b->GetCount();  // e.g. Descending.
-              });
-  }
-  CFX_ArrayTemplate<CBC_QRFinderPattern*>* vec =
-      new CFX_ArrayTemplate<CBC_QRFinderPattern*>();
-  vec->SetSize(3);
-  (*vec)[0] = m_possibleCenters[0]->Clone();
-  (*vec)[1] = m_possibleCenters[1]->Clone();
-  (*vec)[2] = m_possibleCenters[2]->Clone();
-  return vec;
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
deleted file mode 100644
index 60ec184fe4..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-class CBC_QRFinderPattern;
-class CBC_ResultPoint;
-class CBC_QRFinderPatternInfo;
-
-class CBC_QRFinderPatternFinder {
- public:
-  CBC_QRFinderPatternFinder(CBC_CommonBitMatrix* image);
-  virtual ~CBC_QRFinderPatternFinder();
-  int32_t FindRowSkip();
-  CBC_CommonBitMatrix* GetImage();
-  CBC_QRFinderPatternInfo* Find(int32_t hint, int32_t& e);
-
-  CFX_Int32Array& GetCrossCheckStateCount();
-  CFX_ArrayTemplate<CBC_QRFinderPattern*>* GetPossibleCenters();
-  CFX_ArrayTemplate<CBC_QRFinderPattern*>* SelectBestpatterns(int32_t& e);
-
-  FX_BOOL HandlePossibleCenter(const CFX_Int32Array& stateCount,
-                               int32_t i,
-                               int32_t j);
-  FX_BOOL HaveMultiplyConfirmedCenters();
-  FX_FLOAT CenterFromEnd(const CFX_Int32Array& stateCount, int32_t end);
-  FX_FLOAT CrossCheckVertical(int32_t startI,
-                              int32_t centerJ,
-                              int32_t maxCount,
-                              int32_t originalStateCountTotal);
-  FX_FLOAT CrossCheckHorizontal(int32_t startJ,
-                                int32_t CenterI,
-                                int32_t maxCOunt,
-                                int32_t originalStateCountTotal);
-  static void OrderBestPatterns(
-      CFX_ArrayTemplate<CBC_QRFinderPattern*>* patterns);
-  static FX_BOOL FoundPatternCross(const CFX_Int32Array& stateCount);
-  static FX_FLOAT Distance(CBC_ResultPoint* point1, CBC_ResultPoint* point2);
-
- private:
-  static const int32_t CENTER_QUORUM;
-  static const int32_t MIN_SKIP;
-  static const int32_t MAX_MODULES;
-  static const int32_t INTEGER_MATH_SHIFT;
-
-  FX_BOOL m_hasSkipped;
-  CBC_CommonBitMatrix* m_image;
-  CFX_Int32Array m_crossCheckStateCount;
-  CFX_ArrayTemplate<CBC_QRFinderPattern*> m_possibleCenters;
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/fxbarcode/qrcode/BC_QRGridSampler.cpp
deleted file mode 100644
index be7407ceff..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRGridSampler.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-// Original code is licensed as follows:
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "xfa/fxbarcode/qrcode/BC_QRGridSampler.h"
-
-#include <memory>
-
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h"
-#include "xfa/fxbarcode/utils.h"
-
-CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler;
-
-CBC_QRGridSampler::CBC_QRGridSampler() {}
-CBC_QRGridSampler::~CBC_QRGridSampler() {}
-CBC_QRGridSampler& CBC_QRGridSampler::GetInstance() {
-  return m_gridSampler;
-}
-void CBC_QRGridSampler::CheckAndNudgePoints(CBC_CommonBitMatrix* image,
-                                            CFX_FloatArray* points,
-                                            int32_t& e) {
-  int32_t width = image->GetWidth();
-  int32_t height = image->GetHeight();
-  FX_BOOL nudged = TRUE;
-  int32_t offset;
-  for (offset = 0; offset < points->GetSize() && nudged; offset += 2) {
-    int32_t x = (int32_t)(*points)[offset];
-    int32_t y = (int32_t)(*points)[offset + 1];
-    if (x < -1 || x > width || y < -1 || y > height) {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    nudged = FALSE;
-    if (x == -1) {
-      (*points)[offset] = 0.0f;
-      nudged = TRUE;
-    } else if (x == width) {
-      (*points)[offset] = (FX_FLOAT)(width - 1);
-      nudged = TRUE;
-    }
-    if (y == -1) {
-      (*points)[offset + 1] = 0.0f;
-      nudged = TRUE;
-    } else if (y == height) {
-      (*points)[offset + 1] = (FX_FLOAT)(height - 1);
-      nudged = TRUE;
-    }
-  }
-  nudged = TRUE;
-  for (offset = (*points).GetSize() - 2; offset >= 0 && nudged; offset -= 2) {
-    int32_t x = (int32_t)(*points)[offset];
-    int32_t y = (int32_t)(*points)[offset + 1];
-    if (x < -1 || x > width || y < -1 || y > height) {
-      e = BCExceptionRead;
-      BC_EXCEPTION_CHECK_ReturnVoid(e);
-    }
-    nudged = FALSE;
-    if (x == -1) {
-      (*points)[offset] = 0.0f;
-      nudged = TRUE;
-    } else if (x == width) {
-      (*points)[offset] = (FX_FLOAT)(width - 1);
-      nudged = TRUE;
-    }
-    if (y == -1) {
-      (*points)[offset + 1] = 0.0f;
-      nudged = TRUE;
-    } else if (y == height) {
-      (*points)[offset + 1] = (FX_FLOAT)(height - 1);
-      nudged = TRUE;
-    }
-  }
-}
-CBC_CommonBitMatrix* CBC_QRGridSampler::SampleGrid(CBC_CommonBitMatrix* image,
-                                                   int32_t dimensionX,
-                                                   int32_t dimensionY,
-                                                   FX_FLOAT p1ToX,
-                                                   FX_FLOAT p1ToY,
-                                                   FX_FLOAT p2ToX,
-                                                   FX_FLOAT p2ToY,
-                                                   FX_FLOAT p3ToX,
-                                                   FX_FLOAT p3ToY,
-                                                   FX_FLOAT p4ToX,
-                                                   FX_FLOAT p4ToY,
-                                                   FX_FLOAT p1FromX,
-                                                   FX_FLOAT p1FromY,
-                                                   FX_FLOAT p2FromX,
-                                                   FX_FLOAT p2FromY,
-                                                   FX_FLOAT p3FromX,
-                                                   FX_FLOAT p3FromY,
-                                                   FX_FLOAT p4FromX,
-                                                   FX_FLOAT p4FromY,
-                                                   int32_t& e) {
-  std::unique_ptr<CBC_CommonPerspectiveTransform> transform(
-      CBC_CommonPerspectiveTransform::QuadrilateralToQuadrilateral(
-          p1ToX, p1ToY, p2ToX, p2ToY, p3ToX, p3ToY, p4ToX, p4ToY, p1FromX,
-          p1FromY, p2FromX, p2FromY, p3FromX, p3FromY, p4FromX, p4FromY));
-  std::unique_ptr<CBC_CommonBitMatrix> bits(new CBC_CommonBitMatrix());
-  bits->Init(dimensionX, dimensionY);
-  CFX_FloatArray points;
-  points.SetSize(dimensionX << 1);
-  for (int32_t y = 0; y < dimensionY; y++) {
-    int32_t max = points.GetSize();
-    FX_FLOAT iValue = (FX_FLOAT)(y + 0.5f);
-    int32_t x;
-    for (x = 0; x < max; x += 2) {
-      points[x] = (FX_FLOAT)((x >> 1) + 0.5f);
-      points[x + 1] = iValue;
-    }
-    transform->TransformPoints(&points);
-    CheckAndNudgePoints(image, &points, e);
-    BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
-    for (x = 0; x < max; x += 2) {
-      if (image->Get((int32_t)points[x], (int32_t)points[x + 1])) {
-        bits->Set(x >> 1, y);
-      }
-    }
-  }
-  return bits.release();
-}
diff --git a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/fxbarcode/qrcode/BC_QRGridSampler.h
deleted file mode 100644
index 70bfb9e085..0000000000
--- a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_CommonBitMatrix;
-
-class CBC_QRGridSampler {
- private:
-  static CBC_QRGridSampler m_gridSampler;
-
- public:
-  CBC_QRGridSampler();
-  virtual ~CBC_QRGridSampler();
-  virtual CBC_CommonBitMatrix* SampleGrid(CBC_CommonBitMatrix* image,
-                                          int32_t dimensionX,
-                                          int32_t dimensionY,
-                                          FX_FLOAT p1ToX,
-                                          FX_FLOAT p1ToY,
-                                          FX_FLOAT p2ToX,
-                                          FX_FLOAT p2ToY,
-                                          FX_FLOAT p3ToX,
-                                          FX_FLOAT p3ToY,
-                                          FX_FLOAT p4ToX,
-                                          FX_FLOAT p4ToY,
-                                          FX_FLOAT p1FromX,
-                                          FX_FLOAT p1FromY,
-                                          FX_FLOAT p2FromX,
-                                          FX_FLOAT p2FromY,
-                                          FX_FLOAT p3FromX,
-                                          FX_FLOAT p3FromY,
-                                          FX_FLOAT p4FromX,
-                                          FX_FLOAT p4FromY,
-                                          int32_t& e);
-
-  static CBC_QRGridSampler& GetInstance();
-  static void CheckAndNudgePoints(CBC_CommonBitMatrix* image,
-                                  CFX_FloatArray* points,
-                                  int32_t& e);
-};
-
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_