mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
Added DMRE size 26x40
This commit is contained in:
Harald Oehlmann
parent
45e584ba28
commit
9f50714b44
@ -96,21 +96,21 @@ static const char text_value[] = {
|
||||
static const unsigned short int intsymbol[] = {
|
||||
0, /* 1: 10x10 , 3*/ 1, /* 2: 12x12 , 5*/ 3, /* 3: 14x14 , 8*/ 5, /* 4: 16x16 , 12*/
|
||||
7, /* 5: 18x18 , 18*/ 9, /* 6: 20x20 , 22*/ 12, /* 7: 22x22 , 30*/ 14, /* 8: 24x24 , 36*/
|
||||
16, /* 9: 26x26 , 44*/ 18, /* 10: 32x32 , 62*/ 21, /* 11: 36x36 , 86*/ 24, /* 12: 40x40 ,114*/
|
||||
26, /* 13: 44x44 ,144*/ 27, /* 14: 48x48 ,174*/ 28, /* 15: 52x52 ,204*/ 29, /* 16: 64x64 ,280*/
|
||||
30, /* 17: 72x72 ,368*/ 31, /* 18: 80x80 ,456*/ 32, /* 19: 88x88 ,576*/ 33, /* 20: 96x96 ,696*/
|
||||
34, /* 21:104x104,816*/ 35, /* 22:120x120,1050*/36, /* 23:132x132,1304*/37, /* 24:144x144,1558*/
|
||||
16, /* 9: 26x26 , 44*/ 18, /* 10: 32x32 , 62*/ 22, /* 11: 36x36 , 86*/ 25, /* 12: 40x40 ,114*/
|
||||
27, /* 13: 44x44 ,144*/ 28, /* 14: 48x48 ,174*/ 29, /* 15: 52x52 ,204*/ 30, /* 16: 64x64 ,280*/
|
||||
31, /* 17: 72x72 ,368*/ 32, /* 18: 80x80 ,456*/ 33, /* 19: 88x88 ,576*/ 34, /* 20: 96x96 ,696*/
|
||||
35, /* 21:104x104,816*/ 36, /* 22:120x120,1050*/37, /* 23:132x132,1304*/38, /* 24:144x144,1558*/
|
||||
2, /* 25: 8x18 , 5*/ 4, /* 26: 8x32 , 10*/ 6, /* 27: 12x26 , 16*/ 10, /* 28: 12x36 , 22*/
|
||||
13, /* 29: 16x36 , 32*/ 17, /* 30: 16x48 , 49*/ 8, /* 31: 8x48 , 18*/ 11, /* 32: 8x64 , 24*/
|
||||
15, /* 33: 12x64 , 43*/ 19, /* 34: 16x64 , 62*/ 20, /* 37: 24x48 , 80*/ 23, /* 38: 24x64 ,108*/
|
||||
22, /* 41: 26x48 , 90*/ 25, /* 42: 26x64 ,118*/
|
||||
15, /* 33: 12x64 , 43*/ 19, /* 34: 16x64 , 62*/ 21, /* 35: 24x48 , 80*/ 24, /* 36: 24x64 ,108*/
|
||||
20, /* 37: 26x40 , 70*/ 23, /* 38: 26x48 , 90*/ 26, /* 39: 26x64 ,118*/
|
||||
0
|
||||
};
|
||||
|
||||
// Number of DM Sizes
|
||||
#define DMSIZESCOUNT 38
|
||||
#define DMSIZESCOUNT 39
|
||||
// Number of 144x144 for special interlace
|
||||
#define INTSYMBOL144 37
|
||||
#define INTSYMBOL144 38
|
||||
|
||||
// Is the current code a DMRE code ?
|
||||
// This is the case, if intsymbol index >= 30
|
||||
@ -121,11 +121,11 @@ static const char isDMRE[] = {
|
||||
/* 8*/ 1, /* 8x48 ,18 */ 0, /* 20x20 ,22 */ 0, /* 12x36 ,22 */ 1, /* 8x64 ,24 */
|
||||
/*12*/ 0, /* 22x22 ,30 */ 0, /* 16x36 ,32 */ 0, /* 24x24 ,36 */ 1, /* 12x64 ,43 */
|
||||
/*16*/ 0, /* 26x26 ,44 */ 0, /* 16x48 ,49 */ 0, /* 32x32 ,62 */ 1, /* 16x64 ,62 */
|
||||
/*20*/ 1, /* 24x48 ,80 */ 0, /* 36x36 ,86 */ 1, /* 26x48 ,90 */ 1, /* 24x64 ,108*/
|
||||
/*24*/ 0, /* 40x40 ,114*/ 1, /* 26x64 ,118*/ 0, /* 44x44 ,144*/ 0, /* 48x48,174 */
|
||||
/*28*/ 0, /* 52x52,204 */ 0, /* 64x64,280 */ 0, /* 72x72,368 */ 0, /* 80x80,456 */
|
||||
/*32*/ 0, /* 88x88,576 */ 0, /* 96x96,696 */ 0, /*104x104,816*/ 0, /*120x120,1050*/
|
||||
/*36*/ 0, /*132x132,1304*/0 /*144x144,1558*/
|
||||
/*20*/ 1, /* 26x40 , 70*/ 1, /* 24x48 ,80 */ 0, /* 36x36 ,86 */ 1, /* 26x48 ,90 */
|
||||
/*24*/ 1, /* 24x64 ,108*/ 0, /* 40x40 ,114*/ 1, /* 26x64 ,118*/ 0, /* 44x44 ,144*/
|
||||
/*28*/ 0, /* 48x48,174 */ 0, /* 52x52,204 */ 0, /* 64x64,280 */ 0, /* 72x72,368 */
|
||||
/*32*/ 0, /* 80x80,456 */ 0, /* 88x88,576 */ 0, /* 96x96,696 */ 0, /*104x104,816*/
|
||||
/*36*/ 0, /*120x120,1050*/ 0, /*132x132,1304*/0 /*144x144,1558*/
|
||||
};
|
||||
|
||||
// Horizontal matrix size
|
||||
@ -136,11 +136,11 @@ static const unsigned short int matrixH[] = {
|
||||
/* 8*/ 8, /* 8x48 ,18 */ 20, /* 20x20 ,22 */ 12, /* 12x36 ,22 */ 8, /* 8x64 ,24 */
|
||||
/*12*/ 22, /* 22x22 ,30 */ 16, /* 16x36 ,32 */ 24, /* 24x24 ,36 */ 12, /* 12x64 ,43 */
|
||||
/*16*/ 26, /* 26x26 ,44 */ 16, /* 16x48 ,49 */ 32, /* 32x32 ,62 */ 16, /* 16x64 ,62 */
|
||||
/*20*/ 24, /* 24x48 ,80 */ 36, /* 36x36 ,86 */ 26, /* 26x48 ,90 */ 24, /* 24x64 ,108*/
|
||||
/*24*/ 40, /* 40x40 ,114*/ 26, /* 26x64 ,118*/ 44, /* 44x44 ,144*/ 48, /* 48x48,174 */
|
||||
/*28*/ 52, /* 52x52,204 */ 64, /* 64x64,280 */ 72, /* 72x72,368 */ 80, /* 80x80,456 */
|
||||
/*32*/ 88, /* 88x88,576 */ 96, /* 96x96,696 */ 104, /*104x104,816*/ 120, /*120x120,1050*/
|
||||
/*36*/ 132,/*132x132,1304*/144 /*144x144,1558*/
|
||||
/*20*/ 26, /* 26x40 , 70*/ 24, /* 24x48 ,80 */ 36, /* 36x36 ,86 */ 26, /* 26x48 ,90 */
|
||||
/*24*/ 24, /* 24x64 ,108*/ 40, /* 40x40 ,114*/ 26, /* 26x64 ,118*/ 44, /* 44x44 ,144*/
|
||||
/*28*/ 48, /* 48x48,174 */ 52, /* 52x52,204 */ 64, /* 64x64,280 */ 72, /* 72x72,368 */
|
||||
/*32*/ 80, /* 80x80,456 */ 88, /* 88x88,576 */ 96, /* 96x96,696 */ 104, /*104x104,816*/
|
||||
/*36*/ 120, /*120x120,1050*/ 132,/*132x132,1304*/144 /*144x144,1558*/
|
||||
};
|
||||
|
||||
// Vertical matrix sizes
|
||||
@ -151,11 +151,11 @@ static const unsigned short int matrixW[] = {
|
||||
/* 8*/ 48, /* 8x48 */ 20, /* 20x20 */ 36, /* 12x36 */ 64, /* 8x64 */
|
||||
/*12*/ 22, /* 22x22 */ 36, /* 16x36 */ 24, /* 24x24 */ 64, /* 12x64 */
|
||||
/*16*/ 26, /* 26x26 */ 48, /* 16x48 */ 32, /* 32x32 */ 64, /* 16x64 */
|
||||
/*20*/ 48, /* 24x48 */ 36, /* 36x36 */ 48, /* 26x48 */ 64, /* 24x64 */
|
||||
/*24*/ 40, /* 40x40 */ 64, /* 26x64 */ 44, /* 44x44 */ 48, /* 48x48 */
|
||||
/*28*/ 52, /* 52x52 */ 64, /* 64x64 */ 72, /* 72x72 */ 80, /* 80x80 */
|
||||
/*32*/ 88, /* 88x88 */ 96, /* 96x96 */ 104,/*104x104*/ 120,/*120x120*/
|
||||
/*36*/132, /*132x132*/144 /*144x144*/
|
||||
/*20*/ 40, /* 26x40 */ 48, /* 24x48 */ 36, /* 36x36 */ 48, /* 26x48 */
|
||||
/*24*/ 64, /* 24x64 */ 40, /* 40x40 */ 64, /* 26x64 */ 44, /* 44x44 */
|
||||
/*28*/ 48, /* 48x48 */ 52, /* 52x52 */ 64, /* 64x64 */ 72, /* 72x72 */
|
||||
/*32*/ 80, /* 80x80 */ 88, /* 88x88 */ 96, /* 96x96 */ 104,/*104x104*/
|
||||
/*36*/ 120,/*120x120*/132, /*132x132*/144 /*144x144*/
|
||||
};
|
||||
|
||||
// Horizontal submodule size (including subfinder)
|
||||
@ -166,11 +166,11 @@ static const unsigned short int matrixFH[] = {
|
||||
/* 8*/ 8, /* 8x48 */ 20, /* 20x20 */ 12, /* 12x36 */ 8, /* 8x64 */
|
||||
/*12*/ 22, /* 22x22 */ 16, /* 16x36 */ 24, /* 24x24 */ 12, /* 12x64 */
|
||||
/*16*/ 26, /* 26x26 */ 16, /* 16x48 */ 16, /* 32x32 */ 16, /* 16x64 */
|
||||
/*20*/ 24, /* 24x48 */ 18, /* 36x36 */ 26, /* 26x48 */ 24, /* 24x64 */
|
||||
/*24*/ 20, /* 40x40 */ 26, /* 26x64 */ 22, /* 44x44 */ 24, /* 48x48 */
|
||||
/*28*/ 26, /* 52x52 */ 16, /* 64x64 */ 18, /* 72x72 */ 20, /* 80x80 */
|
||||
/*32*/ 22, /* 88x88 */ 24, /* 96x96 */ 26, /*104x104*/ 20, /*120x120*/
|
||||
/*36*/ 22, /*132x132*/ 24 /*144x144*/
|
||||
/*20*/ 26, /* 26x40 */ 24, /* 24x48 */ 18, /* 36x36 */ 26, /* 26x48 */
|
||||
/*24*/ 24, /* 24x64 */ 20, /* 40x40 */ 26, /* 26x64 */ 22, /* 44x44 */
|
||||
/*28*/ 24, /* 48x48 */ 26, /* 52x52 */ 16, /* 64x64 */ 18, /* 72x72 */
|
||||
/*32*/ 20, /* 80x80 */ 22, /* 88x88 */ 24, /* 96x96 */ 26, /*104x104*/
|
||||
/*36*/ 20, /*120x120*/ 22, /*132x132*/ 24 /*144x144*/
|
||||
};
|
||||
|
||||
// Vertical submodule size (including subfinder)
|
||||
@ -181,11 +181,11 @@ static const unsigned short int matrixFW[] = {
|
||||
/* 8*/ 24, /* 8x48 */ 20, /* 20x20 */ 18, /* 12x36 */ 16, /* 8x64 */
|
||||
/*12*/ 22, /* 22x22 */ 18, /* 16x36 */ 24, /* 24x24 */ 16, /* 12x64 */
|
||||
/*16*/ 26, /* 26x26 */ 24, /* 16x48 */ 16, /* 32x32 */ 16, /* 16x64 */
|
||||
/*20*/ 24, /* 24x48 */ 18, /* 36x36 */ 24, /* 26x48 */ 16, /* 24x64 */
|
||||
/*24*/ 20, /* 40x40 */ 16, /* 26x64 */ 22, /* 44x44 */ 24, /* 48x48 */
|
||||
/*28*/ 26, /* 52x52 */ 16, /* 64x64 */ 18, /* 72x72 */ 20, /* 80x80 */
|
||||
/*32*/ 22, /* 88x88 */ 24, /* 96x96 */ 26, /*104x104*/ 20, /*120x120*/
|
||||
/*36*/ 22, /*132x132*/ 24 /*144x144*/
|
||||
/*20*/ 20, /* 26x40 */ 24, /* 24x48 */ 18, /* 36x36 */ 24, /* 26x48 */
|
||||
/*24*/ 16, /* 24x64 */ 20, /* 40x40 */ 16, /* 26x64 */ 22, /* 44x44 */
|
||||
/*28*/ 24, /* 48x48 */ 26, /* 52x52 */ 16, /* 64x64 */ 18, /* 72x72 */
|
||||
/*32*/ 20, /* 80x80 */ 22, /* 88x88 */ 24, /* 96x96 */ 26, /*104x104*/
|
||||
/*36*/ 20, /*120x120*/ 22, /*132x132*/ 24 /*144x144*/
|
||||
};
|
||||
|
||||
// Total Data Codewords
|
||||
@ -196,11 +196,11 @@ static const unsigned short int matrixbytes[] = {
|
||||
/* 8*/ 18, /* 8x48 */ 22, /* 20x20 */ 22, /* 12x36 */ 24, /* 8x64 */
|
||||
/*12*/ 30, /* 22x22 */ 32, /* 16x36 */ 36, /* 24x24 */ 43, /* 12x64 */
|
||||
/*16*/ 44, /* 26x26 */ 49, /* 16x48 */ 62, /* 32x32 */ 62, /* 16x64 */
|
||||
/*20*/ 80, /* 24x48 */ 86, /* 36x36 */ 90, /* 26x48 */ 108, /* 24x64 */
|
||||
/*24*/ 114, /* 40x40 */ 118, /* 26x64 */ 144, /* 44x44 */ 174, /* 48x48 */
|
||||
/*28*/ 204, /* 52x52 */ 280, /* 64x64 */ 368, /* 72x72 */ 456, /* 80x80 */
|
||||
/*32*/ 576, /* 88x88 */ 696, /* 96x96 */ 816, /*104x104*/1050, /*120x120*/
|
||||
/*36*/1304, /*132x132*/1558 /*144x144*/
|
||||
/*20*/ 70, /* 26x40 */ 80, /* 24x48 */ 86, /* 36x36 */ 90, /* 26x48 */
|
||||
/*24*/ 108, /* 24x64 */ 114, /* 40x40 */ 118, /* 26x64 */ 144, /* 44x44 */
|
||||
/*28*/ 174, /* 48x48 */ 204, /* 52x52 */ 280, /* 64x64 */ 368, /* 72x72 */
|
||||
/*32*/ 456, /* 80x80 */ 576, /* 88x88 */ 696, /* 96x96 */ 816, /*104x104*/
|
||||
/*36*/1050, /*120x120*/1304, /*132x132*/1558 /*144x144*/
|
||||
};
|
||||
|
||||
// Data Codewords per RS-Block
|
||||
@ -211,11 +211,11 @@ static const unsigned short int matrixdatablock[] = {
|
||||
/* 8*/ 18, /* 8x48 */ 22, /* 20x20 */ 22, /* 12x36 */ 24, /* 8x64 */
|
||||
/*12*/ 30, /* 22x22 */ 32, /* 16x36 */ 36, /* 24x24 */ 43, /* 12x64 */
|
||||
/*16*/ 44, /* 26x26 */ 49, /* 16x48 */ 62, /* 32x32 */ 62, /* 16x64 */
|
||||
/*20*/ 80, /* 24x48 */ 86, /* 36x36 */ 90, /* 26x48 */ 108, /* 24x64 */
|
||||
/*24*/ 114, /* 40x40 */ 118, /* 26x64 */ 144, /* 44x44 */ 174, /* 48x48 */
|
||||
/*28*/ 102, /* 52x52 */ 140, /* 64x64 */ 92, /* 72x72 */ 114, /* 80x80 */
|
||||
/*32*/ 144, /* 88x88 */ 174, /* 96x96 */ 136, /*104x104*/ 175, /*120x120*/
|
||||
/*36*/ 163, /*132x132*/ 156 /* 144x144*/
|
||||
/*20*/ 70, /* 26x40 */ 80, /* 24x48 */ 86, /* 36x36 */ 90, /* 26x48 */
|
||||
/*24*/ 108, /* 24x64 */ 114, /* 40x40 */ 118, /* 26x64 */ 144, /* 44x44 */
|
||||
/*28*/ 174, /* 48x48 */ 102, /* 52x52 */ 140, /* 64x64 */ 92, /* 72x72 */
|
||||
/*32*/ 114, /* 80x80 */ 144, /* 88x88 */ 174, /* 96x96 */ 136, /*104x104*/
|
||||
/*36*/ 175, /*120x120*/ 163, /*132x132*/ 156 /* 144x144*/
|
||||
};
|
||||
|
||||
// ECC Codewords per RS-Block
|
||||
@ -226,11 +226,11 @@ static const unsigned short int matrixrsblock[] = {
|
||||
/* 8*/ 15, /* 8x48 */ 18, /* 20x20 */ 18, /* 12x36 */ 18, /* 8x64 */
|
||||
/*12*/ 20, /* 22x22 */ 24, /* 16x36 */ 24, /* 24x24 */ 27, /* 12x64 */
|
||||
/*16*/ 28, /* 26x26 */ 28, /* 16x48 */ 36, /* 32x32 */ 36, /* 16x64 */
|
||||
/*20*/ 41, /* 24x48 */ 42, /* 36x36 */ 42, /* 26x48 */ 46, /* 24x64 */
|
||||
/*24*/ 48, /* 40x40 */ 50, /* 26x64 */ 56, /* 44x44 */ 68, /* 48x48 */
|
||||
/*28*/ 42, /* 52x52 */ 56, /* 64x64 */ 36, /* 72x72 */ 48, /* 80x80 */
|
||||
/*32*/ 56, /* 88x88 */ 68, /* 96x96 */ 56, /*104x104*/ 68, /*120x120*/
|
||||
/*36*/ 62, /*132x132*/ 62 /*144x144*/
|
||||
/*20*/ 38, /* 26x40 */ 41, /* 24x48 */ 42, /* 36x36 */ 42, /* 26x48 */
|
||||
/*24*/ 46, /* 24x64 */ 48, /* 40x40 */ 50, /* 26x64 */ 56, /* 44x44 */
|
||||
/*28*/ 68, /* 48x48 */ 42, /* 52x52 */ 56, /* 64x64 */ 36, /* 72x72 */
|
||||
/*32*/ 48, /* 80x80 */ 56, /* 88x88 */ 68, /* 96x96 */ 56, /*104x104*/
|
||||
/*36*/ 68, /*120x120*/ 62, /*132x132*/ 62 /*144x144*/
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -1799,8 +1799,9 @@ Input | Symbol Size
|
||||
34 | 16 x 64
|
||||
35 | 24 x 48
|
||||
36 | 24 x 64
|
||||
37 | 26 x 48
|
||||
38 | 26 x 64
|
||||
37 | 26 x 40
|
||||
38 | 26 x 48
|
||||
39 | 26 x 64
|
||||
---------------------
|
||||
|
||||
DMRE symbol sizes may be activated in automatic size mode using the option
|
||||
|
||||
@ -237,6 +237,11 @@
|
||||
<string>24 x 64 (DMRE)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 40 (DMRE)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 48 (DMRE)</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user