Fix mixed unix / windows EOL

This commit is contained in:
Boris Zentner 2017-10-23 21:34:31 +02:00 committed by Robin Stuart
parent 2372c16ba0
commit 45441a6da7
24 changed files with 278 additions and 255 deletions

View file

@ -37,19 +37,19 @@
- Added Codablock F options "-rows".
- Adopted to new image format of zint
2016-10-14 2.5.2 HaO
- Include the upstream reverted image format
2016-12-12 2.5.3 HaO
- No changes here, take 2.5.1 framework files
2017-05-12 2.6.0 HaO
- Include the upstream reverted image format
2016-12-12 2.5.3 HaO
- No changes here, take 2.5.1 framework files
2017-05-12 2.6.0 HaO
- No changes here, take 2.6 framework files
2017-08-29 2.6.1 HaO
- Framework 2.6.1 extensions
- EAN/UPC Codes with included check digit
- UPNQR Code
- Misspelled symbology: AztecRunes
2017-10-23 2.6.2 HaO
- Framework 2.6.2 bugfixes
- Allow dll unload
2017-08-29 2.6.1 HaO
- Framework 2.6.1 extensions
- EAN/UPC Codes with included check digit
- UPNQR Code
- Misspelled symbology: AztecRunes
2017-10-23 2.6.2 HaO
- Framework 2.6.2 bugfixes
- Allow dll unload
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -99,7 +99,7 @@
/*----------------------------------------------------------------------------*/
/* >>>> External Prototypes (exports) */
EXPORT int Zint_Init (Tcl_Interp *interp);
EXPORT int Zint_Unload (Tcl_Interp *Interp, int Flags);
EXPORT int Zint_Unload (Tcl_Interp *Interp, int Flags);
/*----------------------------------------------------------------------------*/
/* >>>> local prototypes */
static int Zint(ClientData unused, Tcl_Interp *interp, int objc,
@ -120,7 +120,7 @@ static char *s_code_list[] = {
"Ind2of5",
"Code39",
"Code39Extended",
"EAN",
"EAN",
"EAN+Check",
"GS1-128",
"Codabar",
@ -135,10 +135,10 @@ static char *s_code_list[] = {
"GS1DataBarLimited",
"GS1DataBarExpanded",
"Telepen",
"UPC-A",
"UPC-A",
"UPC-A+Check",
"UPC-E",
"UPC-E+Check",
"UPC-E+Check",
"Postnet",
"MSIPlessey",
"FIM",
@ -183,8 +183,8 @@ static char *s_code_list[] = {
"HIBC-PDF",
"HIBC-MicroPDF",
"HIBC-CodablockF",
"HIBCAztec",
"DotCode",
"HIBCAztec",
"DotCode",
"HanXin",
"AztecRunes",
"Code32",
@ -213,7 +213,7 @@ static int s_code_number[] = {
BARCODE_C25IND,
BARCODE_CODE39,
BARCODE_EXCODE39,
BARCODE_EANX,
BARCODE_EANX,
BARCODE_EANX_CHK,
BARCODE_EAN128,
BARCODE_CODABAR,
@ -228,10 +228,10 @@ static int s_code_number[] = {
BARCODE_RSS_LTD,
BARCODE_RSS_EXP,
BARCODE_TELEPEN,
BARCODE_UPCA,
BARCODE_UPCA,
BARCODE_UPCA_CHK,
BARCODE_UPCE,
BARCODE_UPCE_CHK,
BARCODE_UPCE_CHK,
BARCODE_POSTNET,
BARCODE_MSI_PLESSEY,
BARCODE_FIM,
@ -276,8 +276,8 @@ static int s_code_number[] = {
BARCODE_HIBC_PDF,
BARCODE_HIBC_MICPDF,
BARCODE_HIBC_BLOCKF,
BARCODE_HIBC_AZTEC,
BARCODE_DOTCODE,
BARCODE_HIBC_AZTEC,
BARCODE_DOTCODE,
BARCODE_HANXIN,
BARCODE_AZRUNE,
BARCODE_CODE32,
@ -305,8 +305,8 @@ static char help_message[] = "zint tcl(stub,obj) dll\n"
"(c) 2014-06-16 ELMICRON GmbH by Harald Oehlmann\n"
" Generate barcode in tk images and in file output\n"
"Usage:\n"
" zint encode data photo option value...\n"
" data: data to encode in the symbol\n"
" zint encode data photo option value...\n"
" data: data to encode in the symbol\n"
" photo: a tcl photo image handle ('p' after 'image create photo p')\n"
" Available options:\n"
" -bind bool: bars above/below the code, size set by -border\n"
@ -376,14 +376,14 @@ EXPORT int Zint_Init (Tcl_Interp *interp)
/*------------------------------------------------------------------------*/
return TCL_OK;
}
//------------------------------------------------------------------------------
// >>>> Unload Procedures
//------------------------------------------------------------------------------
EXPORT int Zint_Unload (Tcl_Interp *Interp, int Flags)
{
// Allow unload
return TCL_OK;
}
//------------------------------------------------------------------------------
// >>>> Unload Procedures
//------------------------------------------------------------------------------
EXPORT int Zint_Unload (Tcl_Interp *Interp, int Flags)
{
// Allow unload
return TCL_OK;
}
/*----------------------------------------------------------------------------*/
/* >>>>> Called routine */
/*----------------------------------------------------------------------------*/
@ -851,3 +851,4 @@ static int Encode(Tcl_Interp *interp, int objc,
}
return TCL_OK;
}