pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: adam
Date: Tue Jan 16 19:23:06 UTC 2024
Modified Files:
pkgsrc/graphics/opencv: Makefile Makefile.common PLIST distinfo
pkgsrc/graphics/opencv-contrib-face: Makefile distinfo
Added Files:
pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVFindProtobuf.cmake
patch-modules_dnn_test_test__precomp.hpp
patch-modules_objdetect_test_test__qrcode__encode.cpp
Removed Files:
pkgsrc/graphics/opencv/patches: patch-modules_dnn_test__precomp.hpp
Log Message:
opencv opencv-contrib-face: updated to 3.4.20
3.4.20
Bug fixes
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/opencv/PLIST
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindProtobuf.cmake \
pkgsrc/graphics/opencv/patches/patch-modules_dnn_test_test__precomp.hpp \
pkgsrc/graphics/opencv/patches/patch-modules_objdetect_test_test__qrcode__encode.cpp
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/opencv/patches/patch-modules_dnn_test__precomp.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.123 pkgsrc/graphics/opencv/Makefile:1.124
--- pkgsrc/graphics/opencv/Makefile:1.123 Fri Dec 22 07:35:07 2023
+++ pkgsrc/graphics/opencv/Makefile Tue Jan 16 19:23:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2023/12/22 07:35:07 thor Exp $
+# $NetBSD: Makefile,v 1.124 2024/01/16 19:23:05 adam Exp $
.include "Makefile.common"
@@ -30,6 +30,7 @@ post-install:
.include "../../mk/bsd.prefs.mk"
+.include "../../devel/cmake/build.mk"
.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.19 pkgsrc/graphics/opencv/Makefile.common:1.20
--- pkgsrc/graphics/opencv/Makefile.common:1.19 Fri Dec 22 14:30:55 2023
+++ pkgsrc/graphics/opencv/Makefile.common Tue Jan 16 19:23:05 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.19 2023/12/22 14:30:55 thor Exp $
+# $NetBSD: Makefile.common,v 1.20 2024/01/16 19:23:05 adam Exp $
# used by graphics/opencv/Makefile
# used by graphics/opencv-contrib-face/Makefile
#
# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
-OPENCV_VERSION= 3.4.17
+OPENCV_VERSION= 3.4.20
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
@@ -14,7 +14,8 @@ LICENSE= modified-bsd
PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches
-USE_CMAKE= yes
+USE_CXX_FEATURES= c++14
+FORCE_CXX_STD= c++14
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
@@ -63,8 +64,5 @@ CMAKE_ARGS+= -DCPU_BASELINE=""
PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
.include "../../mk/atomic64.mk"
.include "../../lang/python/pyversion.mk"
Index: pkgsrc/graphics/opencv/PLIST
diff -u pkgsrc/graphics/opencv/PLIST:1.23 pkgsrc/graphics/opencv/PLIST:1.24
--- pkgsrc/graphics/opencv/PLIST:1.23 Thu Feb 13 09:23:46 2020
+++ pkgsrc/graphics/opencv/PLIST Tue Jan 16 19:23:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/02/13 09:23:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2024/01/16 19:23:05 adam Exp $
bin/opencv_annotation
bin/opencv_createsamples
bin/opencv_interactive-calibration
@@ -129,6 +129,7 @@ include/opencv2/core/utility.hpp
include/opencv2/core/utils/allocator_stats.hpp
include/opencv2/core/utils/allocator_stats.impl.hpp
include/opencv2/core/utils/filesystem.hpp
+include/opencv2/core/utils/fp_control_utils.hpp
include/opencv2/core/utils/instrumentation.hpp
include/opencv2/core/utils/logger.defines.hpp
include/opencv2/core/utils/logger.hpp
Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.59 pkgsrc/graphics/opencv/distinfo:1.60
--- pkgsrc/graphics/opencv/distinfo:1.59 Fri Dec 22 15:35:44 2023
+++ pkgsrc/graphics/opencv/distinfo Tue Jan 16 19:23:05 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59 2023/12/22 15:35:44 thor Exp $
+$NetBSD: distinfo,v 1.60 2024/01/16 19:23:05 adam Exp $
-BLAKE2s (opencv-3.4.17.tar.gz) = f8cbf244836026ef700534a4aa35a96f0e1521a6a5aa05ffecb90b1cdbcb75d3
-SHA512 (opencv-3.4.17.tar.gz) = b17a4a04ab29f0f966681a825af782039a2cc6564956894aba639731542fdb86d316b16b96e2d45de8b5e0db7c79ce4b4c348b82ccd124d125aacb7c02026841
-Size (opencv-3.4.17.tar.gz) = 87758183 bytes
+BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe
+SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8
+Size (opencv-3.4.20.tar.gz) = 88348843 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
@@ -10,6 +10,7 @@ SHA1 (patch-apps_visualisation_opencv__v
SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad
+SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38
SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
@@ -20,9 +21,10 @@ SHA1 (patch-modules_core_src_system.cpp)
SHA1 (patch-modules_dnn_src_layers_accum__layer.cpp) = 20a12489f7e7fcbc90d47871f12ac500ab8ae6ed
SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 9b3628d91c2217c4b1ed77413efd4c0bf85758c4
SHA1 (patch-modules_dnn_src_torch_torch__importer.cpp) = 814a3cc929569b691d01e34252dbd185f31161c2
-SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
+SHA1 (patch-modules_dnn_test_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
+SHA1 (patch-modules_objdetect_test_test__qrcode__encode.cpp) = aa76e97a5e7e3688c7a9c424d8b7b10c5a6fcb11
SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.35 pkgsrc/graphics/opencv-contrib-face/Makefile:1.36
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.35 Fri Dec 22 07:35:07 2023
+++ pkgsrc/graphics/opencv-contrib-face/Makefile Tue Jan 16 19:23:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/12/22 07:35:07 thor Exp $
+# $NetBSD: Makefile,v 1.36 2024/01/16 19:23:05 adam Exp $
.include "../../graphics/opencv/Makefile.common"
@@ -67,6 +67,11 @@ CMAKE_ARGS+= -DBUILD_opencv_videostab=O
#CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF
#CMAKE_ARGS+= -DBUILD_opencv_video=OFF
+# XXX: INSTALL_DIRS currently do not work as desired in cmake/build.mk.
+USE_CMAKE= yes
+pre-configure:
+ ${MKDIR} ${WRKSRC}/build
+
BUILDLINK_API_DEPENDS.opencv+= opencv>=${PKGVERSION_NOREV}
.include "../../graphics/opencv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.28 pkgsrc/graphics/opencv-contrib-face/distinfo:1.29
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.28 Mon Dec 25 18:04:32 2023
+++ pkgsrc/graphics/opencv-contrib-face/distinfo Tue Jan 16 19:23:05 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2023/12/25 18:04:32 wiz Exp $
+$NetBSD: distinfo,v 1.29 2024/01/16 19:23:05 adam Exp $
-BLAKE2s (opencv-3.4.17.tar.gz) = f8cbf244836026ef700534a4aa35a96f0e1521a6a5aa05ffecb90b1cdbcb75d3
-SHA512 (opencv-3.4.17.tar.gz) = b17a4a04ab29f0f966681a825af782039a2cc6564956894aba639731542fdb86d316b16b96e2d45de8b5e0db7c79ce4b4c348b82ccd124d125aacb7c02026841
-Size (opencv-3.4.17.tar.gz) = 87758183 bytes
-BLAKE2s (opencv_contrib-3.4.17.tar.gz) = 35896b85853444d826d574903a6b8d61fea93b7ab0d8d77292eb98b7507f3858
-SHA512 (opencv_contrib-3.4.17.tar.gz) = 33be143aa3a3b30fd903e4d3c4ae6b26911171d956fe40fd2b38df37855822547013f44470271a366fbfecf6efbaa746cd9aea3088a71028752bff0bda90a00f
-Size (opencv_contrib-3.4.17.tar.gz) = 54708858 bytes
+BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe
+SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8
+Size (opencv-3.4.20.tar.gz) = 88348843 bytes
+BLAKE2s (opencv_contrib-3.4.20.tar.gz) = 94339e1afc668b1536ed1b95b4cb5fe540213c0e97082013cac39a9f5d636db2
+SHA512 (opencv_contrib-3.4.20.tar.gz) = bc60bbe0c64d6f2d0e0d35f1cde1d54ef43239549d1d0d4d8f6d6770e4a1c624cedd9d2abff6e198e95e547af02fac6813f3b45bfcd9c2bc2171744b0208de69
+Size (opencv_contrib-3.4.20.tar.gz) = 53793395 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
@@ -13,6 +13,7 @@ SHA1 (patch-apps_visualisation_opencv__v
SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad
+SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38
SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
@@ -27,5 +28,6 @@ SHA1 (patch-modules_dnn_test__precomp.hp
SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
+SHA1 (patch-modules_objdetect_test_test__qrcode__encode.cpp) = aa76e97a5e7e3688c7a9c424d8b7b10c5a6fcb11
SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
Added files:
Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindProtobuf.cmake
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindProtobuf.cmake:1.1
--- /dev/null Tue Jan 16 19:23:06 2024
+++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindProtobuf.cmake Tue Jan 16 19:23:05 2024
@@ -0,0 +1,69 @@
+$NetBSD: patch-cmake_OpenCVFindProtobuf.cmake,v 1.1 2024/01/16 19:23:05 adam Exp $
+
+Support protobuf v22 and later.
+https://github.com/opencv/opencv/pull/24372
+
+--- cmake/OpenCVFindProtobuf.cmake.orig 2023-06-27 11:29:13.000000000 +0000
++++ cmake/OpenCVFindProtobuf.cmake
+@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF)
+ set(Protobuf_LIBRARIES "libprotobuf")
+ set(HAVE_PROTOBUF TRUE)
+ else()
++ # we still need this for command PROTOBUF_GENERATE_CPP.
++ set(protobuf_MODULE_COMPATIBLE ON)
++
+ unset(Protobuf_VERSION CACHE)
+- find_package(Protobuf QUIET)
++ find_package(Protobuf QUIET CONFIG)
++ if(NOT Protobuf_FOUND)
++ find_package(Protobuf QUIET)
++ endif()
+
+ # Backwards compatibility
+ # Define camel case versions of input variables
+@@ -67,6 +73,20 @@ else()
+ endif()
+ endif()
+
++# See https://github.com/opencv/opencv/issues/24369
++# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp.
++# Details: https://protobuf.dev/news/2022-08-03/
++# And if std::text_view is in abseil-cpp requests C++17 and later.
++
++if(HAVE_PROTOBUF)
++ if(NOT (Protobuf_VERSION VERSION_LESS 22))
++ if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17))
++ message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. Turning HAVE_PROTOBUF off")
++ set(HAVE_PROTOBUF FALSE)
++ endif()
++ endif()
++endif()
++
+ if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP)
+ message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
+ endif()
+@@ -74,15 +94,20 @@ endif()
+ if(HAVE_PROTOBUF)
+ list(APPEND CUSTOM_STATUS protobuf)
+ if(NOT BUILD_PROTOBUF)
++ unset( __location)
+ if(TARGET "${Protobuf_LIBRARIES}")
+ get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
+ if(NOT __location)
+ get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
+ endif()
+- elseif(Protobuf_LIBRARY)
+- set(__location "${Protobuf_LIBRARY}")
+- else()
+- set(__location "${Protobuf_LIBRARIES}")
++ endif()
++
++ if(NOT __location)
++ if(Protobuf_LIBRARY)
++ set(__location "${Protobuf_LIBRARY}")
++ else()
++ set(__location "${Protobuf_LIBRARIES}")
++ endif()
+ endif()
+ endif()
+ list(APPEND CUSTOM_STATUS_protobuf " Protobuf:"
Index: pkgsrc/graphics/opencv/patches/patch-modules_dnn_test_test__precomp.hpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_dnn_test_test__precomp.hpp:1.1
--- /dev/null Tue Jan 16 19:23:06 2024
+++ pkgsrc/graphics/opencv/patches/patch-modules_dnn_test_test__precomp.hpp Tue Jan 16 19:23:05 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-modules_dnn_test_test__precomp.hpp,v 1.1 2024/01/16 19:23:05 adam Exp $
+
+adhoc patch to build 3.4.6
+
+[ 30%] Built target opencv_core
+/export/WRKOBJDIR/graphics/opencv/work/opencv-3.4.6/build/modules/dnn/test_precomp.hpp:50:10: fatal error: test/test_common.hpp: No such file or directory
+ #include "test/test_common.hpp"
+ ^~~~~~~~~~~~~~~~~~~~~~
+compilation terminated.
+
+--- build/modules/dnn/test_precomp.hpp.orig 2019-04-29 10:35:50.011315095 +0900
++++ modules/dnn/test/test_precomp.hpp 2019-04-29 11:11:41.277591395 +0900
+@@ -47,6 +47,6 @@
+ #include "opencv2/core/ocl.hpp"
+
+ #include "opencv2/dnn.hpp"
+-#include "test_common.hpp"
++#include "../test/test_common.hpp"
+
+ #endif
Index: pkgsrc/graphics/opencv/patches/patch-modules_objdetect_test_test__qrcode__encode.cpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_objdetect_test_test__qrcode__encode.cpp:1.1
--- /dev/null Tue Jan 16 19:23:06 2024
+++ pkgsrc/graphics/opencv/patches/patch-modules_objdetect_test_test__qrcode__encode.cpp Tue Jan 16 19:23:05 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-modules_objdetect_test_test__qrcode__encode.cpp,v 1.1 2024/01/16 19:23:05 adam Exp $
+
+Fix compilation when forcing later C++.
+https://github.com/opencv/opencv/pull/24194
+
+--- modules/objdetect/test/test_qrcode_encode.cpp.orig 2024-01-16 12:42:50.298340978 +0000
++++ modules/objdetect/test/test_qrcode_encode.cpp
+@@ -264,7 +264,8 @@ TEST(Objdetect_QRCode_Encode_Decode, reg
+ int true_capacity = establishCapacity(mode, version, cur_capacity);
+
+ std::string input_info = symbol_set;
+- std::random_shuffle(input_info.begin(),input_info.end());
++ std::mt19937 rand_gen {1};
++ std::shuffle(input_info.begin(), input_info.end(), rand_gen);
+ int count = 0;
+ if((int)input_info.length() > true_capacity)
+ {
+@@ -391,15 +392,8 @@ TEST(Objdetect_QRCode_Encode_Decode_Stru
+ std::string symbol_set = config["symbols_set"];
+
+ std::string input_info = symbol_set;
+-#if defined CV_CXX11
+- // std::random_shuffle is deprecated since C++11 and removed in C++17.
+- // Use manually constructed RNG with a fixed seed and std::shuffle instead.
+ std::mt19937 rand_gen {1};
+ std::shuffle(input_info.begin(), input_info.end(), rand_gen);
+-#else
+- SeededRandFunctor<1> rand_gen;
+- std::random_shuffle(input_info.begin(), input_info.end(), rand_gen);
+-#endif
+ for (int j = min_stuctures_num; j < max_stuctures_num; j++)
+ {
+ QRCodeEncoder::Params params;
Home |
Main Index |
Thread Index |
Old Index