generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed tickets #1301, #1303, #1305

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-08-14 19:46:39 +00:00
parent 4c74b28ee3
commit a51a8ad577
7 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/flann/include/opencv2/flann/miniflann.hpp
View File

@@ -53,8 +53,8 @@ namespace cv
namespace flann
{
using namespace cvflann;
using namespace cvflann;
struct CV_EXPORTS IndexParams
{
@@ -70,7 +70,7 @@ struct CV_EXPORTS IndexParams
void setDouble(const std::string& key, double value);
void setFloat(const std::string& key, float value);
void setBool(const std::string& key, bool value);
void setAlgorithm(const std::string& key, int value);
void setAlgorithm(int value);
void getAll(std::vector<std::string>& names,
std::vector<int>& types,

9
modules/flann/src/miniflann.cpp
View File

@@ -81,9 +81,9 @@ void IndexParams::setBool(const std::string& key, bool value)
setParam(*this, key, value);
}
void IndexParams::setAlgorithm(const std::string& key, int value)
void IndexParams::setAlgorithm(int value)
{
setParam(*this, key, (cvflann::flann_algorithm_t)value);
setParam(*this, "algorithm", (cvflann::flann_algorithm_t)value);
}
void IndexParams::getAll(std::vector<std::string>& names,
@@ -293,7 +293,10 @@ template<typename Distance, typename IndexType> void
buildIndex_(void*& index, const Mat& data, const IndexParams& params, const Distance& dist = Distance())
{
typedef typename Distance::ElementType ElementType;
CV_Assert(DataType<ElementType>::type == data.type() && data.isContinuous());
if(DataType<ElementType>::type != data.type())
CV_Error_(CV_StsUnsupportedFormat, ("type=%d\n", data.type()));
if(!data.isContinuous())
CV_Error(CV_StsBadArg, "Only continuous arrays are supported");
::cvflann::Matrix<ElementType> dataset((ElementType*)data.data, data.rows, data.cols);
IndexType* _index = new IndexType(dataset, get_params(params), dist);