Simplify PDF processing

This commit is contained in:
hooper114 2009-09-19 08:16:21 +00:00
parent f215d9cc84
commit 318d2d4eed
2 changed files with 1316 additions and 1165 deletions

234
backend/ms_stdint.h Normal file
View File

@ -0,0 +1,234 @@
// ISO C9x compliant stdint.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006-2008 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////
/* @(#) $Id: ms_stdint.h,v 1.1 2009/09/19 08:16:21 hooper114 Exp $ */
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
#ifndef _MSC_STDINT_H_ // [
#define _MSC_STDINT_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include <limits.h>
// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
// or compiler give many errors like this:
// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
#if (_MSC_VER < 1300) && defined(__cplusplus)
extern "C++" {
#endif
# include <wchar.h>
#if (_MSC_VER < 1300) && defined(__cplusplus)
}
#endif
// Define _W64 macros to mark types changing their size, like intptr_t.
#ifndef _W64
# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
# define _W64 __w64
# else
# define _W64
# endif
#endif
// 7.18.1 Integer types
// 7.18.1.1 Exact-width integer types
typedef __int8 int8_t;
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
// 7.18.1.2 Minimum-width integer types
typedef int8_t int_least8_t;
typedef int16_t int_least16_t;
typedef int32_t int_least32_t;
typedef int64_t int_least64_t;
typedef uint8_t uint_least8_t;
typedef uint16_t uint_least16_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
// 7.18.1.3 Fastest minimum-width integer types
typedef int8_t int_fast8_t;
typedef int16_t int_fast16_t;
typedef int32_t int_fast32_t;
typedef int64_t int_fast64_t;
typedef uint8_t uint_fast8_t;
typedef uint16_t uint_fast16_t;
typedef uint32_t uint_fast32_t;
typedef uint64_t uint_fast64_t;
// 7.18.1.4 Integer types capable of holding object pointers
#ifdef _WIN64 // [
typedef __int64 intptr_t;
typedef unsigned __int64 uintptr_t;
#else // _WIN64 ][
typedef _W64 int intptr_t;
typedef _W64 unsigned int uintptr_t;
#endif // _WIN64 ]
// 7.18.1.5 Greatest-width integer types
typedef int64_t intmax_t;
typedef uint64_t uintmax_t;
// 7.18.2 Limits of specified-width integer types
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
// 7.18.2.1 Limits of exact-width integer types
#define INT8_MIN ((int8_t)_I8_MIN)
#define INT8_MAX _I8_MAX
#define INT16_MIN ((int16_t)_I16_MIN)
#define INT16_MAX _I16_MAX
#define INT32_MIN ((int32_t)_I32_MIN)
#define INT32_MAX _I32_MAX
#define INT64_MIN ((int64_t)_I64_MIN)
#define INT64_MAX _I64_MAX
#define UINT8_MAX _UI8_MAX
#define UINT16_MAX _UI16_MAX
#define UINT32_MAX _UI32_MAX
#define UINT64_MAX _UI64_MAX
// 7.18.2.2 Limits of minimum-width integer types
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST8_MAX INT8_MAX
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST16_MAX INT16_MAX
#define INT_LEAST32_MIN INT32_MIN
#define INT_LEAST32_MAX INT32_MAX
#define INT_LEAST64_MIN INT64_MIN
#define INT_LEAST64_MAX INT64_MAX
#define UINT_LEAST8_MAX UINT8_MAX
#define UINT_LEAST16_MAX UINT16_MAX
#define UINT_LEAST32_MAX UINT32_MAX
#define UINT_LEAST64_MAX UINT64_MAX
// 7.18.2.3 Limits of fastest minimum-width integer types
#define INT_FAST8_MIN INT8_MIN
#define INT_FAST8_MAX INT8_MAX
#define INT_FAST16_MIN INT16_MIN
#define INT_FAST16_MAX INT16_MAX
#define INT_FAST32_MIN INT32_MIN
#define INT_FAST32_MAX INT32_MAX
#define INT_FAST64_MIN INT64_MIN
#define INT_FAST64_MAX INT64_MAX
#define UINT_FAST8_MAX UINT8_MAX
#define UINT_FAST16_MAX UINT16_MAX
#define UINT_FAST32_MAX UINT32_MAX
#define UINT_FAST64_MAX UINT64_MAX
// 7.18.2.4 Limits of integer types capable of holding object pointers
#ifdef _WIN64 // [
# define INTPTR_MIN INT64_MIN
# define INTPTR_MAX INT64_MAX
# define UINTPTR_MAX UINT64_MAX
#else // _WIN64 ][
# define INTPTR_MIN INT32_MIN
# define INTPTR_MAX INT32_MAX
# define UINTPTR_MAX UINT32_MAX
#endif // _WIN64 ]
// 7.18.2.5 Limits of greatest-width integer types
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
// 7.18.3 Limits of other integer types
#ifdef _WIN64 // [
# define PTRDIFF_MIN _I64_MIN
# define PTRDIFF_MAX _I64_MAX
#else // _WIN64 ][
# define PTRDIFF_MIN _I32_MIN
# define PTRDIFF_MAX _I32_MAX
#endif // _WIN64 ]
#define SIG_ATOMIC_MIN INT_MIN
#define SIG_ATOMIC_MAX INT_MAX
#ifndef SIZE_MAX // [
# ifdef _WIN64 // [
# define SIZE_MAX _UI64_MAX
# else // _WIN64 ][
# define SIZE_MAX _UI32_MAX
# endif // _WIN64 ]
#endif // SIZE_MAX ]
// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
#ifndef WCHAR_MIN // [
# define WCHAR_MIN 0
#endif // WCHAR_MIN ]
#ifndef WCHAR_MAX // [
# define WCHAR_MAX _UI16_MAX
#endif // WCHAR_MAX ]
#define WINT_MIN 0
#define WINT_MAX _UI16_MAX
#endif // __STDC_LIMIT_MACROS ]
// 7.18.4 Limits of other integer types
#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
// 7.18.4.1 Macros for minimum-width integer constants
#define INT8_C(val) val##i8
#define INT16_C(val) val##i16
#define INT32_C(val) val##i32
#define INT64_C(val) val##i64
#define UINT8_C(val) val##ui8
#define UINT16_C(val) val##ui16
#define UINT32_C(val) val##ui32
#define UINT64_C(val) val##ui64
// 7.18.4.2 Macros for greatest-width integer constants
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
#endif // __STDC_CONSTANT_MACROS ]
#endif // _MSC_STDINT_H_ ]

