Move function definition from header to cpp.
authorpeng xiao <hisenxpress@gmail.com>
Fri, 28 Jun 2013 02:52:39 +0000 (10:52 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Fri, 28 Jun 2013 02:52:39 +0000 (10:52 +0800)
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/optical_flow_farneback.cpp

index aecf2be..a41555c 100644 (file)
@@ -1414,17 +1414,7 @@ namespace cv
         class CV_EXPORTS FarnebackOpticalFlow
         {
         public:
-            FarnebackOpticalFlow()
-            {
-                numLevels = 5;
-                pyrScale = 0.5;
-                fastPyramids = false;
-                winSize = 13;
-                numIters = 10;
-                polyN = 5;
-                polySigma = 1.1;
-                flags = 0;
-            }
+            FarnebackOpticalFlow();
 
             int numLevels;
             double pyrScale;
@@ -1437,21 +1427,7 @@ namespace cv
 
             void operator ()(const oclMat &frame0, const oclMat &frame1, oclMat &flowx, oclMat &flowy);
 
-            void releaseMemory()
-            {
-                frames_[0].release();
-                frames_[1].release();
-                pyrLevel_[0].release();
-                pyrLevel_[1].release();
-                M_.release();
-                bufM_.release();
-                R_[0].release();
-                R_[1].release();
-                blurredFrame_[0].release();
-                blurredFrame_[1].release();
-                pyramid0_.clear();
-                pyramid1_.clear();
-            }
+            void releaseMemory();
 
         private:
             void prepareGaussian(
index e5a7abc..e622446 100644 (file)
@@ -241,6 +241,34 @@ static oclMat allocMatFromBuf(int rows, int cols, int type, oclMat &mat)
     return mat = oclMat(rows, cols, type);
 }
 
+cv::ocl::FarnebackOpticalFlow::FarnebackOpticalFlow()
+{
+    numLevels = 5;
+    pyrScale = 0.5;
+    fastPyramids = false;
+    winSize = 13;
+    numIters = 10;
+    polyN = 5;
+    polySigma = 1.1;
+    flags = 0;
+}
+
+void cv::ocl::FarnebackOpticalFlow::releaseMemory()
+{
+    frames_[0].release();
+    frames_[1].release();
+    pyrLevel_[0].release();
+    pyrLevel_[1].release();
+    M_.release();
+    bufM_.release();
+    R_[0].release();
+    R_[1].release();
+    blurredFrame_[0].release();
+    blurredFrame_[1].release();
+    pyramid0_.clear();
+    pyramid1_.clear();
+}
+
 void cv::ocl::FarnebackOpticalFlow::prepareGaussian(
     int n, double sigma, float *g, float *xg, float *xxg,
     double &ig11, double &ig03, double &ig33, double &ig55)