mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-30 17:37:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18604 from vrabaud:master

Browse Source
This commit is contained in:
Alexander Alekhin 2020-12-20 15:50:32 +00:00
commit c84d2cb32a
18 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/flann/include/opencv2/flann/all_indices.h
View File

@ -82,7 +82,7 @@ struct index_creator
nnIndex = new LshIndex<Distance>(dataset, params, distance);
break;
default:
throw FLANNException("Unknown index type");
FLANN_THROW(cv::Error::StsBadArg, "Unknown index type");
}
return nnIndex;
@ -111,7 +111,7 @@ struct index_creator<False,VectorSpace,Distance>
nnIndex = new LshIndex<Distance>(dataset, params, distance);
break;
default:
throw FLANNException("Unknown index type");
FLANN_THROW(cv::Error::StsBadArg, "Unknown index type");
}
return nnIndex;
@ -140,7 +140,7 @@ struct index_creator<False,False,Distance>
nnIndex = new LshIndex<Distance>(dataset, params, distance);
break;
default:
throw FLANNException("Unknown index type");
FLANN_THROW(cv::Error::StsBadArg, "Unknown index type");
}
return nnIndex;

1
modules/flann/include/opencv2/flann/autotuned_index.h
View File

@ -34,7 +34,6 @@
#include <sstream>
#include "general.h"
#include "nn_index.h"
#include "ground_truth.h"
#include "index_testing.h"

1
modules/flann/include/opencv2/flann/composite_index.h
View File

@ -33,7 +33,6 @@
//! @cond IGNORED
#include "general.h"
#include "nn_index.h"
#include "kdtree_index.h"
#include "kmeans_index.h"

6
modules/flann/include/opencv2/flann/flann_base.hpp
View File

