mirrors/opencv
2
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-25 04:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29839 from asmorkalov:as/fix_python_types_conflict

Browse Source 
Fixed type conflict in python bindings.
This commit is contained in:
Alexander Smorkalov
2026-09-01 13:40:18 +03:00
committed by GitHub
parent e62a7038d5 ec77d2ea85
commit ed61538c90
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src2/cv2_util.cpp
-2
View File
@@ -47,8 +47,6 @@ int numpyTypeToCvDepth(int typenum)
// 'long' is 64-bit on LP64 but 32-bit on LLP64, so decide by size, not by name. // 'long' is 64-bit on LP64 but 32-bit on LLP64, so decide by size, not by name.
case NPY_LONG: return NPY_SIZEOF_LONG == 8 ? CV_64S : CV_32S; case NPY_LONG: return NPY_SIZEOF_LONG == 8 ? CV_64S : CV_32S;
case NPY_ULONG: return NPY_SIZEOF_LONG == 8 ? CV_64U : CV_32U; case NPY_ULONG: return NPY_SIZEOF_LONG == 8 ? CV_64U : CV_32U;
// Map the 32-bit case: it is numpy's int32 on LLP64, and output arrays cannot be cast.
case NPY_LONG: return NPY_SIZEOF_LONG == 4 ? CV_32S : -1;
case NPY_HALF: return CV_16F; case NPY_HALF: return CV_16F;
case NPY_FLOAT: return CV_32F; case NPY_FLOAT: return CV_32F;
case NPY_DOUBLE: return CV_64F; case NPY_DOUBLE: return CV_64F;