potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2022-08-21 14:55:48 +00:00
parent 99d216c8d4 925ff6241f
commit c25f776151
538 changed files with 84703 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/CMakeLists.txt
+1 -1
View File
@@ -35,7 +35,7 @@ add_subdirectory(python3)
else() # standalone build
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8.12.2)
project(OpenCVPython CXX C)
include("./standalone.cmake")
modules/python/package/cv2/__init__.py
+1 -1
View File
@@ -89,7 +89,7 @@ def bootstrap():
BINARIES_PATHS = []
g_vars = globals()
l_vars = locals()
l_vars = locals().copy()
if sys.version_info[:2] < (3, 0):
from . load_config_py2 import exec_file_wrapper
modules/python/src2/pycompat.hpp
+2 -2
View File
@@ -234,7 +234,7 @@ PyObject* pyopencv_from(const TYPE& src)
static PyObject* pyopencv_##CLASS_ID##_repr(PyObject* self) \
{ \
char str[1000]; \
sprintf(str, "< " MODULESTR SCOPE"."#EXPORT_NAME" %p>", self); \
snprintf(str, sizeof(str), "< " MODULESTR SCOPE"."#EXPORT_NAME" %p>", self); \
return PyString_FromString(str); \
}
@@ -294,7 +294,7 @@ PyObject* pyopencv_from(const TYPE& src)
static PyObject* pyopencv_##CLASS_ID##_repr(PyObject* self) \
{ \
char str[1000]; \
sprintf(str, "< " MODULESTR SCOPE"."#EXPORT_NAME" %p>", self); \
snprintf(str, sizeof(str), "< " MODULESTR SCOPE"."#EXPORT_NAME" %p>", self); \
return PyString_FromString(str); \
} \
static PyType_Slot pyopencv_##CLASS_ID##_Slots[] = \
modules/python/test/test_cuda.py
+19
View File
@@ -45,5 +45,24 @@ class cuda_test(NewOpenCVTests):
asyncstream = cv.cuda_Stream(1) # cudaStreamNonBlocking
self.assertTrue(asyncstream.cudaPtr() != 0)
def test_cuda_buffer_pool(self):
cv.cuda.setBufferPoolUsage(True)
cv.cuda.setBufferPoolConfig(cv.cuda.getDevice(), 1024 * 1024 * 64, 2)
stream_a = cv.cuda.Stream()
pool_a = cv.cuda.BufferPool(stream_a)
cuMat = pool_a.getBuffer(1024, 1024, cv.CV_8UC3)
cv.cuda.setBufferPoolUsage(False)
self.assertEqual(cuMat.size(), (1024, 1024))
self.assertEqual(cuMat.type(), cv.CV_8UC3)
def test_cuda_release(self):
npMat = (np.random.random((128, 128, 3)) * 255).astype(np.uint8)
cuMat = cv.cuda_GpuMat()
cuMat.upload(npMat)
cuMat.release()
self.assertTrue(cuMat.cudaPtr() == 0)
self.assertTrue(cuMat.step == 0)
self.assertTrue(cuMat.size() == (0, 0))
if __name__ == '__main__':
NewOpenCVTests.bootstrap()