opencv-contrib-python-headless 4.11.0.86__cp37-abi3-win_amd64.whl → 4.12.0.88__cp37-abi3-win_amd64.whl

cv2/__init__.pyi

@@ -250,8 +250,9 @@ MorphTypes = int
 MORPH_RECT: int
 MORPH_CROSS: int
 MORPH_ELLIPSE: int
+MORPH_DIAMOND: int
 MorphShapes = int
-"""One of [MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE]"""
+"""One of [MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE, MORPH_DIAMOND]"""
 
 INTER_NEAREST: int
 INTER_LINEAR: int
@@ -304,8 +305,9 @@ THRESH_TOZERO_INV: int
 THRESH_MASK: int
 THRESH_OTSU: int
 THRESH_TRIANGLE: int
+THRESH_DRYRUN: int
 ThresholdTypes = int
-"""One of [THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV, THRESH_MASK, THRESH_OTSU, THRESH_TRIANGLE]"""
+"""One of [THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV, THRESH_MASK, THRESH_OTSU, THRESH_TRIANGLE, THRESH_DRYRUN]"""
 
 ADAPTIVE_THRESH_MEAN_C: int
 ADAPTIVE_THRESH_GAUSSIAN_C: int
@@ -1219,6 +1221,7 @@ IMWRITE_JPEG_SAMPLING_FACTOR: int
 IMWRITE_PNG_COMPRESSION: int
 IMWRITE_PNG_STRATEGY: int
 IMWRITE_PNG_BILEVEL: int
+IMWRITE_PNG_FILTER: int
 IMWRITE_PXM_BINARY: int
 IMWRITE_EXR_TYPE: int
 IMWRITE_EXR_COMPRESSION: int
@@ -1247,7 +1250,7 @@ IMWRITE_GIF_DITHER: int
 IMWRITE_GIF_TRANSPARENCY: int
 IMWRITE_GIF_COLORTABLE: int
 ImwriteFlags = int
-"""One of [IMWRITE_JPEG_QUALITY, IMWRITE_JPEG_PROGRESSIVE, IMWRITE_JPEG_OPTIMIZE, IMWRITE_JPEG_RST_INTERVAL, IMWRITE_JPEG_LUMA_QUALITY, IMWRITE_JPEG_CHROMA_QUALITY, IMWRITE_JPEG_SAMPLING_FACTOR, IMWRITE_PNG_COMPRESSION, IMWRITE_PNG_STRATEGY, IMWRITE_PNG_BILEVEL, IMWRITE_PXM_BINARY, IMWRITE_EXR_TYPE, IMWRITE_EXR_COMPRESSION, IMWRITE_EXR_DWA_COMPRESSION_LEVEL, IMWRITE_WEBP_QUALITY, IMWRITE_HDR_COMPRESSION, IMWRITE_PAM_TUPLETYPE, IMWRITE_TIFF_RESUNIT, IMWRITE_TIFF_XDPI, IMWRITE_TIFF_YDPI, IMWRITE_TIFF_COMPRESSION, IMWRITE_TIFF_ROWSPERSTRIP, IMWRITE_TIFF_PREDICTOR, IMWRITE_JPEG2000_COMPRESSION_X1000, IMWRITE_AVIF_QUALITY, IMWRITE_AVIF_DEPTH, IMWRITE_AVIF_SPEED, IMWRITE_JPEGXL_QUALITY, IMWRITE_JPEGXL_EFFORT, IMWRITE_JPEGXL_DISTANCE, IMWRITE_JPEGXL_DECODING_SPEED, IMWRITE_GIF_LOOP, IMWRITE_GIF_SPEED, IMWRITE_GIF_QUALITY, IMWRITE_GIF_DITHER, IMWRITE_GIF_TRANSPARENCY, IMWRITE_GIF_COLORTABLE]"""
+"""One of [IMWRITE_JPEG_QUALITY, IMWRITE_JPEG_PROGRESSIVE, IMWRITE_JPEG_OPTIMIZE, IMWRITE_JPEG_RST_INTERVAL, IMWRITE_JPEG_LUMA_QUALITY, IMWRITE_JPEG_CHROMA_QUALITY, IMWRITE_JPEG_SAMPLING_FACTOR, IMWRITE_PNG_COMPRESSION, IMWRITE_PNG_STRATEGY, IMWRITE_PNG_BILEVEL, IMWRITE_PNG_FILTER, IMWRITE_PXM_BINARY, IMWRITE_EXR_TYPE, IMWRITE_EXR_COMPRESSION, IMWRITE_EXR_DWA_COMPRESSION_LEVEL, IMWRITE_WEBP_QUALITY, IMWRITE_HDR_COMPRESSION, IMWRITE_PAM_TUPLETYPE, IMWRITE_TIFF_RESUNIT, IMWRITE_TIFF_XDPI, IMWRITE_TIFF_YDPI, IMWRITE_TIFF_COMPRESSION, IMWRITE_TIFF_ROWSPERSTRIP, IMWRITE_TIFF_PREDICTOR, IMWRITE_JPEG2000_COMPRESSION_X1000, IMWRITE_AVIF_QUALITY, IMWRITE_AVIF_DEPTH, IMWRITE_AVIF_SPEED, IMWRITE_JPEGXL_QUALITY, IMWRITE_JPEGXL_EFFORT, IMWRITE_JPEGXL_DISTANCE, IMWRITE_JPEGXL_DECODING_SPEED, IMWRITE_GIF_LOOP, IMWRITE_GIF_SPEED, IMWRITE_GIF_QUALITY, IMWRITE_GIF_DITHER, IMWRITE_GIF_TRANSPARENCY, IMWRITE_GIF_COLORTABLE]"""
 
 IMWRITE_JPEG_SAMPLING_FACTOR_411: int
 IMWRITE_JPEG_SAMPLING_FACTOR_420: int
