[openrtm-commit:02406] r185 - in trunk/ImageProcessing/opencv/components: Findcontour/src ObjectTracking/include/ObjectTracking ObjectTracking/src

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-02-08 15:11:40 +0900 (Wed, 08 Feb 2017)
New Revision: 185

Modified:
   trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp
   trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
   trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
Log:
The code has been changed for make on Linux. refs #3826

Modified: trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp	2017-02-07 08:13:38 UTC (rev 184)
+++ trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp	2017-02-08 06:11:40 UTC (rev 185)
@@ -146,7 +146,7 @@
 	cv::Mat binaryImage;
 	cv::Mat contourImage;
 	int find_contour_num;
-	std::vector<std::vector<cv::Point>> find_contour;
+	std::vector<std::vector<cv::Point> > find_contour;
 	cv::Scalar red;
 	cv::Scalar green;
 	red = cv::Scalar(255, 0, 0);

Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h	2017-02-07 08:13:38 UTC (rev 184)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h	2017-02-08 06:11:40 UTC (rev 185)
@@ -316,7 +316,7 @@
 	 cv::Mat histImage;			/* ヒストグラム描画用IplImage */
 	 cv::Mat grayImage;			/* グレースケール画像用IplImage */
 
-	 cv::MatND	hist;				/* ヒストグラム処理用構造体 */
+	 cv::Mat	hist;				/* ヒストグラム処理用構造体 */
 
 	 cv::Mat frameImage;	/* キャプチャ画像用IplImage */
 	 cv::VideoCapture	capture;		/* キー入力結果を格納する変数 */

Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-02-07 08:13:38 UTC (rev 184)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp	2017-02-08 06:11:40 UTC (rev 185)
@@ -438,7 +438,7 @@
 
 		/* ヒストグラム構造体の使用を宣言 */
 		if (hist.empty()){
-			hist = cv::Mat::zeros(1, &hdims, CV_8UC1);
+			hist = cv::Mat::zeros(1, hdims, CV_8UC1);
 		}