1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2023-06-01 09:37:38 +03:00
565 changed files with 84396 additions and 17589 deletions
+3 -3
View File
@@ -1167,7 +1167,7 @@ void cvCreateTestSamples( const char* infoname,
}
else
{
filename++;
filename++; // character after last / or \
}
count = MIN( count, cvbgdata->count );
@@ -1199,8 +1199,8 @@ void cvCreateTestSamples( const char* infoname,
1, 0.0, 0.0, &data );
sprintf( filename, "%04d_%04d_%04d_%04d_%04d.jpg",
(i + 1), x, y, width, height );
snprintf( filename, sizeof(fullname) - (filename - fullname), "%04d_%04d_%04d_%04d_%04d.jpg",
(i + 1), x, y, width, height );
if( info )
{