mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

zxing: update to 1.4.0 tag

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3450>
This commit is contained in:
Stéphane Cerveau 2022-11-22 12:32:52 +01:00 committed by GStreamer Marge Bot
parent 4d70b9f87c
commit 7cfc3130a7
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp
View file

@ -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); auto result = ReadBarcode ({(unsigned char *)data, width, height, zxing->image_format}, hints);
if (result.isValid ()) { if (result.isValid ()) {
GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s", GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s",
TextUtfEncoding::ToUtf8 (result.text ()).c_str (), result.text ().c_str (),
ToString (result.format ())); ToString (result.format ()));
} else { } else {
goto out; goto out;
@ -396,7 +396,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame)
"running-time", G_TYPE_UINT64, running_time, "running-time", G_TYPE_UINT64, running_time,
"type", G_TYPE_STRING, ToString (result.format ()), "type", G_TYPE_STRING, ToString (result.format ()),
"symbol", G_TYPE_STRING, "symbol", G_TYPE_STRING,
TextUtfEncoding::ToUtf8 (result.text ()).c_str (), NULL); result.text ().c_str (), NULL);
if (zxing->attach_frame) { if (zxing->attach_frame) {
/* create a sample from image */ /* create a sample from image */

5
subprojects/gst-plugins-bad/ext/zxing/meson.build
View file

@ -2,16 +2,17 @@ zxing_sources = [
'gstzxing.cpp', 'gstzxing.cpp',
'gstzxingplugin.c', '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() if zxing_dep.found()
gstzxing = library('gstzxing', gstzxing = library('gstzxing',
zxing_sources, zxing_sources,
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,
cpp_args: '-DZX_USE_UTF8',
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstvideo_dep, zxing_dep], dependencies : [gstvideo_dep, zxing_dep],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
override_options : ['cpp_std=c++11'], override_options : ['cpp_std=c++17'],
) )
plugins += [gstzxing] plugins += [gstzxing]
endif endif