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

GUI: suppress shadow var warning (macOS); update year

Browse source 
zint.h: update year
man: mention no HRT for raster scale < 1
README.bsd: NetBSD 10.0 -> 10.1
README.linux: Fedora 40 -> 41
update_version.php: mention make manual.html
This commit is contained in:
gitlost 2025-02-02 09:58:41 +00:00
parent 8bd8802d44
commit 01d72607c6
10 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
README.bsd
View file

@ -1,5 +1,5 @@
% README.bsd 2025-01-18 % README.bsd 2025-02-02
% Tested on FreeBSD 14.2-RELEASE (with X11 + GNOME installed), OpenBSD 7.6 (with X11) and NetBSD 10.0 (with X11) % Tested on FreeBSD 14.2-RELEASE (with X11 + GNOME installed), OpenBSD 7.6 (with X11) and NetBSD 10.1 (with X11)
1. Prerequisites for building zint 1. Prerequisites for building zint
================================== ==================================
@ -55,6 +55,7 @@ On NetBSD:
The rest is standard CMake (allowing for absence of sudo) The rest is standard CMake (allowing for absence of sudo)
cd zint
mkdir build mkdir build
cd build cd build
cmake .. cmake ..

13
README.linux
View file

@ -1,6 +1,6 @@
% README.linux 2024-10-04 % README.linux 2025-02-02
% Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and % Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and
% Fedora Linux 40 (Workstation Edition) % Fedora Linux 41 (Workstation Edition)
1. Prerequisites for building zint 1. Prerequisites for building zint
================================== ==================================
@ -109,8 +109,15 @@ The rest is standard CMake
make make
sudo make install sudo make install
4. Run
======
4. CMake options On Fedora you may have to set LD_LIBRARY_PATH for zint ("libzint.so") and zint-qt (Qt libraries):
export LD_LIBRARY_PATH=/usr/local/lib64:<qt-version-dir>/gcc_64/lib
5. CMake options
================ ================
A number of options are available: A number of options are available:

2
backend/zint.h
View file