@@ -1325,6 +1328,16 @@ IMWRITE_PNG_STRATEGY_FIXED: int
 ImwritePNGFlags = int
 """One of [IMWRITE_PNG_STRATEGY_DEFAULT, IMWRITE_PNG_STRATEGY_FILTERED, IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY, IMWRITE_PNG_STRATEGY_RLE, IMWRITE_PNG_STRATEGY_FIXED]"""
 
+IMWRITE_PNG_FILTER_NONE: int
+IMWRITE_PNG_FILTER_SUB: int
+IMWRITE_PNG_FILTER_UP: int
+IMWRITE_PNG_FILTER_AVG: int
+IMWRITE_PNG_FILTER_PAETH: int
+IMWRITE_PNG_FAST_FILTERS: int
+IMWRITE_PNG_ALL_FILTERS: int
+ImwritePNGFilterFlags = int
+"""One of [IMWRITE_PNG_FILTER_NONE, IMWRITE_PNG_FILTER_SUB, IMWRITE_PNG_FILTER_UP, IMWRITE_PNG_FILTER_AVG, IMWRITE_PNG_FILTER_PAETH, IMWRITE_PNG_FAST_FILTERS, IMWRITE_PNG_ALL_FILTERS]"""
+
 IMWRITE_PAM_FORMAT_NULL: int
 IMWRITE_PAM_FORMAT_BLACKANDWHITE: int
 IMWRITE_PAM_FORMAT_GRAYSCALE: int
@@ -1350,6 +1363,14 @@ IMWRITE_GIF_COLORTABLE_SIZE_256: int
 ImwriteGIFCompressionFlags = int
 """One of [IMWRITE_GIF_FAST_NO_DITHER, IMWRITE_GIF_FAST_FLOYD_DITHER, IMWRITE_GIF_COLORTABLE_SIZE_8, IMWRITE_GIF_COLORTABLE_SIZE_16, IMWRITE_GIF_COLORTABLE_SIZE_32, IMWRITE_GIF_COLORTABLE_SIZE_64, IMWRITE_GIF_COLORTABLE_SIZE_128, IMWRITE_GIF_COLORTABLE_SIZE_256]"""
 
+IMAGE_METADATA_UNKNOWN: int
+IMAGE_METADATA_EXIF: int
+IMAGE_METADATA_XMP: int
+IMAGE_METADATA_ICCP: int
+IMAGE_METADATA_MAX: int
+ImageMetadataType = int
+"""One of [IMAGE_METADATA_UNKNOWN, IMAGE_METADATA_EXIF, IMAGE_METADATA_XMP, IMAGE_METADATA_ICCP, IMAGE_METADATA_MAX]"""
+
 CAP_ANY: int
 CAP_VFW: int
 CAP_V4L: int
@@ -1903,10 +1924,12 @@ QRCODE_ENCODER_CORRECT_LEVEL_H: int
 QRCodeEncoder_CorrectionLevel = int
 """One of [QRCodeEncoder_CORRECT_LEVEL_L, QRCODE_ENCODER_CORRECT_LEVEL_L, QRCodeEncoder_CORRECT_LEVEL_M, QRCODE_ENCODER_CORRECT_LEVEL_M, QRCodeEncoder_CORRECT_LEVEL_Q, QRCODE_ENCODER_CORRECT_LEVEL_Q, QRCodeEncoder_CORRECT_LEVEL_H, QRCODE_ENCODER_CORRECT_LEVEL_H]"""
 
