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

Refactor

Browse Source
This commit is contained in:
Rodrigo Torres
2017-09-10 12:03:09 -03:00
committed by Robin Stuart
parent 1882d76b70
commit 4963a772db
45 changed files with 334 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
backend/pdf417.c
View File

@ -101,16 +101,15 @@ int quelmode(char codeascii) {
/* 844 */
void regroupe(int *indexliste) {
int i, j;
/* bring together same type blocks */
if (*(indexliste) > 1) {
i = 1;
int i = 1;
while (i < *(indexliste)) {
if (liste[1][i - 1] == liste[1][i]) {
/* bring together */
liste[0][i - 1] = liste[0][i - 1] + liste[0][i];
j = i + 1;
int j = i + 1;
/* decreace the list */
while (j < *(indexliste)) {
@ -224,11 +223,9 @@ void pdfsmooth(int *indexliste) {
}
/* 547 */
void textprocess(int *chainemc, int *mclength, char chaine[], int start, int length, int block) {
void textprocess(int *chainemc, int *mclength, char chaine[], int start, int length) {
int j, indexlistet, curtable, listet[2][5000], chainet[5000], wnet;
char codeascii;
codeascii = 0;
wnet = 0;
for (j = 0; j < 1000; j++) {
@ -236,7 +233,7 @@ void textprocess(int *chainemc, int *mclength, char chaine[], int start, int len
}
/* listet will contain the table numbers and the value of each characters */
for (indexlistet = 0; indexlistet < length; indexlistet++) {
codeascii = chaine[start + indexlistet];
char codeascii = chaine[start + indexlistet];
switch (codeascii) {
case '\t': listet[0][indexlistet] = 12;
listet[1][indexlistet] = 12;
@ -417,17 +414,8 @@ void textprocess(int *chainemc, int *mclength, char chaine[], int start, int len
}
/* 671 */
void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length, int block) {
void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length) {
int debug = 0;
int len = 0;
unsigned int chunkLen = 0;
#if defined(_MSC_VER) && _MSC_VER == 1200
uint64_t mantisa = 0;
uint64_t total = 0;
#else
uint64_t mantisa = 0ULL;
uint64_t total = 0ULL;
#endif
if (debug) printf("\nEntering byte mode at position %d\n", start);
@ -447,19 +435,21 @@ void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start
if (debug) printf("901 ");
}
int len = 0;
while (len < length) {
chunkLen = length - len;
unsigned int chunkLen = length - len;
if (6 <= chunkLen) /* Take groups of 6 */ {
chunkLen = 6;
len += chunkLen;
#if defined(_MSC_VER) && _MSC_VER == 1200
total = 0;
uint64_t total = 0;
#else
total = 0ULL;
uint64_t total = 0ULL;
#endif
while (chunkLen--) {
mantisa = chaine[start++];
uint64_t mantisa = chaine[start++];
#if defined(_MSC_VER) && _MSC_VER == 1200
total |= mantisa << (uint64_t) (chunkLen * 8);
#else
@ -490,8 +480,8 @@ void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start
}
/* 712 */
void numbprocess(int *chainemc, int *mclength, char chaine[], int start, int length, int block) {
int j, loop, longueur, dummy[100], dumlength, diviseur, nombre;
void numbprocess(int *chainemc, int *mclength, char chaine[], int start, int length) {
int j, loop, dummy[100], diviseur, nombre;
char chainemod[50], chainemult[100], temp;
strcpy(chainemod, "");
@ -504,9 +494,9 @@ void numbprocess(int *chainemc, int *mclength, char chaine[], int start, int len
j = 0;
while (j < length) {
dumlength = 0;
int dumlength = 0;
strcpy(chainemod, "");
longueur = length - j;
int longueur = length - j;
if (longueur > 44) {
longueur = 44;
}
@ -645,13 +635,13 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size
for (i = 0; i < indexliste; i++) {
switch (liste[1][i]) {
case TEX: /* 547 - text mode */
textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], i);
textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]);
break;
case BYT: /* 670 - octet stream mode */
byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i], i);
byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i]);
break;
case NUM: /* 712 - numeric mode */
numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], i);
numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]);
break;
}
indexchaine = indexchaine + liste[0][i];
@ -974,13 +964,13 @@ int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_
for (i = 0; i < indexliste; i++) {
switch (liste[1][i]) {
case TEX: /* 547 - text mode */
textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], i);
textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]);
break;
case BYT: /* 670 - octet stream mode */
byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i], i);
byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i]);
break;
case NUM: /* 712 - numeric mode */
numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], i);
numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]);
break;
}
indexchaine = indexchaine + liste[0][i];