[openrtm-commit:02498] r202 - in trunk/ImageProcessing/opencv/components/ObjectTracking: include/ObjectTracking src

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-03-07 13:26:49 +0900 (Tue, 07 Mar 2017)
New Revision: 202

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 02:40:05 UTC (rev 201)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h	2017-03-07 04:26:49 UTC (rev 202)
@@ -320,9 +320,9 @@
 
 	 cv::Mat frameImage;	/* キャプチャ画像用IplImage */
 	 cv::VideoCapture	capture;		/* キー入力結果を格納する変数 */
-	 int count = 0;
-	 int g_temp_w = 0;
-	 int g_temp_h = 0;
+	 int count;
+	 int g_temp_w;
+	 int g_temp_h;
 
 	 /* 処理モード選択用フラグ */
 	 int	backprojectMode = HIDDEN_BACKPROJECTION;

Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-03-07 02:40:05 UTC (rev 201)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-03-07 04:26:49 UTC (rev 202)
@@ -124,7 +124,7 @@
 void ObjectTracking::CalculateHist(cv::MatND &hist, cv::Mat &hsvImage, cv::Mat &maskImage, cv::Rect &selection){
   int		i;
   int		binW;	/* ヒストグラムの各ビンの、画像上での幅 */
-  int		val;	/* ヒストグラムの頻度 */
+  //int		val;	/* ヒストグラムの頻度 */
   double	maxVal;	/* ヒストグラムの最大頻度 */
 
   /* hsv画像の各画素が値の範囲内に入っているかチェックし、 */
@@ -152,7 +152,7 @@
 	
 
     /* ヒストグラムを計算し、最大値を求める */
-	int hbins = 30, sbins = 32;
+	//int hbins = 30, sbins = 32;
 	//int histSize[] = { hbins, sbins };
 	int histSize = 128;
 	float hranges[] = { 0, 180 };
@@ -230,7 +230,10 @@
     m_xIn("m_x", m_x),
     m_yIn("m_y", m_y),
     m_out_imgOut("img_output", m_out_img),
-    m_hist_imgOut("img_hist", m_hist_img)
+    m_hist_imgOut("img_hist", m_hist_img),
+    count(0),
+    g_temp_w(0),
+    g_temp_h(0)
 
     // </rtc-template>
 {
@@ -339,18 +342,18 @@
 
 RTC::ReturnCode_t ObjectTracking::onExecute(RTC::UniqueId ec_id)
 {
-	int		i;
-	int		j;
+	//int		i;
+	//int		j;
 
 	int x;
 	int y;
 	int mouse_event;
 
 	/* Snake用のパラメータ */
-	float alpha = 1.0;		/* 連続エネルギーの重みパラメータ */
-	float beta = 0.5;		/* 曲率の重みパラメータ */
-	float gamma = 1.5;		/* 画像エネルギーの重みパラメータ */
-	cv::Point pt[SEGMENT];	/* 制御点の座標 */
+	//float alpha = 1.0;		/* 連続エネルギーの重みパラメータ */
+	//float beta = 0.5;		/* 曲率の重みパラメータ */
+	//float gamma = 1.5;		/* 画像エネルギーの重みパラメータ */
+	//cv::Point pt[SEGMENT];	/* 制御点の座標 */
 	cv::Size window;			/* 最小値を探索する近傍サイズ */
 	window.width = WINDOW_WIDTH;
 	window.height = WINDOW_HEIGHT;
@@ -475,7 +478,7 @@
 			const float *ranges[] = { hRangesArray };
 			int image_num = 1;
 			int channels[] = { 0 };
-			int dnum = 1;
+			//int dnum = 1;
 			
 			
 			/* バックプロジェクションを計算する */