Merge branch 4.x

modules/python/test/test_cuda.py

@@ -40,8 +40,14 @@ class cuda_test(NewOpenCVTests):
         cuMat = cv.cuda_GpuMat()
         cuMat.upload(npMat)
         self.assertTrue(cuMat.cudaPtr() != 0)
+        cuMatFromPtrSz = cv.cuda.createGpuMatFromCudaMemory(cuMat.size(),cuMat.type(),cuMat.cudaPtr(), cuMat.step)
+        self.assertTrue(cuMat.cudaPtr() == cuMatFromPtrSz.cudaPtr())
+        cuMatFromPtrRc = cv.cuda.createGpuMatFromCudaMemory(cuMat.size()[1],cuMat.size()[0],cuMat.type(),cuMat.cudaPtr(), cuMat.step)
+        self.assertTrue(cuMat.cudaPtr() == cuMatFromPtrRc.cudaPtr())
         stream = cv.cuda_Stream()
         self.assertTrue(stream.cudaPtr() != 0)
+        streamFromPtr = cv.cuda.wrapStream(stream.cudaPtr())
+        self.assertTrue(stream.cudaPtr() == streamFromPtr.cudaPtr())
         asyncstream = cv.cuda_Stream(1)  # cudaStreamNonBlocking
         self.assertTrue(asyncstream.cudaPtr() != 0)
 

modules/python/test/test_misc.py

@@ -142,6 +142,20 @@ class Bindings(NewOpenCVTests):
         with self.assertRaises(AttributeError):
             obj.except_ = 32
 
+    def test_maketype(self):
+        data = {
+            cv.CV_8UC3: [cv.CV_8U, 3, cv.CV_8UC],
+            cv.CV_16SC1: [cv.CV_16S, 1, cv.CV_16SC],
+            cv.CV_32FC4: [cv.CV_32F, 4, cv.CV_32FC],
+            cv.CV_64FC2: [cv.CV_64F, 2, cv.CV_64FC],
+            cv.CV_8SC4: [cv.CV_8S, 4, cv.CV_8SC],
+            cv.CV_16UC2: [cv.CV_16U, 2, cv.CV_16UC],
+            cv.CV_32SC1: [cv.CV_32S, 1, cv.CV_32SC],
+            cv.CV_16FC3: [cv.CV_16F, 3, cv.CV_16FC],
+        }
+        for ref, (depth, channels, func) in data.items():
+            self.assertEqual(ref, cv.CV_MAKETYPE(depth, channels))
+            self.assertEqual(ref, func(channels))
 
 
 class Arguments(NewOpenCVTests):

modules/python/test/test_norm.py

@@ -88,7 +88,7 @@ def get_element_types(norm_type):
         return (np.uint8,)
     else:
         return (np.uint8, np.int8, np.uint16, np.int16, np.int32, np.float32,
-                np.float64)
+                np.float64, np.float16)
 
 
 def generate_vector(shape, dtype):