diff options
Diffstat (limited to 'app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch new file mode 100644 index 000000000000..52b383a9d3e9 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch @@ -0,0 +1,59 @@ +From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 +From: "Brett T. Warden" <brett.t.warden@intel.com> +Date: Fri, 30 Dec 2022 08:43:25 +0100 +Subject: Remove dependency on BitArray.h from zxing-1.2.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In zxing-1.4.0, numerous headers are no longer public. Rework the +ConvertToSVGFormat method so it uses bitmatrix.get instead of +bitmatrix.getRow, similar to the ToSVG method in zxing itself. + +See https://github.com/zxing-cpp/zxing-cpp/issues/361 + +Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874 +Tested-by: René Engelhard <rene@debian.org> +Reviewed-by: René Engelhard <rene@debian.org> +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +--- + cui/source/dialogs/QrCodeGenDialog.cxx | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx +index f8cbac1d758d..817be7f21ede 100644 +--- a/cui/source/dialogs/QrCodeGenDialog.cxx ++++ b/cui/source/dialogs/QrCodeGenDialog.cxx +@@ -27,7 +27,6 @@ + #endif + + #include <BarcodeFormat.h> +-#include <BitArray.h> + #include <BitMatrix.h> + #include <MultiFormatWriter.h> + #include <TextUtfEncoding.h> +@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) + OStringBuffer sb; + const int width = bitmatrix.width(); + const int height = bitmatrix.height(); +- ZXing::BitArray row(width); + sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 " + + OString::number(width) + " " + OString::number(height) +@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) + "<path d=\""); + for (int i = 0; i < height; ++i) + { +- bitmatrix.getRow(i, row); + for (int j = 0; j < width; ++j) + { +- if (row.get(j)) ++ if (bitmatrix.get(j, i)) + { + sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z"); + } +-- +cgit v1.2.1 + |