Import Cobalt 20.master.0.239287
Includes the following patches:
https://cobalt-review.googlesource.com/c/cobalt/+/5590
by n1214.hwang@samsung.com
https://cobalt-review.googlesource.com/c/cobalt/+/5530
by errong.leng@samsung.com
diff --git a/src/third_party/QR-Code-generator/cpp/QrCode.cpp b/src/third_party/QR-Code-generator/cpp/QrCode.cpp
index 0f78920..0dbc086 100644
--- a/src/third_party/QR-Code-generator/cpp/QrCode.cpp
+++ b/src/third_party/QR-Code-generator/cpp/QrCode.cpp
@@ -54,9 +54,9 @@
}
-QrCode QrCode::encodeText(const char *text, Ecc ecl) {
+QrCode QrCode::encodeText(const char *text, Ecc ecl, int minVersion) {
vector<QrSegment> segs = QrSegment::makeSegments(text);
- return encodeSegments(segs, ecl);
+ return encodeSegments(segs, ecl, minVersion);
}
diff --git a/src/third_party/QR-Code-generator/cpp/QrCode.hpp b/src/third_party/QR-Code-generator/cpp/QrCode.hpp
index 14a3f61..31dd1d7 100644
--- a/src/third_party/QR-Code-generator/cpp/QrCode.hpp
+++ b/src/third_party/QR-Code-generator/cpp/QrCode.hpp
@@ -64,7 +64,7 @@
* QR Code version is automatically chosen for the output. The ECC level of the result may be higher than
* the ecl argument if it can be done without increasing the version.
*/
- public: static QrCode encodeText(const char *text, Ecc ecl);
+ public: static QrCode encodeText(const char *text, Ecc ecl, int minVersion);
/*