@ -82,11 +82,11 @@ NNIndex<Distance>* load_saved_index(const Matrix<typename Distance::ElementType>
IndexHeader header = load_header(fin);
if (header.data_type != Datatype<ElementType>::type()) {
fclose(fin);
throw FLANNException("Datatype of saved index is different than of the one to be created.");
FLANN_THROW(cv::Error::StsError, "Datatype of saved index is different than of the one to be created.");
}
if ((size_t(header.rows) != dataset.rows)||(size_t(header.cols) != dataset.cols)) {
fclose(fin);
throw FLANNException("The index saved belongs to a different dataset");
FLANN_THROW(cv::Error::StsError, "The index saved belongs to a different dataset");
}
IndexParams params;
@ -140,7 +140,7 @@ public:
{
FILE* fout = fopen(filename.c_str(), "wb");
if (fout == NULL) {
throw FLANNException("Cannot open file");
FLANN_THROW(cv::Error::StsError, "Cannot open file");
}
save_header(fout, *nnIndex_);
saveIndex(fout);

10
modules/flann/include/opencv2/flann/general.h
View File

@ -31,6 +31,8 @@
#ifndef OPENCV_FLANN_GENERAL_H_
#define OPENCV_FLANN_GENERAL_H_
#if CV_VERSION_MAJOR <= 4
//! @cond IGNORED
#include "opencv2/core.hpp"
@ -48,6 +50,14 @@ public:
}
#define FLANN_THROW(TYPE, STR) throw FLANNException(STR)
#else
#define FLANN_THROW(TYPE, STR) CV_Error(TYPE, STR)
#endif
//! @endcond
#endif /* OPENCV_FLANN_GENERAL_H_ */

4
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
View File

@ -382,7 +382,7 @@ public:
chooseCenters = &HierarchicalClusteringIndex::GroupWiseCenterChooser;
}
else {
throw FLANNException("Unknown algorithm for choosing initial centers.");
FLANN_THROW(cv::Error::StsError, "Unknown algorithm for choosing initial centers.");
}
root = new NodePtr[trees_];
@ -446,7 +446,7 @@ public:
void buildIndex() CV_OVERRIDE
{
if (branching_<2) {
throw FLANNException("Branching factor must be at least 2");
FLANN_THROW(cv::Error::StsError, "Branching factor must be at least 2");
}
free_indices();

2
modules/flann/include/opencv2/flann/index_testing.h
View File

@ -93,7 +93,7 @@ float search_with_ground_truth(NNIndex<Distance>& index, const Matrix<typename D
if (matches.cols<size_t(nn)) {
Logger::info("matches.cols=%d, nn=%d\n",matches.cols,nn);
throw FLANNException("Ground truth is not computed for as many neighbors as requested");
FLANN_THROW(cv::Error::StsError, "Ground truth is not computed for as many neighbors as requested");
}
KNNResultSet<DistanceType> resultSet(nn+skipMatches);

1
modules/flann/include/opencv2/flann/kdtree_index.h
View File

@ -37,7 +37,6 @@
#include <map>
#include <cstring>
#include "general.h"
#include "nn_index.h"
#include "dynamic_bitset.h"
#include "matrix.h"

1
modules/flann/include/opencv2/flann/kdtree_single_index.h
View File

@ -37,7 +37,6 @@
#include <map>
#include <cstring>
#include "general.h"
#include "nn_index.h"
#include "matrix.h"
#include "result_set.h"

6
modules/flann/include/opencv2/flann/kmeans_index.h
View File

@ -381,7 +381,7 @@ public:
chooseCenters = &KMeansIndex::chooseCentersKMeanspp;
}
else {
throw FLANNException("Unknown algorithm for choosing initial centers.");
FLANN_THROW(cv::Error::StsBadArg, "Unknown algorithm for choosing initial centers.");
}
cb_index_ = 0.4f;
@ -453,7 +453,7 @@ public:
void buildIndex() CV_OVERRIDE
{
if (branching_<2) {
throw FLANNException("Branching factor must be at least 2");
FLANN_THROW(cv::Error::StsError, "Branching factor must be at least 2");
}
free_indices();
@ -570,7 +570,7 @@ public:
{
int numClusters = centers.rows;
if (numClusters<1) {
throw FLANNException("Number of clusters must be at least 1");
FLANN_THROW(cv::Error::StsBadArg, "Number of clusters must be at least 1");
}
DistanceType variance;

1
modules/flann/include/opencv2/flann/linear_index.h
View File

@ -33,7 +33,6 @@
//! @cond IGNORED
#include "general.h"
#include "nn_index.h"
namespace cvflann

1
modules/flann/include/opencv2/flann/lsh_index.h
View File

@ -42,7 +42,6 @@
#include <map>
#include <vector>
#include "general.h"
#include "nn_index.h"
#include "matrix.h"
#include "result_set.h"

2
modules/flann/include/opencv2/flann/matrix.h
View File

@ -35,8 +35,6 @@
#include <stdio.h>
#include "general.h"
namespace cvflann
{

1
modules/flann/include/opencv2/flann/nn_index.h
View File

@ -31,7 +31,6 @@
#ifndef OPENCV_FLANN_NNINDEX_H
#define OPENCV_FLANN_NNINDEX_H
#include "general.h"
#include "matrix.h"
#include "result_set.h"
#include "params.h"

2
modules/flann/include/opencv2/flann/params.h
View File

@ -77,7 +77,7 @@ T get_param(const IndexParams& params, cv::String name)
return it->second.cast<T>();
}
else {
throw FLANNException(cv::String("Missing parameter '")+name+cv::String("' in the parameters given"));
FLANN_THROW(cv::Error::StsBadArg, cv::String("Missing parameter '")+name+cv::String("' in the parameters given"));
}
}

2
modules/flann/include/opencv2/flann/random.h
View File

@ -37,8 +37,6 @@
#include <cstdlib>
#include <vector>
#include "general.h"
namespace cvflann
{

14
modules/flann/include/opencv2/flann/saving.h
View File

@ -112,11 +112,11 @@ inline IndexHeader load_header(FILE* stream)
size_t read_size = fread(&header,sizeof(header),1,stream);
if (read_size!=(size_t)1) {
throw FLANNException("Invalid index file, cannot read");
FLANN_THROW(cv::Error::StsError, "Invalid index file, cannot read");
}
if (strcmp(header.signature,FLANN_SIGNATURE_)!=0) {
throw FLANNException("Invalid index file, wrong signature");
FLANN_THROW(cv::Error::StsError, "Invalid index file, wrong signature");
}
return header;
@ -150,7 +150,7 @@ void load_value(FILE* stream, T& value, size_t count = 1)
{
size_t read_cnt = fread(&value, sizeof(value), count, stream);
if (read_cnt != count) {
throw FLANNException("Cannot read from file");
FLANN_THROW(cv::Error::StsParseError, "Cannot read from file");
}
}
@ -159,12 +159,12 @@ void load_value(FILE* stream, cvflann::Matrix<T>& value)
{
size_t read_cnt = fread(&value, sizeof(value), 1, stream);
if (read_cnt != 1) {
throw FLANNException("Cannot read from file");
FLANN_THROW(cv::Error::StsParseError, "Cannot read from file");
}
value.data = new T[value.rows*value.cols];
read_cnt = fread(value.data, sizeof(T), value.rows*value.cols, stream);
if (read_cnt != (size_t)(value.rows*value.cols)) {
throw FLANNException("Cannot read from file");
FLANN_THROW(cv::Error::StsParseError, "Cannot read from file");
}
}
@ -175,12 +175,12 @@ void load_value(FILE* stream, std::vector<T>& value)
size_t size;
size_t read_cnt = fread(&size, sizeof(size_t), 1, stream);
if (read_cnt!=1) {
throw FLANNException("Cannot read from file");
FLANN_THROW(cv::Error::StsError, "Cannot read from file");
}
value.resize(size);
read_cnt = fread(&value[0], sizeof(T), size, stream);
if (read_cnt != size) {
throw FLANNException("Cannot read from file");
FLANN_THROW(cv::Error::StsError, "Cannot read from file");
}
}

1
modules/flann/src/precomp.hpp
View File

@ -13,7 +13,6 @@
#include "opencv2/flann/index_testing.h"
#include "opencv2/flann/params.h"
#include "opencv2/flann/saving.h"
#include "opencv2/flann/general.h"
// index types
#include "opencv2/flann/all_indices.h"