+QRCodeEncoder_ECI_SHIFT_JIS: int
+QRCODE_ENCODER_ECI_SHIFT_JIS: int
 QRCodeEncoder_ECI_UTF8: int
 QRCODE_ENCODER_ECI_UTF8: int
 QRCodeEncoder_ECIEncodings = int
-"""One of [QRCodeEncoder_ECI_UTF8, QRCODE_ENCODER_ECI_UTF8]"""
+"""One of [QRCodeEncoder_ECI_SHIFT_JIS, QRCODE_ENCODER_ECI_SHIFT_JIS, QRCodeEncoder_ECI_UTF8, QRCODE_ENCODER_ECI_UTF8]"""
 
 FaceRecognizerSF_FR_COSINE: int
 FACE_RECOGNIZER_SF_FR_COSINE: int
@@ -2845,7 +2868,7 @@ class MergeRobertson(MergeExposures):
     def process(self, src: _typing.Sequence[UMat], times: UMat, dst: UMat | None = ...) -> UMat: ...
 
 
-class Feature2D:
+class Feature2D(Algorithm):
     # Functions
     @_typing.overload
     def detect(self, image: cv2.typing.MatLike, mask: cv2.typing.MatLike | None = ...) -> _typing.Sequence[KeyPoint]: ...
@@ -3379,9 +3402,18 @@ class Animation:
     bgcolor: cv2.typing.Scalar
     durations: _typing.Sequence[int]
     frames: _typing.Sequence[cv2.typing.MatLike]
+    still_image: cv2.typing.MatLike
+
+    # Functions
+    def __init__(self, loopCount: int = ..., bgColor: cv2.typing.Scalar = ...) -> None: ...
+
 
 class IStreamReader:
-    ...
+    # Functions
+    def read(self, buffer: str, size: int) -> int: ...
+
+    def seek(self, offset: int, origin: int) -> int: ...
+
 
 class VideoCapture:
     # Functions
@@ -3783,6 +3815,8 @@ class QRCodeDetector(GraphicalCodeDetector):
     @_typing.overload
     def detectAndDecodeCurved(self, img: UMat, points: UMat | None = ..., straight_qrcode: UMat | None = ...) -> tuple[str, UMat, UMat]: ...
 
+    def getEncoding(self, codeIdx: int = ...) -> QRCodeEncoder_ECIEncodings: ...
+
 
 class GraphicalCodeDetector:
     # Functions
@@ -3816,6 +3850,26 @@ class GraphicalCodeDetector:
     @_typing.overload
     def detectAndDecodeMulti(self, img: UMat, points: UMat | None = ..., straight_code: _typing.Sequence[UMat] | None = ...) -> tuple[bool, _typing.Sequence[str], UMat, _typing.Sequence[UMat]]: ...
 
+    @_typing.overload
+    def detectAndDecodeBytes(self, img: cv2.typing.MatLike, points: cv2.typing.MatLike | None = ..., straight_code: cv2.typing.MatLike | None = ...) -> tuple[bytes, cv2.typing.MatLike, cv2.typing.MatLike]: ...
+    @_typing.overload
+    def detectAndDecodeBytes(self, img: UMat, points: UMat | None = ..., straight_code: UMat | None = ...) -> tuple[bytes, UMat, UMat]: ...
+
+    @_typing.overload
+    def decodeBytes(self, img: cv2.typing.MatLike, points: cv2.typing.MatLike, straight_code: cv2.typing.MatLike | None = ...) -> tuple[bytes, cv2.typing.MatLike]: ...
+    @_typing.overload
+    def decodeBytes(self, img: UMat, points: UMat, straight_code: UMat | None = ...) -> tuple[bytes, UMat]: ...
+
+    @_typing.overload
+    def decodeBytesMulti(self, img: cv2.typing.MatLike, points: cv2.typing.MatLike, straight_code: _typing.Sequence[cv2.typing.MatLike] | None = ...) -> tuple[bool, _typing.Sequence[bytes], _typing.Sequence[cv2.typing.MatLike]]: ...
+    @_typing.overload
+    def decodeBytesMulti(self, img: UMat, points: UMat, straight_code: _typing.Sequence[UMat] | None = ...) -> tuple[bool, _typing.Sequence[bytes], _typing.Sequence[UMat]]: ...
+
+    @_typing.overload
+    def detectAndDecodeBytesMulti(self, img: cv2.typing.MatLike, points: cv2.typing.MatLike | None = ..., straight_code: _typing.Sequence[cv2.typing.MatLike] | None = ...) -> tuple[bool, _typing.Sequence[bytes], cv2.typing.MatLike, _typing.Sequence[cv2.typing.MatLike]]: ...
+    @_typing.overload
+    def detectAndDecodeBytesMulti(self, img: UMat, points: UMat | None = ..., straight_code: _typing.Sequence[UMat] | None = ...) -> tuple[bool, _typing.Sequence[bytes], UMat, _typing.Sequence[UMat]]: ...
+
 
 class QRCodeDetectorAruco(GraphicalCodeDetector):
     # Classes
