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

Comply to TCL/Tk 9 C library. See https://core.tcl-lang.org/tcl/wiki?name=Migrating+C+extensions+to+Tcl+9

Browse Source
This commit is contained in:
Harald Oehlmann 2023-12-11 18:51:21 +01:00
parent 406fa0b086
commit 03948c1d28
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backend_tcl/zint.c
View File

@ -194,14 +194,20 @@
#include "../backend/zintconfig.h" #include "../backend/zintconfig.h"
#include <string.h> #include <string.h>
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
#define USE_TCL_STUBS
#define USE_TK_STUBS
#endif
#include <tcl.h> #include <tcl.h>
#include <tk.h> #include <tk.h>
/* TCL 9 compatibility for TCL 8.6 compile */
#ifndef TCL_SIZE_MAX
#ifndef Tcl_Size
typedef int Tcl_Size;
#endif
# define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj
# define Tcl_NewSizeIntObj Tcl_NewIntObj
# define TCL_SIZE_MAX INT_MAX
# define TCL_SIZE_MODIFIER ""
#endif
#undef EXPORT #undef EXPORT
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
#define EXPORT __declspec(dllexport) #define EXPORT __declspec(dllexport)
@ -743,7 +749,7 @@ static int Encode(Tcl_Interp *interp, int objc,
struct zint_symbol *my_symbol; struct zint_symbol *my_symbol;
Tcl_DString dsInput; Tcl_DString dsInput;
char *pStr = NULL; char *pStr = NULL;
int lStr; Tcl_Size lStr;
Tcl_Encoding hZINTEncoding; Tcl_Encoding hZINTEncoding;
int rotate_angle=0; int rotate_angle=0;
int fError = 0; int fError = 0;
@ -1339,7 +1345,7 @@ static int Encode(Tcl_Interp *interp, int objc,
Tcl_Obj *poParam; Tcl_Obj *poParam;
struct zint_structapp structapp = { 0, 0, "" }; struct zint_structapp structapp = { 0, 0, "" };
char *pStructAppId = NULL; char *pStructAppId = NULL;
int lStructAppId = 0; Tcl_Size lStructAppId = 0;
if (TCL_OK != Tcl_ListObjLength(interp, if (TCL_OK != Tcl_ListObjLength(interp,
objv[optionPos+1], &lStr)) objv[optionPos+1], &lStr))
{ {
@ -1511,7 +1517,7 @@ static int Encode(Tcl_Interp *interp, int objc,
} }
if (seg_count) { if (seg_count) {
segs[0].source = (unsigned char *) pStr; segs[0].source = (unsigned char *) pStr;
segs[0].length = lStr; segs[0].length = (int)lStr;
segs[0].eci = my_symbol->eci; segs[0].eci = my_symbol->eci;
for (seg_no = 1; seg_no < seg_count; seg_no++) { for (seg_no = 1; seg_no < seg_count; seg_no++) {
if (!pSegDataObjs[seg_no]) { if (!pSegDataObjs[seg_no]) {
@ -1523,14 +1529,16 @@ static int Encode(Tcl_Interp *interp, int objc,
if (!fError) { if (!fError) {
for (seg_no = 1; seg_no < seg_count; seg_no++) { for (seg_no = 1; seg_no < seg_count; seg_no++) {
if ((my_symbol->input_mode & 0x07) == DATA_MODE) { if ((my_symbol->input_mode & 0x07) == DATA_MODE) {
Tcl_Size LengthTemp;
segs[seg_no].source = (unsigned char *) Tcl_GetByteArrayFromObj(pSegDataObjs[seg_no], segs[seg_no].source = (unsigned char *) Tcl_GetByteArrayFromObj(pSegDataObjs[seg_no],
&segs[seg_no].length); &LengthTemp);
segs[seg_no].length = (int)LengthTemp;
} else { } else {
pStr = Tcl_GetStringFromObj(pSegDataObjs[seg_no], &lStr); pStr = Tcl_GetStringFromObj(pSegDataObjs[seg_no], &lStr);
Tcl_DStringInit(& segInputs[seg_no]); Tcl_DStringInit(& segInputs[seg_no]);
Tcl_UtfToExternalDString( hZINTEncoding, pStr, lStr, &segInputs[seg_no]); Tcl_UtfToExternalDString( hZINTEncoding, pStr, lStr, &segInputs[seg_no]);
segs[seg_no].source = (unsigned char *) Tcl_DStringValue( &segInputs[seg_no] ); segs[seg_no].source = (unsigned char *) Tcl_DStringValue( &segInputs[seg_no] );
segs[seg_no].length = Tcl_DStringLength( &segInputs[seg_no] ); segs[seg_no].length = (int)Tcl_DStringLength( &segInputs[seg_no] );
} }
} }
} }
@ -1548,7 +1556,7 @@ static int Encode(Tcl_Interp *interp, int objc,
segs, seg_count, rotate_angle); segs, seg_count, rotate_angle);
} else { } else {
ErrorNumber = ZBarcode_Encode_and_Buffer(my_symbol, ErrorNumber = ZBarcode_Encode_and_Buffer(my_symbol,
(unsigned char *) pStr, lStr, rotate_angle); (unsigned char *) pStr, (int)lStr, rotate_angle);
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/* >> Show a message */ /* >> Show a message */