head 1.2; access; symbols pkgsrc-2024Q4:1.1.0.8 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.6 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.4 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.2 pkgsrc-2024Q1-base:1.1; locks; strict; comment @// @; 1.2 date 2025.02.07.21.54.17; author wiz; state dead; branches; next 1.1; commitid RS8OGY8QeR4wlAIF; 1.1 date 2024.01.16.19.23.05; author adam; state Exp; branches; next ; commitid wwhWJYlVlfzLYHUE; desc @@ 1.2 log @opencv: update to 4.11.0. This is the new major version under the Apache 2 license. Too many changes to list, no concise summary found. Details at: https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs-v2.2%E2%80%90v4.10 https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110 @ text @$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; @ 1.1 log @opencv opencv-contrib-face: updated to 3.4.20 3.4.20 Bug fixes @ text @d1 1 a1 1 $NetBSD$ @