comparison c/Motion.cpp @ 795:a34ec862371f

merged with dev branch
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 09 May 2016 15:33:11 -0400
parents 6022350f8173
children 17e54690af8a 8ac7f61c6e4f
comparison
equal deleted inserted replaced
758:0a05883216cf 795:a34ec862371f
1 #include "Motion.hpp" 1 #include "Motion.hpp"
2 #include "cvutils.hpp" 2 #include "cvutils.hpp"
3 3
4 #include "src/TrajectoryDBAccessList.h" 4 #include "src/TrajectoryDBAccessList.h"
5 5
6 #include "opencv2/core/core.hpp" 6 //#include "opencv2/core/core.hpp"
7 #include "opencv2/imgproc/imgproc.hpp"
7 #include "opencv2/highgui/highgui.hpp" 8 #include "opencv2/highgui/highgui.hpp"
8 9
9 #include <boost/graph/connected_components.hpp> 10 #include <boost/graph/connected_components.hpp>
10 11
11 #include <iostream> 12 #include <iostream>