From 6b2cfd98dc419ae4bf6551bf654aaa6fcae07da3 Mon Sep 17 00:00:00 2001 From: Project Nayuki Date: Sat, 26 Aug 2017 18:43:54 +0000 Subject: [PATCH] Fixed the upper limit of ECI values to be more permissive according to the spec, in almost all language versions except C. --- cpp/QrSegment.cpp | 2 +- java/io/nayuki/qrcodegen/QrSegment.java | 2 +- javascript/qrcodegen.js | 2 +- python/qrcodegen.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/QrSegment.cpp b/cpp/QrSegment.cpp index df8763c..2a0f713 100644 --- a/cpp/QrSegment.cpp +++ b/cpp/QrSegment.cpp @@ -137,7 +137,7 @@ QrSegment QrSegment::makeEci(long assignVal) { else if ((1 << 7) <= assignVal && assignVal < (1 << 14)) { bb.appendBits(2, 2); bb.appendBits(assignVal, 14); - } else if ((1 << 14) <= assignVal && assignVal < 999999L) { + } else if ((1 << 14) <= assignVal && assignVal < 1000000L) { bb.appendBits(6, 3); bb.appendBits(assignVal, 21); } else diff --git a/java/io/nayuki/qrcodegen/QrSegment.java b/java/io/nayuki/qrcodegen/QrSegment.java index f6fa87e..9c4bacd 100644 --- a/java/io/nayuki/qrcodegen/QrSegment.java +++ b/java/io/nayuki/qrcodegen/QrSegment.java @@ -143,7 +143,7 @@ public final class QrSegment { else if ((1 << 7) <= assignVal && assignVal < (1 << 14)) { bb.appendBits(2, 2); bb.appendBits(assignVal, 14); - } else if ((1 << 14) <= assignVal && assignVal < 999999) { + } else if ((1 << 14) <= assignVal && assignVal < 1000000) { bb.appendBits(6, 3); bb.appendBits(assignVal, 21); } else diff --git a/javascript/qrcodegen.js b/javascript/qrcodegen.js index 94031f1..836cc1e 100644 --- a/javascript/qrcodegen.js +++ b/javascript/qrcodegen.js @@ -829,7 +829,7 @@ var qrcodegen = new function() { else if ((1 << 7) <= assignVal && assignVal < (1 << 14)) { bb.appendBits(2, 2); bb.appendBits(assignVal, 14); - } else if ((1 << 14) <= assignVal && assignVal < 999999) { + } else if ((1 << 14) <= assignVal && assignVal < 1000000) { bb.appendBits(6, 3); bb.appendBits(assignVal, 21); } else diff --git a/python/qrcodegen.py b/python/qrcodegen.py index f19a4a6..69677f3 100644 --- a/python/qrcodegen.py +++ b/python/qrcodegen.py @@ -681,7 +681,7 @@ class QrSegment(object): elif (1 << 7) <= assignval < (1 << 14): bb.append_bits(2, 2) bb.append_bits(assignval, 14) - elif (1 << 14) <= assignval < 999999: + elif (1 << 14) <= assignval < 1000000: bb.append_bits(6, 3) bb.append_bits(assignval, 21) else: