mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-15 07:34:35 -04:00
Code Issues Projects Releases Packages Wiki Activity

More code cleanup

Browse source 
Patch 7 of 7 from "Ismael Luceno" <ismael.luceno@gmail.com>
This commit is contained in:
Robin Stuart 2010-09-14 11:36:00 +01:00
parent fc83343133
commit 7da2041cfd
19 changed files with 198 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/code128.c
View file

@ -290,7 +290,7 @@ int code_128(struct zint_symbol *symbol, unsigned char source[], int length)
dxsmooth(&indexliste);
/* Resolve odd length LATCHC blocks */
if((list[1][0] == LATCHC) && ((list[0][0] % 2) == 1)) {
if((list[1][0] == LATCHC) && (list[0][0] & 1)) {
/* Rule 2 */
list[0][1]++;
list[0][0]--;
@ -302,7 +302,7 @@ int code_128(struct zint_symbol *symbol, unsigned char source[], int length)
}
if(indexliste > 1) {
for(i = 1; i < indexliste; i++) {
if((list[1][i] == LATCHC) && ((list[0][i] % 2) == 1)) {
if((list[1][i] == LATCHC) && (list[0][i] & 1)) {
/* Rule 3b */
list[0][i - 1]++;
list[0][i]--;
@ -688,7 +688,7 @@ int ean_128(struct zint_symbol *symbol, unsigned char source[], int length)
for(i = 0; i < read; i++) {
if(set[i] == 'C') {
if(reduced[i] == '[') {
if(c_count % 2) {
if(c_count & 1) {
if((i - c_count) != 0) {
set[i - c_count] = 'B';
} else {
@ -700,7 +700,7 @@ int ean_128(struct zint_symbol *symbol, unsigned char source[], int length)
c_count++;
}
} else {
if(c_count % 2) {
if(c_count & 1) {
if((i - c_count) != 0) {
set[i - c_count] = 'B';
} else {
@ -710,7 +710,7 @@ int ean_128(struct zint_symbol *symbol, unsigned char source[], int length)
c_count = 0;
}
}
if(c_count % 2) {
if(c_count & 1) {
if((i - c_count) != 0) {
set[i - c_count] = 'B';
} else {
@ -941,7 +941,7 @@ int nve_18(struct zint_symbol *symbol, unsigned char source[], int length)
{
total_sum += ctoi(source[i]);
if(!((i%2) == 1)) {
if(!(i & 1)) {
total_sum += 2 * ctoi(source[i]);
}
}
@ -979,12 +979,10 @@ int ean_14(struct zint_symbol *symbol, unsigned char source[], int length)
ustrcpy(ean128_equiv + 4 + zeroes, source);
count = 0;
for (i = length - 1; i >= 0; i--)
{
for (i = length - 1; i >= 0; i--) {
count += ctoi(source[i]);
if (!((i % 2) == 1))
{
if (!(i & 1)) {
count += 2 * ctoi(source[i]);
}
}