diff include/cvutils.hpp @ 614:5e09583275a4

Merged Nicolas/trafficintelligence into default
author Mohamed Gomaa <eng.m.gom3a@gmail.com>
date Fri, 05 Dec 2014 12:13:53 -0500
parents b6ad86ee7033
children 17e54690af8a 8ac7f61c6e4f
line wrap: on
line diff
--- a/include/cvutils.hpp	Thu Apr 18 15:29:33 2013 -0400
+++ b/include/cvutils.hpp	Fri Dec 05 12:13:53 2014 -0500
@@ -17,20 +17,20 @@
 /** Loads a cv mat from a text file where the numbers are saved line by line separated by separator */
 cv::Mat loadMat(const std::string& filename, const std::string& separator);
 
-template<typename T> 
-float scalarProduct(const cv::Point_<T>& v1, const cv::Point_<T>& v2) { return v1.x*v2.x+v1.y*v2.y;}
+//template<typename T> 
+//float scalarProduct(const cv::Point_<T>& v1, const cv::Point_<T>& v2) { return v1.x*v2.x+v1.y*v2.y;}
 
 void keyPoints2Points(const std::vector<cv::KeyPoint>& kpts, std::vector<cv::Point2f>& pts, const bool& clearPts = true);
 
 /** Allocates a new IplImage. */
-IplImage* allocateImage(const int& width, const int& height, const int& depth, const int& channels);
+// IplImage* allocateImage(const int& width, const int& height, const int& depth, const int& channels);
 
-IplImage* allocateImage(const CvSize& size, const int& depth, const int& channels);
+// IplImage* allocateImage(const CvSize& size, const int& depth, const int& channels);
 
 /** Goes to the target frame number, by querying frame, 
     supposing the video input is currently at current frame number.
     Returns the frame number that was reached.*/
-int goToFrameNum(CvCapture* inputVideo, const int& currentFrameNum, const int& targetFrameNum);
+// int goToFrameNum(CvCapture* inputVideo, const int& currentFrameNum, const int& targetFrameNum);
 
 /// Pre-defined colors
 class Colors {