commit 8a1188893eba65bf56e07bec462160d83ceb1609
author Tom Sepez <tsepez@chromium.org> Wed Nov 20 23:54:33 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Nov 20 23:54:33 2019 +0000
tree 13a00858c31224ddb3754686bc63b65e7efef91d
parent 237c4dd36862c9f1de65fc4bef4fcfe17c50cfd3

Pass span<> arguments in fxbarcode/.

Preferable to a const-ref vector of a specific allocator type.

Change-Id: I749b54aa1b0187c8b9983f9f4849410a37a02866
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/62574
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fxbarcode/BC_TwoDimWriter.cpp

diff --git a/fxbarcode/BC_TwoDimWriter.cpp b/fxbarcode/BC_TwoDimWriter.cpp
index d31c59c..61d2b55 100644
--- a/fxbarcode/BC_TwoDimWriter.cpp
+++ b/fxbarcode/BC_TwoDimWriter.cpp
@@ -21,7 +21,7 @@
 
 CBC_TwoDimWriter::~CBC_TwoDimWriter() = default;
 
-bool CBC_TwoDimWriter::RenderResult(const std::vector<uint8_t>& code,
+bool CBC_TwoDimWriter::RenderResult(pdfium::span<const uint8_t> code,
                                     int32_t codeWidth,
                                     int32_t codeHeight) {
   if (code.empty())

fxbarcode/BC_TwoDimWriter.h

diff --git a/fxbarcode/BC_TwoDimWriter.h b/fxbarcode/BC_TwoDimWriter.h
index 91f5ac7..a887ded 100644
--- a/fxbarcode/BC_TwoDimWriter.h
+++ b/fxbarcode/BC_TwoDimWriter.h
@@ -8,10 +8,10 @@
 #define FXBARCODE_BC_TWODIMWRITER_H_
 
 #include <memory>
-#include <vector>
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "fxbarcode/BC_Writer.h"
+#include "third_party/base/span.h"
 
 class CBC_CommonBitMatrix;
 class CFX_RenderDevice;
@@ -21,7 +21,7 @@
   explicit CBC_TwoDimWriter(bool bFixedSize);
   ~CBC_TwoDimWriter() override;
 
-  bool RenderResult(const std::vector<uint8_t>& code,
+  bool RenderResult(pdfium::span<const uint8_t> code,
                     int32_t codeWidth,
                     int32_t codeHeight);
   void RenderDeviceResult(CFX_RenderDevice* device, const CFX_Matrix* matrix);

fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp

diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 995d4d8..2cee833 100644
--- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -251,7 +251,7 @@
   return submode;
 }
 
-void CBC_PDF417HighLevelEncoder::EncodeBinary(const std::vector<uint8_t>& bytes,
+void CBC_PDF417HighLevelEncoder::EncodeBinary(pdfium::span<const uint8_t> bytes,
                                               size_t startpos,
                                               size_t count,
                                               EncodingMode startmode,

fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h

diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index 32c3f2d..df1cd54 100644
--- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -11,8 +11,8 @@
 
 #include "core/fxcrt/fx_string.h"
 #include "fxbarcode/pdf417/BC_PDF417.h"
-
 #include "third_party/base/optional.h"
+#include "third_party/base/span.h"
 
 class CBC_PDF417HighLevelEncoder {
  public:
@@ -31,7 +31,7 @@
                             size_t count,
                             SubMode initialSubmode,
                             WideString* sb);
-  static void EncodeBinary(const std::vector<uint8_t>& bytes,
+  static void EncodeBinary(pdfium::span<const uint8_t> bytes,
                            size_t startpos,
                            size_t count,
                            EncodingMode startmode,

fxbarcode/qrcode/BC_QRCoderEncoder.cpp

diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 2ecd3b8..be02f5b 100644
--- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -224,7 +224,7 @@
   return false;
 }
 
-std::vector<uint8_t> GenerateECBytes(const std::vector<uint8_t>& dataBytes,
+std::vector<uint8_t> GenerateECBytes(pdfium::span<const uint8_t> dataBytes,
                                      size_t numEcBytesInBlock) {
   // If |numEcBytesInBlock| is 0, the encoder will fail anyway.
   ASSERT(numEcBytesInBlock > 0);