From 01d72607c6f933386273faed4223fd601abd1966 Mon Sep 17 00:00:00 2001
From: gitlost
Date: Sun, 2 Feb 2025 09:58:41 +0000
Subject: [PATCH] GUI: suppress shadow var warning (macOS); update year 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
---
README.bsd | 5 +++--
README.linux | 13 ++++++++++---
backend/zint.h | 2 +-
docs/manual.html | 5 +++--
docs/manual.pmd | 2 +-
docs/manual.txt | 7 ++++---
docs/zint.1 | 4 +++-
docs/zint.1.pmd | 3 ++-
frontend_qt/mainwindow.cpp | 8 ++++----
tools/update_version.php | 2 +-
10 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/README.bsd b/README.bsd
index 48cb6ea8..54c7a96b 100644
--- a/README.bsd
+++ b/README.bsd
@@ -1,5 +1,5 @@
-% README.bsd 2025-01-18
-% Tested on FreeBSD 14.2-RELEASE (with X11 + GNOME installed), OpenBSD 7.6 (with X11) and NetBSD 10.0 (with X11)
+% README.bsd 2025-02-02
+% 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
==================================
@@ -55,6 +55,7 @@ On NetBSD:
The rest is standard CMake (allowing for absence of sudo)
+ cd zint
mkdir build
cd build
cmake ..
diff --git a/README.linux b/README.linux
index 9f438206..bf41d570 100644
--- a/README.linux
+++ b/README.linux
@@ -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
-% Fedora Linux 40 (Workstation Edition)
+% Fedora Linux 41 (Workstation Edition)
1. Prerequisites for building zint
==================================
@@ -109,8 +109,15 @@ The rest is standard CMake
make
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:/gcc_64/lib
+
+
+5. CMake options
================
A number of options are available:
diff --git a/backend/zint.h b/backend/zint.h
index 44d4c389..7cd02726 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -1,7 +1,7 @@
/* zint.h - definitions for libzint */
/*
libzint - the open source barcode library
- Copyright (C) 2009-2024 Robin Stuart
+ Copyright (C) 2009-2025 Robin Stuart
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/docs/manual.html b/docs/manual.html
index a2d00658..95abf31a 100644
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -333,7 +333,7 @@
Zint Barcode Generator and Zint Barcode Studio User
Manual
Version 2.13.0.9
-
January 2025
+
February 2025
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).
+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.
--scalexdimdp=X[,R]
diff --git a/docs/manual.pmd b/docs/manual.pmd
index 6364e763..1d7f28d4 100644
--- a/docs/manual.pmd
+++ b/docs/manual.pmd
@@ -1,6 +1,6 @@
% Zint Barcode Generator and Zint Barcode Studio User Manual
% Version 2.13.0.9
-% January 2025
+% February 2025
# 1. Introduction
diff --git a/docs/manual.txt b/docs/manual.txt
index db8e95c5..260fb355 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -1,6 +1,6 @@
Zint Barcode Generator and Zint Barcode Studio User Manual
Version 2.13.0.9
-January 2025
+February 2025
*******************************************************************************
* 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)
-% ZINT(1) Version 2.13.0.9 % % January 2025
+% ZINT(1) Version 2.13.0.9 % % February 2025
NAME
@@ -5221,7 +5221,8 @@ OPTIONS
output, and by 2 otherwise.
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.
diff --git a/docs/zint.1 b/docs/zint.1
index c90bcbe3..5a74b53d 100644
--- a/docs/zint.1
+++ b/docs/zint.1
@@ -1,6 +1,6 @@
.\" 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
\f[CR]zint\f[R] \- encode data as a barcode image
.SH SYNOPSIS
@@ -364,6 +364,8 @@ EMF output, and by 2 otherwise.
.PP
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.
.PP
See also \f[CR]\-\-scalexdimdp\f[R] below.
.RE
diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd
index 03873490..b075d68f 100644
--- a/docs/zint.1.pmd
+++ b/docs/zint.1.pmd
@@ -1,6 +1,6 @@
% ZINT(1) Version 2.13.0.9
%
-% January 2025
+% February 2025
# 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.
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.
diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp
index 84ccd975..23fff8c7 100644
--- a/frontend_qt/mainwindow.cpp
+++ b/frontend_qt/mainwindow.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2008 by BogDan Vatra *
- * Copyright (C) 2009-2024 by Robin Stuart *
+ * Copyright (C) 2009-2025 by Robin Stuart *
* *
* 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 *
@@ -197,13 +197,13 @@ static const struct bstyle_item bstyle_items[] = {
void MainWindow::mac_hack_vLayouts(QWidget *win)
{
QList vlayouts = win->findChildren();
- 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"
|| vlayouts[i]->objectName() == "vLayoutSegs") {
vlayouts[i]->setSpacing(2);
// If set spacing on QVBoxLayout then it seems its QHBoxLayout children inherit this so undo
QList hlayouts = vlayouts[i]->findChildren();
- for (int j = 0, cnt = hlayouts.size(); j < cnt; j++) {
+ for (int j = 0, hcnt = hlayouts.size(); j < hcnt; j++) {
hlayouts[j]->setSpacing(8);
}
}
@@ -799,7 +799,7 @@ void MainWindow::about()
"