Skip to content

Commit f004329

Browse files
committed
add desciptorMatchingKnn
1 parent d1a6e97 commit f004329

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cc/modules/features2d/descriptorMatchingKnn.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ void DescriptorMatchingKnn::matchKnn(Nan::NAN_METHOD_ARGS_TYPE info, int matcher
113113

114114
FF_ARG_INSTANCE(0, cv::Mat descFrom, Mat::constructor, FF_UNWRAP_MAT_AND_GET);
115115
FF_ARG_INSTANCE(1, cv::Mat descTo, Mat::constructor, FF_UNWRAP_MAT_AND_GET);
116-
FF_ARG_INT(2, int n);
116+
FF_ARG_INT(2, int k);
117117

118118
std::vector<std::vector<cv::DMatch>> dmatches;
119-
cv::DescriptorMatcher::create(matcherType)->knnMatch(descFrom, descTo, dmatches, n);
119+
cv::DescriptorMatcher::create(matcherType)->knnMatch(descFrom, descTo, dmatches, k);
120120

121121
FF_ARR jsMatches = FF_NEW_ARRAY(dmatches.size());
122122
uint i = 0;
@@ -144,7 +144,7 @@ void DescriptorMatchingKnn::matchKnnAsync(Nan::NAN_METHOD_ARGS_TYPE info, int ma
144144
ctx.matcher = cv::DescriptorMatcher::create(matcherType);
145145
FF_ARG_INSTANCE(0, ctx.descFrom, Mat::constructor, FF_UNWRAP_MAT_AND_GET);
146146
FF_ARG_INSTANCE(1, ctx.descTo, Mat::constructor, FF_UNWRAP_MAT_AND_GET);
147-
FF_ARG_INT(2, ctx.n);
147+
FF_ARG_INT(2, ctx.k);
148148
FF_ARG_FUNC(3, v8::Local<v8::Function> cbFunc);
149149

150150
Nan::AsyncQueueWorker(new GenericAsyncWorker<MatchContext>(

cc/modules/features2d/descriptorMatchingKnn.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ class DescriptorMatchingKnn : public Nan::ObjectWrap {
3737
cv::Ptr<cv::DescriptorMatcher> matcher;
3838
cv::Mat descFrom;
3939
cv::Mat descTo;
40-
int n;
40+
int k;
4141
std::vector<std::vector<cv::DMatch>> dmatches;
4242

4343
const char* execute() {
44-
matcher->knnMatch(descFrom, descTo, dmatches, n);
44+
matcher->knnMatch(descFrom, descTo, dmatches, k);
4545
return "";
4646
}
4747

0 commit comments

Comments
 (0)