Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h

Issue 2595203002: Remove CFX_ArrayTemplate in BC_QRCoderEncoder. (Closed)
Patch Set: numberic Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 6303d7c1c5c7cace8789c4ae5f7bbac744003b9b..649938a060c6ea504167c1bdefb5a9dfeae7ef4a 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -7,6 +7,9 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+#include <utility>
+#include <vector>
+
#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/fx_string.h"
@@ -16,12 +19,8 @@ class CBC_QRCoderMode;
class CBC_QRCoderBitVector;
class CBC_CommonByteArray;
class CBC_CommonByteMatrix;
-class Make_Pair;
class CBC_QRCoderEncoder {
- private:
- static const int32_t m_alphaNumbericTable[96];
-
public:
CBC_QRCoderEncoder();
virtual ~CBC_QRCoderEncoder();
@@ -121,13 +120,16 @@ class CBC_QRCoderEncoder {
CBC_QRCoderMode* modeSecond,
int32_t versionNum,
int32_t& e);
- static void MergeString(CFX_ArrayTemplate<Make_Pair*>* result,
- int32_t versionNum,
- int32_t& e);
- static void SplitString(const CFX_ByteString& content,
- CFX_ArrayTemplate<Make_Pair*>* result);
+ static void MergeString(
+ std::vector<std::pair<CBC_QRCoderMode*, CFX_ByteString>>* result,
+ int32_t versionNum,
+ int32_t& e);
+ static void SplitString(
+ const CFX_ByteString& content,
+ std::vector<std::pair<CBC_QRCoderMode*, CFX_ByteString>>* result);
static void AppendDataModeLenghInfo(
- const CFX_ArrayTemplate<Make_Pair*>& splitResult,
+ const std::vector<std::pair<CBC_QRCoderMode*, CFX_ByteString>>&
+ splitResult,
CBC_QRCoderBitVector& headerAndDataBits,
CBC_QRCoderMode* tempMode,
CBC_QRCoder* qrCode,
« no previous file with comments | « no previous file | xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp » ('j') | xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698