@@ -4393,7 +4447,11 @@ class TrackerGOTURN(Tracker):
 
     # Functions
     @classmethod
+    @_typing.overload
     def create(cls, parameters: TrackerGOTURN.Params = ...) -> TrackerGOTURN: ...
+    @classmethod
+    @_typing.overload
+    def create(cls, model: cv2.dnn.Net) -> TrackerGOTURN: ...
 
 
 class TrackerDaSiamRPN(Tracker):
@@ -4412,7 +4470,11 @@ class TrackerDaSiamRPN(Tracker):
 
     # Functions
     @classmethod
+    @_typing.overload
     def create(cls, parameters: TrackerDaSiamRPN.Params = ...) -> TrackerDaSiamRPN: ...
+    @classmethod
+    @_typing.overload
+    def create(cls, siam_rpn: cv2.dnn.Net, kernel_cls1: cv2.dnn.Net, kernel_r1: cv2.dnn.Net) -> TrackerDaSiamRPN: ...
 
     def getTrackingScore(self) -> float: ...
 
@@ -4432,7 +4494,11 @@ class TrackerNano(Tracker):
 
     # Functions
     @classmethod
+    @_typing.overload
     def create(cls, parameters: TrackerNano.Params = ...) -> TrackerNano: ...
+    @classmethod
+    @_typing.overload
+    def create(cls, backbone: cv2.dnn.Net, neckhead: cv2.dnn.Net) -> TrackerNano: ...
 
     def getTrackingScore(self) -> float: ...
 
@@ -4454,7 +4520,11 @@ class TrackerVit(Tracker):
 
     # Functions
     @classmethod
+    @_typing.overload
     def create(cls, parameters: TrackerVit.Params = ...) -> TrackerVit: ...
+    @classmethod
+    @_typing.overload
+    def create(cls, model: cv2.dnn.Net, meanvalue: cv2.typing.Scalar = ..., stdvalue: cv2.typing.Scalar = ..., tracking_score_threshold: float = ...) -> TrackerVit: ...
 
     def getTrackingScore(self) -> float: ...
 
@@ -4702,10 +4772,6 @@ class PyRotationWarper:
     @_typing.overload
     def warpPoint(self, pt: cv2.typing.Point2f, K: UMat, R: UMat) -> cv2.typing.Point2f: ...
 
-    @_typing.overload
-    def warpPointBackward(self, pt: cv2.typing.Point2f, K: cv2.typing.MatLike, R: cv2.typing.MatLike) -> cv2.typing.Point2f: ...
-    @_typing.overload
-    def warpPointBackward(self, pt: cv2.typing.Point2f, K: UMat, R: UMat) -> cv2.typing.Point2f: ...
     @_typing.overload
     def warpPointBackward(self, pt: cv2.typing.Point2f, K: cv2.typing.MatLike, R: cv2.typing.MatLike) -> cv2.typing.Point2f: ...
     @_typing.overload
