Use smart pointers for class owned pointers in xfa/fxbarcode

xfa/fxbarcode/pdf417/BC_PDF417.cpp

 // 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 2006 Jeremias Maerki in part, and ZXing Authors in part
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ skipping 362 matching lines @@
      0x13e32, 0x17e72, 0x1df8a, 0x19f0a, 0x1bf1a, 0x11e0a, 0x13e1a, 0x17e3a,
      0x1035c, 0x1034e, 0x10758, 0x183ae, 0x1074c, 0x10746, 0x1032e, 0x1076e,
      0x10f50, 0x187ac, 0x10f48, 0x187a6, 0x10f44, 0x10f42, 0x1072c, 0x10f6c,
      0x10726, 0x10f66, 0x18fa8, 0x1c7d6, 0x18fa4, 0x18fa2, 0x10f28, 0x18796,
      0x11f68, 0x18fb6, 0x11f64, 0x10f22, 0x11f62, 0x10716, 0x10f36, 0x11f76,
      0x1cfd4, 0x1cfd2, 0x18f94, 0x19fb4, 0x18f92, 0x19fb2, 0x10f14, 0x11f34,
      0x10f12, 0x13f74, 0x11f32, 0x13f72, 0x1cfca, 0x18f8a, 0x19f9a, 0x10f0a,
      0x11f1a, 0x13f3a, 0x103ac, 0x103a6, 0x107a8, 0x183d6, 0x107a4, 0x107a2,
      0x10396, 0x107b6, 0x187d4, 0x187d2, 0x10794, 0x10fb4, 0x10792, 0x10fb2,
      0x1c7ea}};
-FX_FLOAT CBC_PDF417::PREFERRED_RATIO = 3.0f;
-FX_FLOAT CBC_PDF417::DEFAULT_MODULE_WIDTH = 0.357f;
-FX_FLOAT CBC_PDF417::HEIGHT = 2.0f;
-CBC_PDF417::CBC_PDF417() {
-  m_compact = FALSE;
-  m_compaction = AUTO;
-  m_minCols = 1;
-  m_maxCols = 30;
-  m_maxRows = 90;
-  m_minRows = 3;
-  m_barcodeMatrix = nullptr;
-}
-CBC_PDF417::CBC_PDF417(FX_BOOL compact) {
-  m_compact = compact;
-  m_compaction = AUTO;
-  m_minCols = 1;
-  m_maxCols = 30;
-  m_maxRows = 90;
-  m_minRows = 3;
-  m_barcodeMatrix = nullptr;
+
+CBC_PDF417::CBC_PDF417()
+    : m_compact(FALSE),

[Lei Zhang, 2016/08/09 00:23:43]

Just delegate to the ctor below?

[Wei Li, 2016/08/09 19:31:23]

Done.

+      m_compaction(AUTO),
+      m_minCols(1),
+      m_maxCols(30),
+      m_maxRows(90),
+      m_minRows(3) {}
+
+CBC_PDF417::CBC_PDF417(FX_BOOL compact)
+    : m_compact(compact),
+      m_compaction(AUTO),
+      m_minCols(1),
+      m_maxCols(30),
+      m_maxRows(90),
+      m_minRows(3) {}
+
+CBC_PDF417::~CBC_PDF417() {}
+
+CBC_BarcodeMatrix* CBC_PDF417::getBarcodeMatrix() {
+  return m_barcodeMatrix.get();
 }
 
-CBC_PDF417::~CBC_PDF417() {
-  delete m_barcodeMatrix;
-}
-
-CBC_BarcodeMatrix* CBC_PDF417::getBarcodeMatrix() {
-  return m_barcodeMatrix;
-}
 void CBC_PDF417::generateBarcodeLogic(CFX_WideString msg,
                                       int32_t errorCorrectionLevel,
                                       int32_t& e) {
   int32_t errorCorrectionCodeWords =
       CBC_PDF417ErrorCorrection::getErrorCorrectionCodewordCount(
           errorCorrectionLevel, e);
   BC_EXCEPTION_CHECK_ReturnVoid(e);
   CFX_WideString highLevel =
       CBC_PDF417HighLevelEncoder::encodeHighLevel(msg, m_compaction, e);
   BC_EXCEPTION_CHECK_ReturnVoid(e);
@@ skipping 15 matching lines @@
   sb += (FX_WCHAR)n;
   sb += highLevel;
   for (int32_t i = 0; i < pad; i++) {
     sb += (FX_WCHAR)900;
   }
   CFX_WideString dataCodewords(sb);
   CFX_WideString ec = CBC_PDF417ErrorCorrection::generateErrorCorrection(
       dataCodewords, errorCorrectionLevel, e);
   BC_EXCEPTION_CHECK_ReturnVoid(e);
   CFX_WideString fullCodewords = dataCodewords + ec;
-  m_barcodeMatrix = new CBC_BarcodeMatrix(rows, cols);
+  m_barcodeMatrix.reset(new CBC_BarcodeMatrix(rows, cols));
   encodeLowLevel(fullCodewords, cols, rows, errorCorrectionLevel,
-                 m_barcodeMatrix);
+                 m_barcodeMatrix.get());
 }
+
 void CBC_PDF417::setDimensions(int32_t maxCols,
                                int32_t minCols,
                                int32_t maxRows,
                                int32_t minRows) {
   m_maxCols = maxCols;
   m_minCols = minCols;
   m_maxRows = maxRows;
   m_minRows = minRows;
 }
+
 void CBC_PDF417::setCompaction(Compaction compaction) {
   m_compaction = compaction;
 }
+
 void CBC_PDF417::setCompact(FX_BOOL compact) {
   m_compact = compact;
 }
+
 int32_t CBC_PDF417::calculateNumberOfRows(int32_t m, int32_t k, int32_t c) {
   int32_t r = ((m + 1 + k) / c) + 1;
   if (c * r >= (m + 1 + k + c)) {
     r--;
   }
   return r;
 }
+
 int32_t CBC_PDF417::getNumberOfPadCodewords(int32_t m,
                                             int32_t k,
                                             int32_t c,
                                             int32_t r) {
   int32_t n = c * r - k;
   return n > m + 1 ? n - m - 1 : 0;
 }
+
 void CBC_PDF417::encodeChar(int32_t pattern,
                             int32_t len,
                             CBC_BarcodeRow* logic) {
   int32_t map = 1 << (len - 1);
   FX_BOOL last = ((pattern & map) != 0);
   int32_t width = 0;
   for (int32_t i = 0; i < len; i++) {
     FX_BOOL black = ((pattern & map) != 0);
     if (last == black) {
       width++;
     } else {
       logic->addBar(last, width);
       last = black;
       width = 1;
     }
     map >>= 1;
   }
   logic->addBar(last, width);
 }
+
 void CBC_PDF417::encodeLowLevel(CFX_WideString fullCodewords,
                                 int32_t c,
                                 int32_t r,
                                 int32_t errorCorrectionLevel,
                                 CBC_BarcodeMatrix* logic) {
   int32_t idx = 0;
   for (int32_t y = 0; y < r; y++) {
     int32_t cluster = y % 3;
     logic->startRow();
     encodeChar(START_PATTERN, 17, logic->getCurrentRow());
@@ skipping 18 matching lines @@
     }
     if (m_compact) {
       encodeChar(STOP_PATTERN, 1, logic->getCurrentRow());
     } else {
       pattern = CODEWORD_TABLE[cluster][right];
       encodeChar(pattern, 17, logic->getCurrentRow());
       encodeChar(STOP_PATTERN, 18, logic->getCurrentRow());
     }
   }
 }
+
 CFX_Int32Array* CBC_PDF417::determineDimensions(
     int32_t sourceCodeWords,
     int32_t errorCorrectionCodeWords,
     int32_t& e) {
   FX_FLOAT ratio = 0.0f;
   CFX_Int32Array* dimension = nullptr;
   for (int32_t cols = m_minCols; cols <= m_maxCols; cols++) {
     int32_t rows =
         calculateNumberOfRows(sourceCodeWords, errorCorrectionCodeWords, cols);
     if (rows < m_minRows) {
@@ skipping 26 matching lines @@
       dimension->Add(m_minCols);
       dimension->Add(rows);
     }
   }
   if (!dimension) {
     e = BCExceptionUnableToFitMessageInColumns;
     return nullptr;
   }
   return dimension;
 }