mirror of
https://github.com/opencv/opencv.git
synced 2026-11-16 06:17:53 -06:00
N-D Mats (e.g. NHWC batches from Python) were silently processed as a garbage 2D image by remap() and warpPerspective(). Check src dims up front and raise a descriptive error instead. Fixes #29589
67 lines
2.4 KiB
Python
67 lines
2.4 KiB
Python
#!/usr/bin/env python
|
|
|
|
from __future__ import print_function
|
|
|
|
import numpy as np
|
|
import cv2 as cv
|
|
try:
|
|
from PIL import Image
|
|
except ImportError:
|
|
Image = None
|
|
|
|
from tests_common import NewOpenCVTests
|
|
|
|
class Imgproc_Tests(NewOpenCVTests):
|
|
|
|
def test_python_986(self):
|
|
cntls = []
|
|
img = np.zeros((100,100,3), dtype=np.uint8)
|
|
color = (0,0,0)
|
|
cnts = np.array(cntls, dtype=np.int32).reshape((1, -1, 2))
|
|
try:
|
|
cv.fillPoly(img, cnts, color)
|
|
assert False
|
|
except:
|
|
assert True
|
|
|
|
def test_filter2d(self):
|
|
img = self.get_sample('samples/data/lena.jpg', 1)
|
|
eps = 0.001
|
|
# compare 2 ways of computing 3x3 blur using the same function
|
|
kernel = np.array([[1, 1, 1], [1, 1, 1], [1, 1, 1]], dtype='float32')
|
|
img_blur0 = cv.filter2D(img, cv.CV_32F, kernel*(1./9))
|
|
img_blur1 = cv.filter2Dp(img, kernel, ddepth=cv.CV_32F, scale=1./9)
|
|
self.assertLess(cv.norm(img_blur0 - img_blur1, cv.NORM_INF), eps)
|
|
|
|
def test_resize_pillow(self):
|
|
if Image is None:
|
|
self.skipTest("Pillow is not available")
|
|
|
|
r = np.random.randint(0, 255, size=(128, 147, 3), dtype="uint8")
|
|
target_size=[(128,128), (129,129), (160,160)]
|
|
for ts in target_size:
|
|
|
|
pil_result = np.array(Image.fromarray(r).resize(ts, Image.NEAREST))
|
|
ocv_result = cv.resize(r, dsize=ts, interpolation=cv.INTER_NEAREST_EXACT)
|
|
status = np.all(pil_result == ocv_result)
|
|
print(ts, status)
|
|
self.assertTrue(status, "resize result differs from Pillow for target size %s" % (ts,))
|
|
|
|
def test_warp_reject_nd_input(self):
|
|
# https://github.com/opencv/opencv/issues/29589
|
|
batch = np.zeros((4, 3, 5, 3), dtype=np.uint8)
|
|
map_x, map_y = np.meshgrid(np.arange(5, dtype=np.float32), np.arange(3, dtype=np.float32))
|
|
affine = np.eye(2, 3, dtype=np.float32)
|
|
perspective = np.eye(3, dtype=np.float32)
|
|
|
|
with self.assertRaises(cv.error):
|
|
cv.remap(batch, map_x, map_y, cv.INTER_NEAREST)
|
|
with self.assertRaises(cv.error):
|
|
cv.warpAffine(batch, affine, (5, 3), flags=cv.INTER_NEAREST)
|
|
with self.assertRaises(cv.error):
|
|
cv.warpPerspective(batch, perspective, (5, 3), flags=cv.INTER_NEAREST)
|
|
|
|
# a single HWC image is still accepted
|
|
res = cv.remap(batch[0], map_x, map_y, cv.INTER_NEAREST)
|
|
self.assertEqual(res.shape, (3, 5, 3))
|