From 3db1e2d9b1a8d8a574c4f6971630728f5f26fff2 Mon Sep 17 00:00:00 2001 From: Project Nayuki Date: Thu, 17 Aug 2017 21:52:08 +0000 Subject: [PATCH] Renamed 'packedKanjiData' constant in demo programs. --- cpp/QrCodeGeneratorDemo.cpp | 6 +++--- java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java | 6 +++--- python/qrcodegen-demo.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cpp/QrCodeGeneratorDemo.cpp b/cpp/QrCodeGeneratorDemo.cpp index d85a565..a2c8cfa 100644 --- a/cpp/QrCodeGeneratorDemo.cpp +++ b/cpp/QrCodeGeneratorDemo.cpp @@ -146,7 +146,7 @@ static void doSegmentDemo() { const QrCode qr4 = QrCode::encodeText(madoka, QrCode::Ecc::LOW); printQr(qr4); - const std::vector packedKanjiData{ // Kanji mode encoding (13 bits per character) + const std::vector kanjiChars{ // Kanji mode encoding (13 bits per character) 0x0035, 0x1002, 0x0FC0, 0x0AED, 0x0AD7, 0x015C, 0x0147, 0x0129, 0x0059, 0x01BD, 0x018D, 0x018A, 0x0036, 0x0141, 0x0144, @@ -155,10 +155,10 @@ static void doSegmentDemo() { 0x0000, 0x0208, 0x01FF, 0x0008, }; qrcodegen::BitBuffer bb; - for (int c : packedKanjiData) + for (int c : kanjiChars) bb.appendBits(c, 13); const QrCode qr5 = QrCode::encodeSegments( - {QrSegment(QrSegment::Mode::KANJI, packedKanjiData.size(), bb)}, + {QrSegment(QrSegment::Mode::KANJI, kanjiChars.size(), bb)}, QrCode::Ecc::LOW); printQr(qr5); } diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java index 84ace6f..c9d5dfd 100644 --- a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java +++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java @@ -141,7 +141,7 @@ public final class QrCodeGeneratorDemo { qr = QrCode.encodeText(madoka, QrCode.Ecc.LOW); writePng(qr.toImage(9, 4), "madoka-utf8-QR.png"); - int[] packedKanjiData = { // Kanji mode encoding (13 bits per character) + int[] kanjiChars = { // Kanji mode encoding (13 bits per character) 0x0035, 0x1002, 0x0FC0, 0x0AED, 0x0AD7, 0x015C, 0x0147, 0x0129, 0x0059, 0x01BD, 0x018D, 0x018A, 0x0036, 0x0141, 0x0144, @@ -150,9 +150,9 @@ public final class QrCodeGeneratorDemo { 0x0000, 0x0208, 0x01FF, 0x0008, }; BitBuffer bb = new BitBuffer(); - for (int c : packedKanjiData) + for (int c : kanjiChars) bb.appendBits(c, 13); - segs = Arrays.asList(new QrSegment(QrSegment.Mode.KANJI, packedKanjiData.length, bb)); + segs = Arrays.asList(new QrSegment(QrSegment.Mode.KANJI, kanjiChars.length, bb)); qr = QrCode.encodeSegments(segs, QrCode.Ecc.LOW); writePng(qr.toImage(9, 4), "madoka-kanji-QR.png"); } diff --git a/python/qrcodegen-demo.py b/python/qrcodegen-demo.py index 9353f9a..f5ab865 100644 --- a/python/qrcodegen-demo.py +++ b/python/qrcodegen-demo.py @@ -115,7 +115,7 @@ def do_segment_demo(): qr = qrcodegen.QrCode.encode_text(madoka, qrcodegen.QrCode.Ecc.LOW) print_qr(qr) - packedkanjidata = [ # Kanji mode encoding (13 bits per character) + kanjiCharBits = [ # Kanji mode encoding (13 bits per character) 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, @@ -146,7 +146,7 @@ def do_segment_demo(): 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, ] - segs = [qrcodegen.QrSegment(qrcodegen.QrSegment.Mode.KANJI, len(packedkanjidata) // 13, packedkanjidata)] + segs = [qrcodegen.QrSegment(qrcodegen.QrSegment.Mode.KANJI, len(kanjiCharBits) // 13, kanjiCharBits)] qr = qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.LOW) print_qr(qr)