View File

@ -30,10 +30,17 @@
symbol->option_2 is used to adjust the width of the resulting symbol (i.e. the symbol->option_2 is used to adjust the width of the resulting symbol (i.e. the
number of codeword columns not including row start and end data) */ number of codeword columns not including row start and end data) */
/* @(#) $Id: pdf417.c,v 1.12 2009/09/19 08:16:21 hooper114 Exp $ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#ifndef _MSC_VER
#include <stdint.h>
#else
#include "ms_stdint.h"
#endif
#include "pdf417.h" #include "pdf417.h"
#include "common.h" #include "common.h"
#include "large.h" #include "large.h"
@ -310,144 +317,61 @@ void textprocess(int *chainemc, int *mclength, char chaine[], int start, int len
/* 671 */ /* 671 */
void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length, int block, char nullchar) void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length, int block, char nullchar)
{ {
int debug = 0;
int i, j, k, l, longueur; int len = 0;
short int accum[112], x_reg[112], y_reg[112]; unsigned int chunkLen = 0;
int debug = 0; uint64_t mantisa = 0ULL;
uint64_t total = 0ULL;
if(debug) printf("\nEntering byte mode at position %d\n", start); if(debug) printf("\nEntering byte mode at position %d\n", start);
if(length == 1) { if(length == 1) {
chainemc[*(mclength)] = 913; chainemc[(*mclength)++] = 913;
chainemc[*(mclength) + 1] = chaine[start]; chainemc[(*mclength)++] = chaine[start];
if(debug) { printf("913 %d\n", chainemc[*(mclength) + 1]); } if(debug) { printf("913 %d\n", chainemc[*mclength - 1]); }
*(mclength) = *(mclength) + 2;
} else { } else {
/* select the switch for multiple of 6 bytes */ /* select the switch for multiple of 6 bytes */
if (length % 6 == 0) { if (length % 6 == 0) {
chainemc[*(mclength)] = 924; chainemc[(*mclength)++] = 924;
if(debug) printf("924 "); if(debug) printf("924 ");
*(mclength) = *(mclength) + 1;
} else { } else {
chainemc[*(mclength)] = 901; chainemc[(*mclength)++] = 901;
if(debug) printf("901 "); if(debug) printf("901 ");
*(mclength) = *(mclength) + 1;
} }
j = 0; while (len < length)
while(j < length) { {
longueur = length - j; chunkLen = length - len;
if (6 <= chunkLen) /* Take groups of 6 */
{
chunkLen = 6;
len += chunkLen;
total = 0ULL;
if (longueur >= 6) { /* Take groups of 6 */ while (chunkLen--)
{
int cw[5]; mantisa = chaine[start++];
total |= mantisa << (uint64_t)(chunkLen * 8ULL);
for(i = 0; i < 112; i++) {
accum[i] = 0;
x_reg[i] = 0;
y_reg[i] = 0;
} }
/* Load 6 bytes of data into the Y register */ chunkLen = 5;
longueur = 6;
for(k = 0; k < longueur; k++) {
for(i = 0; i < 8; i++) {
shiftup(y_reg);
}
if(chaine[start + j + k] == nullchar) { while (chunkLen--)
y_reg[7] = 0; {
y_reg[6] = 0; chainemc[*mclength + chunkLen] = (int)(total % 900ULL);
y_reg[5] = 0; total /= 900ULL;
y_reg[4] = 0;
y_reg[3] = 0;
y_reg[2] = 0;
y_reg[1] = 0;
y_reg[0] = 0;
} else {
if((chaine[start + j + k] & 0x80) != 0) { y_reg[7] = 1; }
if((chaine[start + j + k] & 0x40) != 0) { y_reg[6] = 1; }
if((chaine[start + j + k] & 0x20) != 0) { y_reg[5] = 1; }
if((chaine[start + j + k] & 0x10) != 0) { y_reg[4] = 1; }
if((chaine[start + j + k] & 0x08) != 0) { y_reg[3] = 1; }
if((chaine[start + j + k] & 0x04) != 0) { y_reg[2] = 1; }
if((chaine[start + j + k] & 0x02) != 0) { y_reg[1] = 1; }
if((chaine[start + j + k] & 0x01) != 0) { y_reg[0] = 1; }
}
} }
*mclength += 5;
}
else /* If it remain a group of less than 6 bytes */
{
len += chunkLen;
for(l = 0; l < 4; l++) { while (chunkLen--)
{
for(i = 0; i < 112; i++) { chainemc[(*mclength)++] = chaine[start++];
accum[i] = y_reg[i];
y_reg[i] = 0;
x_reg[i] = 0;
}
x_reg[101] = 1;
x_reg[100] = 1;
x_reg[99] = 1;
x_reg[94] = 1;
for(i = 92; i >= 0; i--) {
y_reg[i] = islarger(accum, x_reg);
if(y_reg[i] == 1) {
binary_subtract(accum, x_reg);
}
shiftdown(x_reg);
}
cw[l] = (accum[9] * 512) + (accum[8] * 256) +
(accum[7] * 128) + (accum[6] * 64) + (accum[5] * 32) +
(accum[4] * 16) + (accum[3] * 8) + (accum[2] * 4) +
(accum[1] * 2) + accum[0];
}
cw[4] = (y_reg[9] * 512) + (y_reg[8] * 256) +
(y_reg[7] * 128) + (y_reg[6] * 64) + (y_reg[5] * 32) +
(y_reg[4] * 16) + (y_reg[3] * 8) + (y_reg[2] * 4) +
(y_reg[1] * 2) + y_reg[0];
for(i = 0; i < 4; i++) {
if(cw[i] == 900) {
cw[i] = 0;
cw[i + 1]++;
}
}
for(i = 0; i < 5; i++) {
chainemc[*(mclength)] = cw[4 - i];
*(mclength) = *(mclength) + 1;
}
if(debug) {
for(k = 0; k < longueur; k++) {
printf("%d ", chaine[start + j + k]);
}
printf(">> ");
for(i = 0; i < 5; i++) {
printf("%d ", cw[4 - i]);
}
printf("\n");
}
} else {
/* If there remains a group of less than 6 bytes */
for(k = 0; k < longueur; k++) {
chainemc[*(mclength)] = chaine[start + j + k];
*(mclength) = *(mclength) + 1;
}
if(debug) {
for(k = 0; k < longueur; k++) {
printf("%d ", chaine[start + j + k]);
}
printf(">> ");
for(k = 0; k < longueur; k++) {
printf("%d ", chaine[start + j + k]);
}
printf("\n");
} }
} }
j += longueur;
} }
} }
} }
@ -677,22 +601,15 @@ int pdf417(struct zint_symbol *symbol, unsigned char chaine[])
total = 0; total = 0;
for(i = 0; i < longueur; i++) { for(i = 0; i < longueur; i++) {
total = (chainemc[i] + mccorrection[k - 1]) % 929; total = (chainemc[i] + mccorrection[k - 1]) % 929;
for(j = k - 1; j >= 0; j--) { for(j = k - 1; j > 0; j--) {
if(j == 0) { mccorrection[j] = (mccorrection[j - 1] + 929 - (total * coefrs[offset + j]) % 929) % 929;
mccorrection[j] = (929 - (total * coefrs[offset + j]) % 929) % 929;
} else {
mccorrection[j] = (mccorrection[j - 1] + 929 - (total * coefrs[offset + j]) % 929) % 929;
}
} }
mccorrection[0] = (929 - (total * coefrs[offset + j]) % 929) % 929;
} }
for(j = 0; j < k; j++) {
if(mccorrection[j] != 0) { mccorrection[j] = 929 - mccorrection[j]; }
}
/* we add these codes to the string */ /* we add these codes to the string */
for(i = k - 1; i >= 0; i--) { for(i = k - 1; i >= 0; i--) {
chainemc[mclength] = mccorrection[i]; chainemc[mclength++] = mccorrection[i] ? 929 - mccorrection[i] : 0;
mclength++;
} }
/* 818 - The CW string is finished */ /* 818 - The CW string is finished */