CVS commit: pkgsrc/graphics/opencv

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 11 09:37:20 UTC 2024

Modified Files:
        pkgsrc/graphics/opencv: distinfo
Added Files:
        pkgsrc/graphics/opencv/patches:
            patch-modules_objdetect_src_qrcode__encoder.cpp

Log Message:
opencv: Avoid ambiguous function call.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencv/patches/patch-modules_objdetect_src_qrcode__encoder.cpp

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/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.61 pkgsrc/graphics/opencv/distinfo:1.62
--- pkgsrc/graphics/opencv/distinfo:1.61        Fri Feb  9 11:50:30 2024
+++ pkgsrc/graphics/opencv/distinfo     Mon Mar 11 09:37:20 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2024/02/09 11:50:30 adam Exp $
+$NetBSD: distinfo,v 1.62 2024/03/11 09:37:20 jperkin Exp $
 
 BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe
 SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8
@@ -25,6 +25,7 @@ SHA1 (patch-modules_dnn_test_test__preco
 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_src_qrcode__encoder.cpp) = eeeb7ec8ff7def1a5c6f9e81045f6bf36226de39
 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-modules_objdetect_src_qrcode__encoder.cpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_objdetect_src_qrcode__encoder.cpp:1.1
--- /dev/null   Mon Mar 11 09:37:20 2024
+++ pkgsrc/graphics/opencv/patches/patch-modules_objdetect_src_qrcode__encoder.cpp      Mon Mar 11 09:37:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_objdetect_src_qrcode__encoder.cpp,v 1.1 2024/03/11 09:37:20 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- modules/objdetect/src/qrcode_encoder.cpp.orig      2024-03-11 09:34:13.498700601 +0000
++++ modules/objdetect/src/qrcode_encoder.cpp
+@@ -8,6 +8,7 @@
+ #include "qrcode_encoder_table.inl.hpp"
+ namespace cv
+ {
++using std::ceil;
+ using std::vector;
+ 
+ const int MAX_PAYLOAD_LEN = 8896;