diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
| commit | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (patch) | |
| tree | a5a435608eb527db39e2c9324737bd230e762030 /xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | |
| parent | 25ae22692cdd5b4ae4783ecb27eba79b3c794b2c (diff) | |
| download | pdfium-aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776.tar.xz | |
Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1547833002 .
(cherry picked from commit d20dfba2ae10e8aeb328328f09da79ff904110a8)
Review URL: https://codereview.chromium.org/1545183002 .
Diffstat (limited to 'xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp')
| -rw-r--r-- | xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 1a6afa7e1e..662e773af3 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -22,10 +22,11 @@ #include "BC_OneDimWriter.h"
+#include <memory>
+
#include "../BC_Writer.h"
#include "../barcode.h"
#include "../common/BC_CommonBitMatrix.h"
-#include "third_party/base/nonstd_unique_ptr.h"
CBC_OneDimWriter::CBC_OneDimWriter() {
m_locTextLoc = BC_TEXT_LOC_BELOWEMBED;
@@ -132,7 +133,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text, FX_FLOAT geWidth,
int32_t fontSize,
FX_FLOAT& charsLen) {
- nonstd::unique_ptr<CFX_UnicodeEncodingEx> encoding(
+ std::unique_ptr<CFX_UnicodeEncodingEx> encoding(
FX_CreateFontEncodingEx(cFont));
int32_t length = text.GetLength();
|