Skip to content
Prev Previous commit
Next Next commit
fix assertion failed error
  • Loading branch information
TanaseButcaru committed Feb 29, 2016
commit 5f63d23899b20f910b86eea1d79c8d1c03a7f4ec
16 changes: 6 additions & 10 deletions src/Features2d.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class AsyncDetectSimilarity: public Nan::AsyncWorker {
extractor->compute(image1, keypoints1, descriptors1);
extractor->compute(image2, keypoints2, descriptors2);


//fix for 'Assertion failed...' error
//source: http://stackoverflow.com/questions/15650371/matcher-assertions-failed-error-opencv-android
if (descriptors1.type() == descriptors2.type() && descriptors1.cols == descriptors2.cols) {
matcher->match(descriptors1, descriptors2, matches);

Expand Down Expand Up @@ -84,14 +85,7 @@ class AsyncDetectSimilarity: public Nan::AsyncWorker {

}
else {
Nan::HandleScope scope;

Local<Value> argv[2];

argv[0] = Nan::Null();
argv[1] = Nan::Null();

callback->Call(2, argv);
dissimilarity = std::numeric_limits<double>::quiet_NaN();
}

}
Expand All @@ -102,7 +96,9 @@ class AsyncDetectSimilarity: public Nan::AsyncWorker {
Local<Value> argv[2];

argv[0] = Nan::Null();
argv[1] = Nan::New<Number>(dissimilarity);

if (dissimilarity != dissimilarity) argv[1] = Nan::Null();
else argv[1] = Nan::New<Number>(dissimilarity);

callback->Call(2, argv);
}
Expand Down