@@ -4852,6 +4918,11 @@ def HoughCircles(image: cv2.typing.MatLike, method: int, dp: float, minDist: flo
 @_typing.overload
 def HoughCircles(image: UMat, method: int, dp: float, minDist: float, circles: UMat | None = ..., param1: float = ..., param2: float = ..., minRadius: int = ..., maxRadius: int = ...) -> UMat: ...
 
+@_typing.overload
+def HoughCirclesWithAccumulator(image: cv2.typing.MatLike, method: int, dp: float, minDist: float, circles: cv2.typing.MatLike | None = ..., param1: float = ..., param2: float = ..., minRadius: int = ..., maxRadius: int = ...) -> cv2.typing.MatLike: ...
+@_typing.overload
+def HoughCirclesWithAccumulator(image: UMat, method: int, dp: float, minDist: float, circles: UMat | None = ..., param1: float = ..., param2: float = ..., minRadius: int = ..., maxRadius: int = ...) -> UMat: ...
+
 @_typing.overload
 def HoughLines(image: cv2.typing.MatLike, rho: float, theta: float, threshold: int, lines: cv2.typing.MatLike | None = ..., srn: float = ..., stn: float = ..., min_theta: float = ..., max_theta: float = ..., use_edgeval: bool = ...) -> cv2.typing.MatLike: ...
 @_typing.overload
@@ -4868,9 +4939,9 @@ def HoughLinesPointSet(point: cv2.typing.MatLike, lines_max: int, threshold: int
 def HoughLinesPointSet(point: UMat, lines_max: int, threshold: int, min_rho: float, max_rho: float, rho_step: float, min_theta: float, max_theta: float, theta_step: float, lines: UMat | None = ...) -> UMat: ...
 
 @_typing.overload
-def HoughLinesWithAccumulator(image: cv2.typing.MatLike, rho: float, theta: float, threshold: int, lines: cv2.typing.MatLike | None = ..., srn: float = ..., stn: float = ..., min_theta: float = ..., max_theta: float = ...) -> cv2.typing.MatLike: ...
+def HoughLinesWithAccumulator(image: cv2.typing.MatLike, rho: float, theta: float, threshold: int, lines: cv2.typing.MatLike | None = ..., srn: float = ..., stn: float = ..., min_theta: float = ..., max_theta: float = ..., use_edgeval: bool = ...) -> cv2.typing.MatLike: ...
 @_typing.overload
-def HoughLinesWithAccumulator(image: UMat, rho: float, theta: float, threshold: int, lines: UMat | None = ..., srn: float = ..., stn: float = ..., min_theta: float = ..., max_theta: float = ...) -> UMat: ...
+def HoughLinesWithAccumulator(image: UMat, rho: float, theta: float, threshold: int, lines: UMat | None = ..., srn: float = ..., stn: float = ..., min_theta: float = ..., max_theta: float = ..., use_edgeval: bool = ...) -> UMat: ...
 
 @_typing.overload
 def HuMoments(m: cv2.typing.Moments, hu: cv2.typing.MatLike | None = ...) -> cv2.typing.MatLike: ...
@@ -5789,6 +5860,11 @@ def getCPUFeaturesLine() -> str: ...
 
 def getCPUTickCount() -> int: ...
 
+@_typing.overload
+def getClosestEllipsePoints(ellipse_params: cv2.typing.RotatedRect, points: cv2.typing.MatLike, closest_pts: cv2.typing.MatLike | None = ...) -> cv2.typing.MatLike: ...
+@_typing.overload
+def getClosestEllipsePoints(ellipse_params: cv2.typing.RotatedRect, points: UMat, closest_pts: UMat | None = ...) -> UMat: ...
+
 def getDefaultAlgorithmHint() -> AlgorithmHint: ...
 
 @_typing.overload
@@ -5915,9 +5991,19 @@ def illuminationChange(src: UMat, mask: UMat, dst: UMat | None = ..., alpha: flo
 def imcount(filename: str, flags: int = ...) -> int: ...
 
 @_typing.overload
-def imdecode(buf: cv2.typing.MatLike, flags: int) -> cv2.typing.MatLike: ...
+def imdecode(buf: cv2.typing.MatLike, flags: int) -> cv2.typing.MatLike | None: ...
 @_typing.overload
-def imdecode(buf: UMat, flags: int) -> cv2.typing.MatLike: ...
+def imdecode(buf: UMat, flags: int) -> cv2.typing.MatLike | None: ...
+
+@_typing.overload
+def imdecodeWithMetadata(buf: cv2.typing.MatLike, metadata: _typing.Sequence[cv2.typing.MatLike] | None = ..., flags: int = ...) -> tuple[cv2.typing.MatLike, _typing.Sequence[int], _typing.Sequence[cv2.typing.MatLike]]: ...
+@_typing.overload
+def imdecodeWithMetadata(buf: UMat, metadata: _typing.Sequence[UMat] | None = ..., flags: int = ...) -> tuple[cv2.typing.MatLike, _typing.Sequence[int], _typing.Sequence[UMat]]: ...
+
+@_typing.overload
+def imdecodeanimation(buf: cv2.typing.MatLike, start: int = ..., count: int = ...) -> tuple[bool, Animation]: ...
+@_typing.overload
+def imdecodeanimation(buf: UMat, start: int = ..., count: int = ...) -> tuple[bool, Animation]: ...
 
 @_typing.overload
 def imdecodemulti(buf: cv2.typing.MatLike, flags: int, mats: _typing.Sequence[cv2.typing.MatLike] | None = ..., range: cv2.typing.Range = ...) -> tuple[bool, _typing.Sequence[cv2.typing.MatLike]]: ...
@@ -5929,17 +6015,29 @@ def imencode(ext: str, img: cv2.typing.MatLike, params: _typing.Sequence[int] =
 @_typing.overload
 def imencode(ext: str, img: UMat, params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
 
+@_typing.overload
+def imencodeWithMetadata(ext: str, img: cv2.typing.MatLike, metadataTypes: _typing.Sequence[int], metadata: _typing.Sequence[cv2.typing.MatLike], params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
+@_typing.overload
+def imencodeWithMetadata(ext: str, img: UMat, metadataTypes: _typing.Sequence[int], metadata: _typing.Sequence[UMat], params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
+
+def imencodeanimation(ext: str, animation: Animation, params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
+
 @_typing.overload
 def imencodemulti(ext: str, imgs: _typing.Sequence[cv2.typing.MatLike], params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
 @_typing.overload
 def imencodemulti(ext: str, imgs: _typing.Sequence[UMat], params: _typing.Sequence[int] = ...) -> tuple[bool, numpy.ndarray[_typing.Any, numpy.dtype[numpy.uint8]]]: ...
 
 @_typing.overload
-def imread(filename: str, flags: int = ...) -> cv2.typing.MatLike: ...
+def imread(filename: str, flags: int = ...) -> cv2.typing.MatLike | None: ...
 @_typing.overload
-def imread(filename: str, dst: cv2.typing.MatLike | None = ..., flags: int = ...) -> cv2.typing.MatLike: ...
+def imread(filename: str, dst: cv2.typing.MatLike | None = ..., flags: int = ...) -> cv2.typing.MatLike | None: ...
 @_typing.overload
-def imread(filename: str, dst: UMat | None = ..., flags: int = ...) -> UMat: ...
+def imread(filename: str, dst: UMat | None = ..., flags: int = ...) -> UMat | None: ...
+
+@_typing.overload
+def imreadWithMetadata(filename: str, metadata: _typing.Sequence[cv2.typing.MatLike] | None = ..., flags: int = ...) -> tuple[cv2.typing.MatLike, _typing.Sequence[int], _typing.Sequence[cv2.typing.MatLike]]: ...
+@_typing.overload
+def imreadWithMetadata(filename: str, metadata: _typing.Sequence[UMat] | None = ..., flags: int = ...) -> tuple[cv2.typing.MatLike, _typing.Sequence[int], _typing.Sequence[UMat]]: ...
 
 def imreadanimation(filename: str, start: int = ..., count: int = ...) -> tuple[bool, Animation]: ...
 
@@ -5960,6 +6058,11 @@ def imwrite(filename: str, img: cv2.typing.MatLike, params: _typing.Sequence[int
 @_typing.overload
 def imwrite(filename: str, img: UMat, params: _typing.Sequence[int] = ...) -> bool: ...
 
+@_typing.overload
+def imwriteWithMetadata(filename: str, img: cv2.typing.MatLike, metadataTypes: _typing.Sequence[int], metadata: _typing.Sequence[cv2.typing.MatLike], params: _typing.Sequence[int] = ...) -> bool: ...
+@_typing.overload
+def imwriteWithMetadata(filename: str, img: UMat, metadataTypes: _typing.Sequence[int], metadata: _typing.Sequence[UMat], params: _typing.Sequence[int] = ...) -> bool: ...
+
 def imwriteanimation(filename: str, animation: Animation, params: _typing.Sequence[int] = ...) -> bool: ...
 
 @_typing.overload
@@ -6560,6 +6663,11 @@ def threshold(src: cv2.typing.MatLike, thresh: float, maxval: float, type: int,
 @_typing.overload
 def threshold(src: UMat, thresh: float, maxval: float, type: int, dst: UMat | None = ...) -> tuple[float, UMat]: ...
 
+@_typing.overload
+def thresholdWithMask(src: cv2.typing.MatLike, dst: cv2.typing.MatLike, mask: cv2.typing.MatLike, thresh: float, maxval: float, type: int) -> tuple[float, cv2.typing.MatLike]: ...
+@_typing.overload
+def thresholdWithMask(src: UMat, dst: UMat, mask: UMat, thresh: float, maxval: float, type: int) -> tuple[float, UMat]: ...
+
 @_typing.overload
 def trace(mtx: cv2.typing.MatLike) -> cv2.typing.Scalar: ...
 @_typing.overload

cv2/aruco/__init__.pyi

@@ -175,7 +175,10 @@ class RefineParameters:
 
 class ArucoDetector(cv2.Algorithm):
     # Functions
+    @_typing.overload
     def __init__(self, dictionary: Dictionary = ..., detectorParams: DetectorParameters = ..., refineParams: RefineParameters = ...) -> None: ...
+    @_typing.overload
+    def __init__(self, dictionaries: _typing.Sequence[Dictionary], detectorParams: DetectorParameters = ..., refineParams: RefineParameters = ...) -> None: ...
 
     @_typing.overload
     def detectMarkers(self, image: cv2.typing.MatLike, corners: _typing.Sequence[cv2.typing.MatLike] | None = ..., ids: cv2.typing.MatLike | None = ..., rejectedImgPoints: _typing.Sequence[cv2.typing.MatLike] | None = ...) -> tuple[_typing.Sequence[cv2.typing.MatLike], cv2.typing.MatLike, _typing.Sequence[cv2.typing.MatLike]]: ...
@@ -187,10 +190,19 @@ class ArucoDetector(cv2.Algorithm):
     @_typing.overload
     def refineDetectedMarkers(self, image: cv2.UMat, board: Board, detectedCorners: _typing.Sequence[cv2.UMat], detectedIds: cv2.UMat, rejectedCorners: _typing.Sequence[cv2.UMat], cameraMatrix: cv2.UMat | None = ..., distCoeffs: cv2.UMat | None = ..., recoveredIdxs: cv2.UMat | None = ...) -> tuple[_typing.Sequence[cv2.UMat], cv2.UMat, _typing.Sequence[cv2.UMat], cv2.UMat]: ...
 
+    @_typing.overload
+    def detectMarkersMultiDict(self, image: cv2.typing.MatLike, corners: _typing.Sequence[cv2.typing.MatLike] | None = ..., ids: cv2.typing.MatLike | None = ..., rejectedImgPoints: _typing.Sequence[cv2.typing.MatLike] | None = ..., dictIndices: cv2.typing.MatLike | None = ...) -> tuple[_typing.Sequence[cv2.typing.MatLike], cv2.typing.MatLike, _typing.Sequence[cv2.typing.MatLike], cv2.typing.MatLike]: ...
+    @_typing.overload
+    def detectMarkersMultiDict(self, image: cv2.UMat, corners: _typing.Sequence[cv2.UMat] | None = ..., ids: cv2.UMat | None = ..., rejectedImgPoints: _typing.Sequence[cv2.UMat] | None = ..., dictIndices: cv2.UMat | None = ...) -> tuple[_typing.Sequence[cv2.UMat], cv2.UMat, _typing.Sequence[cv2.UMat], cv2.UMat]: ...
+
     def getDictionary(self) -> Dictionary: ...
 
     def setDictionary(self, dictionary: Dictionary) -> None: ...
 
+    def getDictionaries(self) -> _typing.Sequence[Dictionary]: ...
+
+    def setDictionaries(self, dictionaries: _typing.Sequence[Dictionary]) -> None: ...
+
     def getDetectorParameters(self) -> DetectorParameters: ...
 
     def setDetectorParameters(self, detectorParameters: DetectorParameters) -> None: ...
@@ -243,6 +255,7 @@ class CharucoParameters:
     distCoeffs: cv2.typing.MatLike
     minMarkers: int
     tryRefineMarkers: bool
+    checkMarkers: bool
 
     # Functions
     def __init__(self) -> None: ...

cv2/config.py

@@ -1,5 +1,5 @@
 import os
 
 BINARIES_PATHS = [
-    os.path.join(os.path.join(LOADER_DIR, '../../'), 'x64/vc14/bin')
+    os.path.join(os.path.join(LOADER_DIR, '../../'), 'x64/vc17/bin')
 ] + BINARIES_PATHS

cv2/cuda/__init__.pyi

@@ -174,6 +174,8 @@ class GpuMat:
     @_typing.overload
     def setTo(self, s: cv2.typing.Scalar, mask: cv2.UMat, stream: Stream) -> GpuMat: ...
 
+    @_typing.overload
+    def convertTo(self, rtype: int, dst: GpuMat | None = ...) -> GpuMat: ...
     @_typing.overload
     def convertTo(self, rtype: int, stream: Stream, dst: GpuMat | None = ...) -> GpuMat: ...
     @_typing.overload

cv2/dnn/__init__.pyi

@@ -142,6 +142,8 @@ class Net:
 
     def connect(self, outPin: str, inpPin: str) -> None: ...
 
+    def registerOutput(self, outputName: str, layerId: int, outputPort: int) -> int: ...
+
     def setInputsNames(self, inputBlobNames: _typing.Sequence[str]) -> None: ...
 
     def setInputShape(self, inputName: str, shape: cv2.typing.MatShape) -> None: ...

cv2/fisheye/__init__.pyi

@@ -56,6 +56,11 @@ def solvePnP(objectPoints: cv2.typing.MatLike, imagePoints: cv2.typing.MatLike,
 @_typing.overload
 def solvePnP(objectPoints: cv2.UMat, imagePoints: cv2.UMat, cameraMatrix: cv2.UMat, distCoeffs: cv2.UMat, rvec: cv2.UMat | None = ..., tvec: cv2.UMat | None = ..., useExtrinsicGuess: bool = ..., flags: int = ..., criteria: cv2.typing.TermCriteria = ...) -> tuple[bool, cv2.UMat, cv2.UMat]: ...
 
+@_typing.overload
+def solvePnPRansac(objectPoints: cv2.typing.MatLike, imagePoints: cv2.typing.MatLike, cameraMatrix: cv2.typing.MatLike, distCoeffs: cv2.typing.MatLike, rvec: cv2.typing.MatLike | None = ..., tvec: cv2.typing.MatLike | None = ..., useExtrinsicGuess: bool = ..., iterationsCount: int = ..., reprojectionError: float = ..., confidence: float = ..., inliers: cv2.typing.MatLike | None = ..., flags: int = ..., criteria: cv2.typing.TermCriteria = ...) -> tuple[bool, cv2.typing.MatLike, cv2.typing.MatLike, cv2.typing.MatLike]: ...
+@_typing.overload
+def solvePnPRansac(objectPoints: cv2.UMat, imagePoints: cv2.UMat, cameraMatrix: cv2.UMat, distCoeffs: cv2.UMat, rvec: cv2.UMat | None = ..., tvec: cv2.UMat | None = ..., useExtrinsicGuess: bool = ..., iterationsCount: int = ..., reprojectionError: float = ..., confidence: float = ..., inliers: cv2.UMat | None = ..., flags: int = ..., criteria: cv2.typing.TermCriteria = ...) -> tuple[bool, cv2.UMat, cv2.UMat, cv2.UMat]: ...
+
 @_typing.overload
 def stereoCalibrate(objectPoints: _typing.Sequence[cv2.typing.MatLike], imagePoints1: _typing.Sequence[cv2.typing.MatLike], imagePoints2: _typing.Sequence[cv2.typing.MatLike], K1: cv2.typing.MatLike, D1: cv2.typing.MatLike, K2: cv2.typing.MatLike, D2: cv2.typing.MatLike, imageSize: cv2.typing.Size, R: cv2.typing.MatLike | None = ..., T: cv2.typing.MatLike | None = ..., rvecs: _typing.Sequence[cv2.typing.MatLike] | None = ..., tvecs: _typing.Sequence[cv2.typing.MatLike] | None = ..., flags: int = ..., criteria: cv2.typing.TermCriteria = ...) -> tuple[float, cv2.typing.MatLike, cv2.typing.MatLike, cv2.typing.MatLike, cv2.typing.MatLike, cv2.typing.MatLike, cv2.typing.MatLike, _typing.Sequence[cv2.typing.MatLike], _typing.Sequence[cv2.typing.MatLike]]: ...
 @_typing.overload

cv2/typing/__init__.py

@@ -58,11 +58,11 @@ __all__ = [
     "ExtractMetaCallback",
 ]
 
-import cv2
 import typing as _typing
+import numpy
 import cv2.gapi.wip.draw
+import cv2
 import cv2.dnn
-import numpy
 import cv2.mat_wrapper
 
 
@@ -98,8 +98,8 @@ Size = _typing.Sequence[int]
 """Required length is 2"""
 Size2f = _typing.Sequence[float]
 """Required length is 2"""
-Scalar = _typing.Sequence[float]
-"""Required length is at most 4"""
+Scalar = _typing.Union[_typing.Sequence[float], float]
+"""Max sequence length is at most 4"""
 Point = _typing.Sequence[int]
 """Required length is 2"""
 Point2i = Point

cv2/version.py

@@ -1,4 +1,4 @@
-opencv_version = "4.11.0.86"
+opencv_version = "4.12.0.88"
 contrib = True
 headless = True
 rolling = False

cv2/ximgproc/__init__.pyi

@@ -133,6 +133,10 @@ class EdgeDrawing(cv2.Algorithm):
         # Functions
         def __init__(self) -> None: ...
 
+        def read(self, fn: cv2.FileNode) -> None: ...
+
+        def write(self, fs: cv2.FileStorage) -> None: ...
+
 
 
     # Functions