kmeans: do not accept Vec3 or Vec2 as input

Author: piercus

cc/core/core.cc

@@ -123,32 +123,32 @@ NAN_METHOD(Core::Kmeans) {
   std::vector<int> labels;
   cv::Mat centersMat;
 
-  if (FF_IS_INSTANCE(Point2::constructor, data0) || FF_IS_INSTANCE(Vec2::constructor, data0)) {
+  if (FF_IS_INSTANCE(Point2::constructor, data0)) {
     std::vector<cv::Point2f> data;
     Point::unpackJSPoint2Array(data, jsData);
     cv::kmeans(data, k, labels, termCriteria, attempts, flags, centersMat);
   }
-  else if (FF_IS_INSTANCE(Point3::constructor, data0) || FF_IS_INSTANCE(Vec3::constructor, data0)) {
+  else if (FF_IS_INSTANCE(Point3::constructor, data0)) {
     std::vector<cv::Point3f> data;
     Point::unpackJSPoint3Array(data, jsData);
     cv::kmeans(data, k, labels, termCriteria, attempts, flags, centersMat);
   } 
   else {
-    FF_THROW("unknowned input data type");
+    FF_THROW("expected arg0 to be an Array of Points");
   }
 
   FF_OBJ ret = FF_NEW_OBJ();
   FF_PACK_ARRAY(jsLabels, labels);
   Nan::Set(ret, FF_NEW_STRING("labels"), jsLabels);
 
-  if (FF_IS_INSTANCE(Point2::constructor, data0) || FF_IS_INSTANCE(Vec2::constructor, data0)) {
+  if (FF_IS_INSTANCE(Point2::constructor, data0)) {
     std::vector<cv::Point2f> centers;
     for (int i = 0; i < centersMat.rows; i++) {
       centers.push_back(cv::Point2f(centersMat.at<float>(i, 0), centersMat.at<float>(i, 1)));
     }
     Nan::Set(ret, FF_NEW_STRING("centers"), Point::packJSPoint2Array<float>(centers));
   }
-  else if (FF_IS_INSTANCE(Point3::constructor, data0) || FF_IS_INSTANCE(Vec3::constructor, data0)) {
+  else if (FF_IS_INSTANCE(Point3::constructor, data0)) {
     std::vector<cv::Point3f> centers;
     for (int i = 0; i < centersMat.rows; i++) {
       centers.push_back(cv::Point3f(centersMat.at<float>(i, 0), centersMat.at<float>(i, 1), centersMat.at<float>(i, 2)));

test/tests/core/core.test.js

@@ -123,9 +123,9 @@ describe('core', () => {
     // related to https://github.com/justadudewhohacks/opencv4nodejs/issues/379
     const points3 = [
       [255, 0, 0], [255, 0, 0], [255, 0, 255], [255, 0, 255], [255, 255, 255]
-    ].map(([r, g, b]) => new cv.Vec3(r, g, b));       
+    ].map(([x, y, z]) => new cv.Point(x, y, z));       
 
-    it('should return correct centers with Vec3', () => {
+    it('should return correct centers with Point3', () => {
       const ret = cv.kmeans(points3, k, termCriteria, attempts, flags);
 
       const l0 = ret.labels[0];
@@ -141,6 +141,21 @@ describe('core', () => {
       expect(ret.centers[l2].y).to.equal(255);
       expect(ret.centers[l2].y).to.equal(255);
     });
+    it('should raise error for invalid type', () => {
+      const points3 = [
+        [255, 0, 0], [255, 0, 0], [255, 0, 255], [255, 0, 255], [255, 255, 255]
+      ].map(([x, y, z]) => new cv.Vec(x, y, z));  
+      
+      let err;
+      
+      try {
+        cv.kmeans(points3, k, termCriteria, attempts, flags);
+      } catch(e){
+        err = e;
+      }
+
+      expect(err.message).to.equal("Core::Kmeans - expected arg0 to be an Array of Points");
+    });
   });
 
   describe('cartToPolar', () => {