[openrtm-commit:02501] r203 - in trunk/ImageProcessing/opencv/components/ObjectTracking: include/ObjectTracking src

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-03-07 15:00:43 +0900 (Tue, 07 Mar 2017)
New Revision: 203

Modified:
   trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
   trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
Log:
[compat,bugfix] fixed bug.

Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h	2017-03-07 04:26:49 UTC (rev 202)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h	2017-03-07 06:00:43 UTC (rev 203)
@@ -325,10 +325,10 @@
 	 int g_temp_h;
 
 	 /* 処理モード選択用フラグ */
-	 int	backprojectMode = HIDDEN_BACKPROJECTION;
-	 int	selectObject = SELECT_OFF;
-	 int	trackObject = TRACKING_STOP;
-	 int showHist = SHOW_HISTOGRAM;
+	 int	backprojectMode;
+	 int	selectObject;
+	 int	trackObject;
+	 int showHist;
 
 	 /* CamShiftトラッキング用変数 */
 	 cv::Point			origin;
@@ -338,11 +338,11 @@
 	 cv::TermCriteria	trackComp;
 
 	 /* ヒストグラム用変数 */
-	 int		hdims = H_DIMENSION;		/* ヒストグラムの次元数 */
+	 int		hdims;		/* ヒストグラムの次元数 */
 	 static const float	hRangesArray[2];	/* ヒストグラムのレンジ */
 	 
-	 int		vmin = V_MIN;
-	 int		vmax = V_MAX;
+	 int		vmin;
+	 int		vmax;
 
   // <rtc-template block="private_attribute">
   

Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-03-07 04:26:49 UTC (rev 202)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-03-07 06:00:43 UTC (rev 203)
@@ -233,7 +233,14 @@
     m_hist_imgOut("img_hist", m_hist_img),
     count(0),
     g_temp_w(0),
-    g_temp_h(0)
+    g_temp_h(0),
+    backprojectMode(HIDDEN_BACKPROJECTION),
+    selectObject(SELECT_OFF),
+    trackObject(TRACKING_STOP),
+    showHist(SHOW_HISTOGRAM),
+    hdims(H_DIMENSION),
+    vmin(V_MIN),
+    vmax(V_MAX)
 
     // </rtc-template>
 {