gst-plugins-bad/gst-plugins-bad-1.20.5-zxing-cpp-1.4.patch

61 lines
2.5 KiB
Diff
Raw Normal View History

From 7cfc3130a7906c199861d2ef331a07d749a4b769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
Date: Tue, 22 Nov 2022 12:32:52 +0100
Subject: [PATCH] zxing: update to 1.4.0 tag
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3450>
---
subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp | 4 ++--
subprojects/gst-plugins-bad/ext/zxing/meson.build | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp
index 5f296ecab79..7836dbbcf18 100644
--- a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp
+++ b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp
@@ -368,7 +368,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame)
auto result = ReadBarcode ({(unsigned char *)data, width, height, zxing->image_format}, hints);
if (result.isValid ()) {
GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s",
- TextUtfEncoding::ToUtf8 (result.text ()).c_str (),
+ result.text ().c_str (),
ToString (result.format ()));
} else {
goto out;
@@ -396,7 +396,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame)
"running-time", G_TYPE_UINT64, running_time,
"type", G_TYPE_STRING, ToString (result.format ()),
"symbol", G_TYPE_STRING,
- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), NULL);
+ result.text ().c_str (), NULL);
if (zxing->attach_frame) {
/* create a sample from image */
diff --git a/subprojects/gst-plugins-bad/ext/zxing/meson.build b/subprojects/gst-plugins-bad/ext/zxing/meson.build
index 5992f0d9e02..2dbad9ab1ee 100644
--- a/subprojects/gst-plugins-bad/ext/zxing/meson.build
+++ b/subprojects/gst-plugins-bad/ext/zxing/meson.build
@@ -2,16 +2,17 @@ zxing_sources = [
'gstzxing.cpp',
'gstzxingplugin.c',
]
-zxing_dep = dependency('zxing', version : '>= 1.1.1', required : get_option('zxing'))
+zxing_dep = dependency('zxing', version : '>= 1.4.0', required : get_option('zxing'))
if zxing_dep.found()
gstzxing = library('gstzxing',
zxing_sources,
c_args : gst_plugins_bad_args,
+ cpp_args: '-DZX_USE_UTF8',
include_directories : [configinc],
dependencies : [gstvideo_dep, zxing_dep],
install : true,
install_dir : plugins_install_dir,
- override_options : ['cpp_std=c++11'],
+ override_options : ['cpp_std=c++17'],
)
plugins += [gstzxing]
endif
--
GitLab