@ -1,7 +1,7 @@
/* zint.h - definitions for libzint */ /* zint.h - definitions for libzint */
/* /*
libzint - the open source barcode library libzint - the open source barcode library
Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com> Copyright (C) 2009-2025 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions

5
docs/manual.html
View file

@ -333,7 +333,7 @@
<h1 class="title">Zint Barcode Generator and Zint Barcode Studio User <h1 class="title">Zint Barcode Generator and Zint Barcode Studio User
Manual</h1> Manual</h1>
<p class="author">Version 2.13.0.9</p> <p class="author">Version 2.13.0.9</p>
<p class="date">January 2025</p> <p class="date">February 2025</p>
</header> </header>
<nav id="TOC" role="doc-toc"> <nav id="TOC" role="doc-toc">
<ul> <ul>
@ -9104,7 +9104,8 @@ being applied. The default scale is 1.</p>
<p>For MaxiCode, the scale is multiplied by 10 for raster output, by 40 <p>For MaxiCode, the scale is multiplied by 10 for raster output, by 40
for EMF output, and by 2 otherwise.</p> for EMF output, and by 2 otherwise.</p>
<p>Increments of 0.5 (half-integers) are recommended for non-MaxiCode <p>Increments of 0.5 (half-integers) are recommended for non-MaxiCode
raster output (BMP, GIF, PCX, PNG and TIF).</p> raster output (BMP, GIF, PCX, PNG and TIF). Human Readable Text (HRT)
for raster output will not be shown for scales less than 1.</p>
<p>See also <code>--scalexdimdp</code> below.</p> <p>See also <code>--scalexdimdp</code> below.</p>
</dd> </dd>
<dt><code>--scalexdimdp=X[,R]</code></dt> <dt><code>--scalexdimdp=X[,R]</code></dt>

2
docs/manual.pmd
View file

@ -1,6 +1,6 @@
% Zint Barcode Generator and Zint Barcode Studio User Manual % Zint Barcode Generator and Zint Barcode Studio User Manual
% Version 2.13.0.9 % Version 2.13.0.9
% January 2025 % February 2025
# 1. Introduction # 1. Introduction

7
docs/manual.txt
View file

@ -1,6 +1,6 @@
Zint Barcode Generator and Zint Barcode Studio User Manual Zint Barcode Generator and Zint Barcode Studio User Manual
Version 2.13.0.9 Version 2.13.0.9
January 2025 February 2025
******************************************************************************* *******************************************************************************
* For reference the following is a text-only version of the Zint manual, * * For reference the following is a text-only version of the Zint manual, *
@ -4864,7 +4864,7 @@ configured barcode is displayed once the "Generate" button is pressed.
Annex D. Man Page ZINT(1) Annex D. Man Page ZINT(1)
% ZINT(1) Version 2.13.0.9 % % January 2025 % ZINT(1) Version 2.13.0.9 % % February 2025
NAME NAME
@ -5221,7 +5221,8 @@ OPTIONS
output, and by 2 otherwise. output, and by 2 otherwise.
Increments of 0.5 (half-integers) are recommended for non-MaxiCode raster Increments of 0.5 (half-integers) are recommended for non-MaxiCode raster
output (BMP, GIF, PCX, PNG and TIF). output (BMP, GIF, PCX, PNG and TIF). Human Readable Text (HRT) for raster
output will not be shown for scales less than 1.
See also --scalexdimdp below. See also --scalexdimdp below.

4
docs/zint.1
View file

@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 3.6.2 .\" Automatically generated by Pandoc 3.6.2
.\" .\"
.TH "ZINT" "1" "January 2025" "Version 2.13.0.9" .TH "ZINT" "1" "February 2025" "Version 2.13.0.9"
.SH NAME .SH NAME
\f[CR]zint\f[R] \- encode data as a barcode image \f[CR]zint\f[R] \- encode data as a barcode image
.SH SYNOPSIS .SH SYNOPSIS
@ -364,6 +364,8 @@ EMF output, and by 2 otherwise.
.PP .PP
Increments of 0.5 (half\-integers) are recommended for non\-MaxiCode Increments of 0.5 (half\-integers) are recommended for non\-MaxiCode
raster output (BMP, GIF, PCX, PNG and TIF). raster output (BMP, GIF, PCX, PNG and TIF).
Human Readable Text (HRT) for raster output will not be shown for scales
less than 1.
.PP .PP
See also \f[CR]\-\-scalexdimdp\f[R] below. See also \f[CR]\-\-scalexdimdp\f[R] below.
.RE .RE

3
docs/zint.1.pmd
View file

@ -1,6 +1,6 @@
% ZINT(1) Version 2.13.0.9 % ZINT(1) Version 2.13.0.9
% %
% January 2025 % February 2025
# NAME # NAME
@ -323,6 +323,7 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S
For MaxiCode, the scale is multiplied by 10 for raster output, by 40 for EMF output, and by 2 otherwise. For MaxiCode, the scale is multiplied by 10 for raster output, by 40 for EMF output, and by 2 otherwise.
Increments of 0.5 (half-integers) are recommended for non-MaxiCode raster output (BMP, GIF, PCX, PNG and TIF). Increments of 0.5 (half-integers) are recommended for non-MaxiCode raster output (BMP, GIF, PCX, PNG and TIF).
Human Readable Text (HRT) for raster output will not be shown for scales less than 1.
See also `--scalexdimdp` below. See also `--scalexdimdp` below.

8
frontend_qt/mainwindow.cpp
View file

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> * * Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> *
* Copyright (C) 2009-2024 by Robin Stuart <rstuart114@gmail.com> * * Copyright (C) 2009-2025 by Robin Stuart <rstuart114@gmail.com> *
* * * *
* This program is free software: you can redistribute it and/or modify * * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
@ -197,13 +197,13 @@ static const struct bstyle_item bstyle_items[] = {
void MainWindow::mac_hack_vLayouts(QWidget *win) void MainWindow::mac_hack_vLayouts(QWidget *win)
{ {
QList<QVBoxLayout *> vlayouts = win->findChildren<QVBoxLayout *>(); QList<QVBoxLayout *> vlayouts = win->findChildren<QVBoxLayout *>();
for (int i = 0, cnt = vlayouts.size(); i < cnt; i++) { for (int i = 0, vcnt = vlayouts.size(); i < vcnt; i++) {
if (vlayouts[i]->objectName() == "vLayoutData" || vlayouts[i]->objectName() == "vLayoutComposite" if (vlayouts[i]->objectName() == "vLayoutData" || vlayouts[i]->objectName() == "vLayoutComposite"
|| vlayouts[i]->objectName() == "vLayoutSegs") { || vlayouts[i]->objectName() == "vLayoutSegs") {
vlayouts[i]->setSpacing(2); vlayouts[i]->setSpacing(2);
// If set spacing on QVBoxLayout then it seems its QHBoxLayout children inherit this so undo // If set spacing on QVBoxLayout then it seems its QHBoxLayout children inherit this so undo
QList<QHBoxLayout *> hlayouts = vlayouts[i]->findChildren<QHBoxLayout *>(); QList<QHBoxLayout *> hlayouts = vlayouts[i]->findChildren<QHBoxLayout *>();
for (int j = 0, cnt = hlayouts.size(); j < cnt; j++) { for (int j = 0, hcnt = hlayouts.size(); j < hcnt; j++) {
hlayouts[j]->setSpacing(8); hlayouts[j]->setSpacing(8);
} }
} }
@ -799,7 +799,7 @@ void MainWindow::about()
"<p>A free barcode generator</p>" "<p>A free barcode generator</p>"
"<p>Instruction manual is available at the project homepage:<br>" "<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>.</p>" "<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>.</p>"
"<p>Copyright &copy; 2006-2024 Robin Stuart and others.<br>" "<p>Copyright &copy; 2006-2025 Robin Stuart and others.<br>"
"Qt backend by BogDan Vatra.<br>" "Qt backend by BogDan Vatra.<br>"
"Released under GNU GPL 3.0 or later.</p>" "Released under GNU GPL 3.0 or later.</p>"
"<p>Qt version %2<br>%3</p>" "<p>Qt version %2<br>%3</p>"

2
tools/update_version.php
View file

@ -377,7 +377,7 @@ version_replace(2, $data_dirname . 'win32/vs2019/zint.vcxproj', '/ZINT_VERSION="
print PHP_EOL; print PHP_EOL;
print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL; print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL;
print '!!! REMEMBER: update release date in manual and man page !!!' . PHP_EOL; print '!!! REMEMBER: update release date in manual and man page !!!' . PHP_EOL;
print '!!! REMEMBER: cd docs; make !!!' . PHP_EOL; print '!!! REMEMBER: cd docs; make; make manual.html !!!' . PHP_EOL;
print '!!! REMEMBER: run "autoconf" and "./configure" in "backend_tcl/" !!!' . PHP_EOL; print '!!! REMEMBER: run "autoconf" and "./configure" in "backend_tcl/" !!!' . PHP_EOL;
print '!!! REMEMBER: update version and date in "ChangeLog" !!!' . PHP_EOL; print '!!! REMEMBER: update version and date in "ChangeLog" !!!' . PHP_EOL;
print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL; print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL;