summaryrefslogtreecommitdiff
path: root/xfa/src/fxbarcode/oned
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-24 18:20:51 -0800
committerLei Zhang <thestig@chromium.org>2016-02-24 18:20:51 -0800
commit2e6864282e65c55ff6809f5aaae011b31c3a361a (patch)
tree98daecaf078529986a4efc2c43a3f43c0dcc01dd /xfa/src/fxbarcode/oned
parent969ea09df096b987662b9658e3ffa023ca4ebf70 (diff)
downloadpdfium-2e6864282e65c55ff6809f5aaae011b31c3a361a.tar.xz
Get rid of CBC_AutoPtr and use std::unique_ptr instead.
Also fix IWYU in various fxbarcode headers. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1734823002 .
Diffstat (limited to 'xfa/src/fxbarcode/oned')
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDReader.h3
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDimReader.cpp8
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDimReader.h6
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp7
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h5
5 files changed, 18 insertions, 11 deletions
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.h b/xfa/src/fxbarcode/oned/BC_OneDReader.h
index 5a55d1f5e2..27a1a3d7ee 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.h
@@ -7,9 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
#define XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
-class CBC_Reader;
class CBC_BinaryBitmap;
class CBC_CommonBitArray;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
index 74f0db4068..da1f47bfe8 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
@@ -20,10 +20,13 @@
* limitations under the License.
*/
+#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
+
+#include <memory>
+
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/utils.h"
const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f);
@@ -73,9 +76,8 @@ CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber,
CBC_CommonBitArray* row,
int32_t hints,
int32_t& e) {
- CFX_Int32Array* StartPattern = FindStartGuardPattern(row, e);
+ std::unique_ptr<CFX_Int32Array> result(FindStartGuardPattern(row, e));
BC_EXCEPTION_CHECK_ReturnValue(e, "");
- CBC_AutoPtr<CFX_Int32Array> result(StartPattern);
CFX_ByteString temp = DecodeRow(rowNumber, row, result.get(), hints, e);
BC_EXCEPTION_CHECK_ReturnValue(e, "");
return temp;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.h b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
index 0a3e3c3d5d..3374bec63a 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
@@ -7,9 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
#define XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
-class CBC_OneDReader;
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+
class CBC_CommonBitArray;
-class CBC_OneDimReader;
+
class CBC_OneDimReader : public CBC_OneDReader {
private:
const static int32_t MAX_AVG_VARIANCE;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index d7caf68226..3cbad1eade 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -20,13 +20,15 @@
* limitations under the License.
*/
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
+
#include <algorithm>
+#include <memory>
#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
#include "xfa/src/fxbarcode/utils.h"
@@ -46,9 +48,8 @@ CFX_ByteString CBC_OnedCodaBarReader::DecodeRow(int32_t rowNumber,
CBC_CommonBitArray* row,
int32_t hints,
int32_t& e) {
- CFX_Int32Array* int32Ptr = FindAsteriskPattern(row, e);
+ std::unique_ptr<CFX_Int32Array> start(FindAsteriskPattern(row, e));
BC_EXCEPTION_CHECK_ReturnValue(e, "");
- CBC_AutoPtr<CFX_Int32Array> start(int32Ptr);
(*start)[1] = 0;
int32_t nextStart = (*start)[1];
int32_t end = row->GetSize();
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
index e1cf9d8698..cbb47fb554 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
@@ -7,9 +7,12 @@
#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+
class CBC_CommonBitArray;
class CBC_OneDReader;
-class CBC_OnedCodaBarReader;
+
class CBC_OnedCodaBarReader : public CBC_OneDReader {
public:
CBC_OnedCodaBarReader();