mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-09 13:41:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

backend_tcl/zint_tcl.vcsproj: put ZINT_VERSION in general defines

Browse source 
and remove from individual .c files;
  rename include dirs "C:\myprograms\tcl9.0" -> "C:\Tcl" and lib
  dirs "C:\myprograms\tcl9.0\lib" -> "C:\Tcl\lib";
  suppress some warnings
backend_tcl/zint.c: suppress some warnings
tools/update_version.php: update for "backend_tcl/zint_tcl.dsp" ->
  ".vcxproj"
manual.pmd: backend_tcl: fix "require package" -> "package require"
  and explain "C:\Tcl" may need adjusting
general: update copyright years in ".rc" files
library: remove needless `eci` zeroing in `set_symbol_defaults()`
  and make `barcode_seg_funcs` initialization consistent (147 now)
This commit is contained in:
gitlost 2025-01-29 16:54:59 +00:00
parent b377b14360
commit 53cb29dbc6
12 changed files with 103 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

19
backend_tcl/zint.c
View file

@ -1,7 +1,7 @@
/* zint_tcl.c TCL binding for zint */
/*
zint - the open source tcl binding to the zint barcode library
Copyright (C) 2014-2024 Harald Oehlmann <oehhar@users.sourceforge.net>
Copyright (C) 2014-2025 Harald Oehlmann <oehhar@users.sourceforge.net>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -178,6 +178,8 @@
- remove the zint command on dll unload
2024-12-23 GL
- Added DXFILMEDGE
2025-01-29 GL
- MSVC: suppress warning 4996 (_CRT_SECURE_NO_WARNINGS)
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -193,6 +195,11 @@
#ifdef ERROR_INVALID_DATA
#undef ERROR_INVALID_DATA
#endif
#if defined(_MSC_VER) && _MSC_VER > 1200 /* VC6 */
#pragma warning(disable: 4996) /* function or variable may be unsafe */
#endif
#endif
#include <zint.h>
@ -603,7 +610,7 @@ EXPORT BOOL WINAPI DllEntryPoint (HINSTANCE hInstance,
/* Initialisation Procedures */
DLLEXPORT int Zint_Init (Tcl_Interp *interp)
{
int * tkFlagPtr;
int *tkFlagPtr;
Tcl_CmdInfo info;
/*------------------------------------------------------------------------*/
/* If TCL_STUB is not defined, the following only does a version check */
@ -837,8 +844,8 @@ static int Encode(Tcl_Interp *interp, int objc,
int seg_count = 0;
int seg_no;
Tcl_Obj *pSegDataObjs[10] = {0};
Tcl_DString segInputs[10];
struct zint_seg segs[10];
Tcl_DString segInputs[10] = {{0}};
struct zint_seg segs[10] = {{0}};
double xdim = 0.0;
double resolution = 0.0;
/*------------------------------------------------------------------------*/
@ -1643,8 +1650,8 @@ static int Encode(Tcl_Interp *interp, int objc,
Tcl_NewStringObj("Unknown photo image", -1));
fError = 1;
} else {
Tk_PhotoImageBlock sImageBlock;
char * pImageRGBA = NULL;
Tk_PhotoImageBlock sImageBlock = {0};
char *pImageRGBA = NULL;
if (my_symbol->alphamap == NULL) {
sImageBlock.pixelPtr = (unsigned char *) my_symbol->bitmap;
sImageBlock.width = my_symbol->bitmap_width;