| Index: xfa/src/fxbarcode/BC_BarCode.cpp
 | 
| diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp
 | 
| index 94ee1aff0f339b80a051c5d9327508099ba4b5c3..5fbbee65c14340acc22a0e4147574c6f1ccbee3c 100644
 | 
| --- a/xfa/src/fxbarcode/BC_BarCode.cpp
 | 
| +++ b/xfa/src/fxbarcode/BC_BarCode.cpp
 | 
| @@ -20,64 +20,64 @@
 | 
|   * limitations under the License.
 | 
|   */
 | 
|  
 | 
| -#include "xfa/src/fxbarcode/barcode.h"
 | 
| -#include "xfa/src/fxbarcode/BC_Reader.h"
 | 
| -#include "xfa/src/fxbarcode/BC_Writer.h"
 | 
| -#include "xfa/src/fxbarcode/BC_DecoderResult.h"
 | 
| -#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
 | 
| -#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
 | 
|  #include "xfa/src/fxbarcode/BC_Binarizer.h"
 | 
|  #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
 | 
| -#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
 | 
| -#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 | 
|  #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
 | 
| +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
 | 
| +#include "xfa/src/fxbarcode/BC_DecoderResult.h"
 | 
| +#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
 | 
| +#include "xfa/src/fxbarcode/BC_Reader.h"
 | 
| +#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 | 
|  #include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 | 
| -#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
 | 
| -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 | 
| +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
 | 
| +#include "xfa/src/fxbarcode/BC_Writer.h"
 | 
| +#include "xfa/src/fxbarcode/barcode.h"
 | 
|  #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 | 
|  #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 | 
| +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 | 
|  #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
 | 
| +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
 | 
|  #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
 | 
|  #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
 | 
| -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
 | 
| -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h"
 | 
| -#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h"
 | 
| -#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h"
 | 
| +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
 | 
| +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h"
 | 
| +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h"
 | 
| +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h"
 | 
|  #include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
 | 
| -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
 | 
|  #include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
 | 
| +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
 | 
|  #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
 | 
|  #include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
 | 
|  CBC_CodeBase::CBC_CodeBase() {}
 | 
| 
 |