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
2023-01-28 13:08:29 +00:00
parent 8329c09ba8 cd44aa0bb1
commit f33598f55e
91 changed files with 1245 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/cpp/3calibration.cpp
+2 -2
View File
@@ -252,7 +252,7 @@ int main( int argc, char** argv )
{
int k1 = k == 0 ? 2 : k == 1 ? 0 : 1;
printf("%s\n", imageList[i*3+k].c_str());
view = imread(imageList[i*3+k], 1);
view = imread(imageList[i*3+k], IMREAD_COLOR);
if(!view.empty())
{
@@ -340,7 +340,7 @@ int main( int argc, char** argv )
{
int k1 = k == 0 ? 2 : k == 1 ? 0 : 1;
int k2 = k == 0 ? 1 : k == 1 ? 0 : 2;
view = imread(imageList[i*3+k], 1);
view = imread(imageList[i*3+k], IMREAD_COLOR);
if(view.empty())
continue;