Import Cobalt 16.162639
Change-Id: I48e550078c1c834849999becacaafe9e12e81803
diff --git a/src/third_party/QR-Code-generator/cpp/QrCode.cpp b/src/third_party/QR-Code-generator/cpp/QrCode.cpp
index 75a5473..c73cf9c 100644
--- a/src/third_party/QR-Code-generator/cpp/QrCode.cpp
+++ b/src/third_party/QR-Code-generator/cpp/QrCode.cpp
@@ -30,6 +30,10 @@
#include "BitBuffer.hpp"
#include "QrCode.hpp"
+#include "starboard/log.h"
+
+#define throw SB_CHECK(false) <<
+
using std::int8_t;
using std::uint8_t;
using std::size_t;
@@ -46,6 +50,7 @@
case Ecc::HIGH : return 2;
default: throw "Assertion error";
}
+ return 0;
}
@@ -490,11 +495,12 @@
vector<int> QrCode::getAlignmentPatternPositions(int ver) {
- if (ver < MIN_VERSION || ver > MAX_VERSION)
+ if (ver < MIN_VERSION || ver > MAX_VERSION) {
throw "Version number out of range";
- else if (ver == 1)
return vector<int>();
- else {
+ } else if (ver == 1) {
+ return vector<int>();
+ } else {
int numAlign = ver / 7 + 2;
int step;
if (ver != 32) {
