Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-13 05:42:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2023-01-21 18:19:39 +00:00
parent 3085fc6345 b71a168937
commit 18cbfa4a4f
74 changed files with 249 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/cpp/calibration.cpp
View File

@@ -496,7 +496,7 @@ int main( int argc, char** argv )
view0.copyTo(view);
}
else if( i < (int)imageList.size() )
view = imread(imageList[i], 1);
view = imread(imageList[i], IMREAD_COLOR);
if(view.empty())
{
@@ -621,7 +621,7 @@ int main( int argc, char** argv )
for( i = 0; i < (int)imageList.size(); i++ )
{
view = imread(imageList[i], 1);
view = imread(imageList[i], IMREAD_COLOR);
if(view.empty())
continue;
remap(view, rview, map1, map2, INTER_LINEAR);