potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-04-20 16:44:22 +03:00
parent 4c06a721ef fd8b346c3e
commit e4a29d93fe
26 changed files with 336 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/flann/src/miniflann.cpp
+4 -5
View File
@@ -806,10 +806,13 @@ bool Index::load_(const String& filename)
bool ok = true;
FILE* fin = fopen(filename.c_str(), "rb");
if (fin == NULL)
if (fin == NULL) {
return false;
}
FILEScopeGuard fscgd(fin);
::cvflann::IndexHeader header = ::cvflann::load_header(fin);
algo = header.index_type;
featureType = header.data_type == FLANN_UINT8 ? CV_8U :
header.data_type == FLANN_INT8 ? CV_8S :
@@ -824,7 +827,6 @@ bool Index::load_(const String& filename)
{
fprintf(stderr, "Reading FLANN index error: the saved data size (%d, %d) or type (%d) is different from the passed one (%d, %d), %d\n",
(int)header.rows, (int)header.cols, featureType, data.rows, data.cols, data.type());
fclose(fin);
return false;
}
@@ -837,7 +839,6 @@ bool Index::load_(const String& filename)
(distType != FLANN_DIST_HAMMING && featureType == CV_32F)) )
{
fprintf(stderr, "Reading FLANN index error: unsupported feature type %d for the index type %d\n", featureType, algo);
fclose(fin);
return false;
}
@@ -877,8 +878,6 @@ bool Index::load_(const String& filename)
ok = false;
}
if( fin )
fclose(fin);
return ok;
}