Merge pull request #1597 from LaurentBerger:edgeboxes

Author: alalek

modules/ximgproc/samples/edgeboxes_demo.cpp

@@ -87,7 +87,9 @@ int main(int argc, char **argv)
       rectangle(im, p1, p2, color, 1);
   }
 
-  imshow("im", im);
+  imshow("Edge", edge_im);
+  imshow("Nms", edge_nms);
+  imshow("Image & boxes", im);
   waitKey(0);
 
   return 0;

modules/ximgproc/src/edgeboxes.cpp

@@ -566,10 +566,9 @@ void EdgeBoxesImpl::prepDataStructs(Mat &edgeMap)
     // initialize scoreBox() data structures
     int n = _segCnt + 1;
     _sWts = Mat::zeros(n, 1, DataType<float>::type);
-    _sDone = Mat::zeros(n, 1, DataType<int>::type);
+    _sDone = Mat(n, 1, DataType<int>::type,Scalar(-1));
     _sMap = Mat::zeros(n, 1, DataType<int>::type);
     _sIds = Mat::zeros(n, 1, DataType<int>::type);
-    for (i = 0; i < n; i++) _sDone.at<int>(0, i) = -1;
     _sId = 0;
 }