mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

dpd/gif suppress warnings; tests refresh svgs, dpd examples

Browse Source
This commit is contained in:
gitlost 2020-08-04 00:36:27 +01:00
parent fd9aa785ab
commit 4ddcfb3613
17 changed files with 88 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/code128.c
View File

@ -1112,7 +1112,7 @@ INTERNAL int ean_14(struct zint_symbol *symbol, unsigned char source[], int leng
INTERNAL int dpd_parcel(struct zint_symbol *symbol, unsigned char source[], int length) {
int error_number = 0;
int i, p;
char identifier;
unsigned char identifier;
const int mod = 36;
int cd; // Check digit

2
backend/gif.c
View File

@ -286,7 +286,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
int paletteSize;
statestruct State;
int transparent_index;
int bgindex, fgindex;
int bgindex = -1, fgindex = -1;
unsigned char backgroundColourIndex;
unsigned char RGBCur[3];

2
backend/tests/data/print/svg/code128_aim.svg
View File

@ -28,7 +28,7 @@
<rect x="128.00" y="0.00" width="2.00" height="100.00" />
<rect x="132.00" y="0.00" width="4.00" height="100.00" />
<text x="68.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="18.0" fill="#000000" >
font-family="Helvetica" font-size="18.0" >
AIM
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

78
backend/tests/data/print/svg/dotcode_aim_fig7.svg
View File

@ -8,44 +8,44 @@
<g id="barcode" fill="#000000">
<rect x="0" y="0" width="26" height="20" fill="#FFFFFF" />
<circle cx="1.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="5.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="13.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="17.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="21.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="25.00" cy="1.00" r="1.00" fill="#000000" />
<circle cx="7.00" cy="3.00" r="1.00" fill="#000000" />
<circle cx="1.00" cy="5.00" r="1.00" fill="#000000" />
<circle cx="9.00" cy="5.00" r="1.00" fill="#000000" />
<circle cx="17.00" cy="5.00" r="1.00" fill="#000000" />
<circle cx="21.00" cy="5.00" r="1.00" fill="#000000" />
<circle cx="25.00" cy="5.00" r="1.00" fill="#000000" />
<circle cx="3.00" cy="7.00" r="1.00" fill="#000000" />
<circle cx="15.00" cy="7.00" r="1.00" fill="#000000" />
<circle cx="19.00" cy="7.00" r="1.00" fill="#000000" />
<circle cx="9.00" cy="9.00" r="1.00" fill="#000000" />
<circle cx="13.00" cy="9.00" r="1.00" fill="#000000" />
<circle cx="21.00" cy="9.00" r="1.00" fill="#000000" />
<circle cx="3.00" cy="11.00" r="1.00" fill="#000000" />
<circle cx="11.00" cy="11.00" r="1.00" fill="#000000" />
<circle cx="23.00" cy="11.00" r="1.00" fill="#000000" />
<circle cx="1.00" cy="13.00" r="1.00" fill="#000000" />
<circle cx="9.00" cy="13.00" r="1.00" fill="#000000" />
<circle cx="13.00" cy="13.00" r="1.00" fill="#000000" />
<circle cx="17.00" cy="13.00" r="1.00" fill="#000000" />
<circle cx="25.00" cy="13.00" r="1.00" fill="#000000" />
<circle cx="3.00" cy="15.00" r="1.00" fill="#000000" />
<circle cx="7.00" cy="15.00" r="1.00" fill="#000000" />
<circle cx="11.00" cy="15.00" r="1.00" fill="#000000" />
<circle cx="19.00" cy="15.00" r="1.00" fill="#000000" />
<circle cx="1.00" cy="17.00" r="1.00" fill="#000000" />
<circle cx="9.00" cy="17.00" r="1.00" fill="#000000" />
<circle cx="17.00" cy="17.00" r="1.00" fill="#000000" />
<circle cx="21.00" cy="17.00" r="1.00" fill="#000000" />
<circle cx="25.00" cy="17.00" r="1.00" fill="#000000" />
<circle cx="3.00" cy="19.00" r="1.00" fill="#000000" />
<circle cx="7.00" cy="19.00" r="1.00" fill="#000000" />
<circle cx="15.00" cy="19.00" r="1.00" fill="#000000" />
<circle cx="23.00" cy="19.00" r="1.00" fill="#000000" />
<circle cx="1.00" cy="1.00" r="1.00" />
<circle cx="5.00" cy="1.00" r="1.00" />
<circle cx="13.00" cy="1.00" r="1.00" />
<circle cx="17.00" cy="1.00" r="1.00" />
<circle cx="21.00" cy="1.00" r="1.00" />
<circle cx="25.00" cy="1.00" r="1.00" />
<circle cx="7.00" cy="3.00" r="1.00" />
<circle cx="1.00" cy="5.00" r="1.00" />
<circle cx="9.00" cy="5.00" r="1.00" />
<circle cx="17.00" cy="5.00" r="1.00" />
<circle cx="21.00" cy="5.00" r="1.00" />
<circle cx="25.00" cy="5.00" r="1.00" />
<circle cx="3.00" cy="7.00" r="1.00" />
<circle cx="15.00" cy="7.00" r="1.00" />
<circle cx="19.00" cy="7.00" r="1.00" />
<circle cx="9.00" cy="9.00" r="1.00" />
<circle cx="13.00" cy="9.00" r="1.00" />
<circle cx="21.00" cy="9.00" r="1.00" />
<circle cx="3.00" cy="11.00" r="1.00" />
<circle cx="11.00" cy="11.00" r="1.00" />
<circle cx="23.00" cy="11.00" r="1.00" />
<circle cx="1.00" cy="13.00" r="1.00" />
<circle cx="9.00" cy="13.00" r="1.00" />
<circle cx="13.00" cy="13.00" r="1.00" />
<circle cx="17.00" cy="13.00" r="1.00" />
<circle cx="25.00" cy="13.00" r="1.00" />
<circle cx="3.00" cy="15.00" r="1.00" />
<circle cx="7.00" cy="15.00" r="1.00" />
<circle cx="11.00" cy="15.00" r="1.00" />
<circle cx="19.00" cy="15.00" r="1.00" />
<circle cx="1.00" cy="17.00" r="1.00" />
<circle cx="9.00" cy="17.00" r="1.00" />
<circle cx="17.00" cy="17.00" r="1.00" />
<circle cx="21.00" cy="17.00" r="1.00" />
<circle cx="25.00" cy="17.00" r="1.00" />
<circle cx="3.00" cy="19.00" r="1.00" />
<circle cx="7.00" cy="19.00" r="1.00" />
<circle cx="15.00" cy="19.00" r="1.00" />
<circle cx="23.00" cy="19.00" r="1.00" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

2
backend/tests/data/svg/code128_amperands.svg
View File

@ -34,7 +34,7 @@
<rect x="172.00" y="0.00" width="2.00" height="100.00" />
<rect x="176.00" y="0.00" width="4.00" height="100.00" />
<text x="90.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="18.0" fill="#000000" >
font-family="Helvetica" font-size="18.0" >
&lt;&gt;&quot;&amp;&apos;
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

8
backend/tests/data/svg/ean13_2addon_ggs_5.2.2.5.1-2.svg
View File

@ -46,19 +46,19 @@
<rect x="256.00" y="20.00" width="2.00" height="90.00" />
<rect x="262.00" y="20.00" width="4.00" height="90.00" />
<text x="8.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
9
</text>
<text x="70.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
771384
</text>
<text x="164.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
524017
</text>
<text x="246.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

8
backend/tests/data/svg/ean13_5addon_ggs_5.2.2.5.2-2.svg
View File

@ -55,19 +55,19 @@
<rect x="310.00" y="20.00" width="4.00" height="90.00" />
<rect x="318.00" y="20.00" width="2.00" height="90.00" />
<text x="8.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
9
</text>
<text x="70.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
780877
</text>
<text x="164.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
799306
</text>
<text x="274.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
54321
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

2
backend/tests/data/svg/ean2.svg
View File

@ -16,7 +16,7 @@
<rect x="44.00" y="0.00" width="2.00" height="100.00" />
<rect x="50.00" y="0.00" width="4.00" height="100.00" />
<text x="34.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 969 B

After

Width:  |  Height:  |  Size: 954 B

2
backend/tests/data/svg/ean5.svg
View File

@ -25,7 +25,7 @@
<rect x="96.00" y="0.00" width="4.00" height="100.00" />
<rect x="106.00" y="0.00" width="2.00" height="100.00" />
<text x="61.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12345
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

6
backend/tests/data/svg/ean8_2addon.svg
View File

@ -38,15 +38,15 @@
<rect x="192.00" y="20.00" width="2.00" height="90.00" />
<rect x="198.00" y="20.00" width="4.00" height="90.00" />
<text x="48.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
1234
</text>
<text x="114.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
5670
</text>
<text x="182.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

6
backend/tests/data/svg/ean8_5addon.svg
View File

@ -47,15 +47,15 @@
<rect x="244.00" y="20.00" width="4.00" height="90.00" />
<rect x="254.00" y="20.00" width="2.00" height="90.00" />
<text x="48.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
1234
</text>
<text x="114.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
5670
</text>
<text x="210.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12345
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

10
backend/tests/data/svg/upca_2addon_ggs_5.2.6.6-5.svg
View File

@ -46,23 +46,23 @@
<rect x="254.00" y="20.00" width="2.00" height="80.00" />
<rect x="262.00" y="20.00" width="4.00" height="80.00" />
<text x="8.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
0
</text>
<text x="72.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12345
</text>
<text x="154.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
67890
</text>
<text x="218.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
5
</text>
<text x="250.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
24
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

10
backend/tests/data/svg/upca_5addon.svg
View File

@ -55,23 +55,23 @@
<rect x="308.00" y="20.00" width="4.00" height="80.00" />
<rect x="318.00" y="20.00" width="2.00" height="80.00" />
<text x="8.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
6
</text>
<text x="72.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
14141
</text>
<text x="154.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
23441
</text>
<text x="218.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
7
</text>
<text x="278.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12345
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

8
backend/tests/data/svg/upce_2addon.svg
View File

@ -33,19 +33,19 @@
<rect x="164.00" y="20.00" width="2.00" height="80.00" />
<rect x="170.00" y="20.00" width="4.00" height="80.00" />
<text x="8.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
1
</text>
<text x="66.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
234567
</text>
<text x="128.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
0
</text>
<text x="154.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

8
backend/tests/data/svg/upce_5addon.svg
View File

@ -42,19 +42,19 @@
<rect x="216.00" y="20.00" width="4.00" height="80.00" />
<rect x="226.00" y="20.00" width="2.00" height="80.00" />
<text x="8.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
1
</text>
<text x="66.00" y="118.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
234567
</text>
<text x="128.00" y="114.00" text-anchor="middle"
font-family="Helvetica" font-size="16.0" fill="#000000" >
font-family="Helvetica" font-size="16.0" >
0
</text>
<text x="182.00" y="16.00" text-anchor="middle"
font-family="Helvetica" font-size="22.0" fill="#000000" >
font-family="Helvetica" font-size="22.0" >
12345
</text>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

10
backend/tests/test_code128.c
View File

@ -506,6 +506,7 @@ static void test_encode(int index, int generate, int debug) {
char *expected;
};
// BARCODE_GS1_128 examples verified manually against GS1 General Specifications 20.0 (GGS)
// BARCODE_DPD examples Specification DPD and primetime Parcel Despatch (DPDAPPD) Version 4.0.2
struct item data[] = {
/* 0*/ { BARCODE_CODE128, UNICODE_MODE, "AIM", 0, 1, 68, 1, "ISO/IEC 15417:2007 Figure 1",
"11010010000101000110001100010001010111011000101110110001100011101011"
@ -624,6 +625,15 @@ static void test_encode(int index, int generate, int debug) {
/* 38*/ { BARCODE_HIBC_128, UNICODE_MODE, "$$52001510X3G", 0, 1, 178, 1, "ANSI/HIBC 2.6 - 2016 Figure 5, same",
"1101001000011000100100100100011001001000110010111011110110111000101101100110010111001100110010001001011110111011100010110110010111001101000100010110001000100011110101100011101011"
},
/* 39*/ { BARCODE_DPD, UNICODE_MODE, "%000393206219912345678101040", 0, 1, 211, 1, "DPDAPPD 4.0.2 - Illustrations 2, 7, 8, same; NOTE: correct HRT given by Illustration 7 only",
"1101001000010001001100100111011001011101111011011001100110100010001100011011010011001000110111001001011101111010110011100100010110001110001011011000010100110010001001100100010011000101000101011110001100011101011"
},
/* 40*/ { BARCODE_DPD, UNICODE_MODE, "%000393206219912345678101040", 0, 1, 211, 1, "DPDAPPD 4.0.2 - Illustration 6 **NOT SAME** HRT incorrect, also uses CodeA and inefficient encoding; verified against tec-it",
"1101001000010001001100100111011001011101111011011001100110100010001100011011010011001000110111001001011101111010110011100100010110001110001011011000010100110010001001100100010011000101000101011110001100011101011"
},
/* 41*/ { BARCODE_DPD, UNICODE_MODE, "0123456789012345678901234567", 0, 1, 189, 1, "DPDAPPD 4.0.2 - Illustration 9, same (allowing for literal HRT)",
"110100111001100110110011101101110101110110001000010110011011011110110011011001110110111010111011000100001011001101101111011001101100111011011101011101100010000101100101011110001100011101011"
},
};
int data_size = sizeof(data) / sizeof(struct item);

2
backend/tests/testcommon.c
View File

@ -326,7 +326,7 @@ char *testUtilBarcodeName(int symbology) {
{ "BARCODE_DAFT", BARCODE_DAFT, 93 },
{ "", -1, 94 },
{ "", -1, 95 },
{ "", -1, 96 },
{ "BARCODE_DPD", BARCODE_DPD, 96 },
{ "BARCODE_MICROQR", BARCODE_MICROQR, 97 },
{ "BARCODE_HIBC_128", BARCODE_HIBC_128, 98 },
{ "BARCODE_HIBC_39", BARCODE_HIBC_39, 99 },