Skip to content

Fix the prefix for three-byte ECI assignments #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikamikasuki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the prefix for three-byte ECI assignments #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qrinput.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ static int QRinput_encodeModeECI(QRinput_List *entry, BitStream *bstream)
code = 0x8000 + ecinum;
} else {
words = 3;
code = 0xc0000 + ecinum;
code = 0xc00000 + ecinum;
}

ret = BitStream_appendNum(bstream, 4, QRSPEC_MODEID_ECI);
Expand Down
37 changes: 36 additions & 1 deletion tests/test_qrinput.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,40 @@ static void test_ECIinvalid(void)
testFinish();
}

static void test_encodeECIrange(void)
{
const struct {
unsigned int ecinum;
char *bits;
} cases[] = {
{0, "0111 00000000"},
{127, "0111 01111111"},
{128, "0111 10000000 10000000"},
{16383, "0111 10111111 11111111"},
{16384, "0111 11000000 01000000 00000000"},
{999999, "0111 11001111 01000010 00111111"}
};
QRinput *input;
BitStream *bstream;
size_t i;
int ret;

testStart("Encoding ECI headers at assignment range boundaries.");
for(i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
input = QRinput_new();
ret = QRinput_appendECIheader(input, cases[i].ecinum);
assert_zero(ret, "Valid ECI assignment %u rejected.\n", cases[i].ecinum);
bstream = BitStream_new();
ret = QRinput_mergeBitStream(input, bstream);
assert_zero(ret, "Failed to merge ECI assignment %u.\n", cases[i].ecinum);
ret = cmpBin(cases[i].bits, bstream);
assert_zero(ret, "ECI assignment %u incorrectly encoded.\n", cases[i].ecinum);
BitStream_free(bstream);
QRinput_free(input);
}
testFinish();
}

static void test_encodeECI(void)
{
QRinput *input;
Expand Down Expand Up @@ -1076,7 +1110,7 @@ static void test_encodeECI(void)

int main()
{
int tests = 42;
int tests = 43;
testInit(tests);

test_encodeNumeric();
Expand Down Expand Up @@ -1121,6 +1155,7 @@ int main()
test_textMQR();

test_ECIinvalid();
test_encodeECIrange();
test_encodeECI();

testReport(tests);
Expand Down