projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4ae5c0 49e16a3)
Merge branch 'master' of https://github.com/opencv/opencv into interpMultichannelImg
authorArtem Lukoyanov <lukartoil@gmail.com>
Fri, 24 Mar 2017 20:32:44 +0000 (23:32 +0300)
committerArtem Lukoyanov <lukartoil@gmail.com>
Fri, 24 Mar 2017 20:58:51 +0000 (23:58 +0300)
commit84a0a91d16e2fd28b754e8616d7232fd9f213ac2
treeb6294456482f7e70d5cf22714c0f006af9fb0103tree | snapshot
parentc4ae5c0ee52bf04d379dff719e127f7fac0da2dfcommit | diff
parent49e16a3c9f8e9e53c98aa1b85c05420c322c96d2commit | diff
Merge branch 'master' of https://github.com/opencv/opencv into interpMultichannelImg

Added assertios to remap and warpAffine functions

As @mshabunin said, remap and warpAffine functions do not support more than 4 channels in
Bicubic and Lanczos4 interpolation modes. Assertions were added. Appropriate test was chenged.
resolves #8272
modules/imgproc/src/imgwarp.cpp diff1 | diff2 | blob | history
modules/imgproc/test/test_imgwarp.cpp diff1 | diff2 | blob | history
Domain: Multimedia / Media Vision;