[openrtm-commit:02402] r183 - in trunk/ImageProcessing/opencv/components: Affine/include/Affine BackGroundSubtractionSimple/include/BackGroundSubtractionSimple Binarization/include/Binarization CameraViewer/include/CameraViewer Chromakey/include/Chromakey Dilationerosion/include/DilationErosion Edge/include/Edge Findcontour/include/Findcontour Flip/include/Flip Histogram/include/Histogram Houghline/include/Hough ImageCalibration/include/ImageCalibration ImageSubstraction/include/ImageSubstraction MFCamera/include/MFCamera ObjectTracking/include/ObjectTracking ObjectTracking/src OpenCVCamera/include/OpenCVCamera Perspective/include/Perspective RockPaperScissors/include/RockPaperScissors Rotate/include/Rotate Scale/include/Scale Sepia/include/Sepia SubStractCaptureImage/include/SubStractCaptureImage Template/include/Template Translate/include/Translate
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 7日 (火) 16:30:24 JST
Author: miyamoto
Date: 2017-02-07 16:30:24 +0900 (Tue, 07 Feb 2017)
New Revision: 183
Modified:
trunk/ImageProcessing/opencv/components/Affine/include/Affine/Affine.h
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/include/BackGroundSubtractionSimple/BackGroundSubtractionSimple.h
trunk/ImageProcessing/opencv/components/Binarization/include/Binarization/Binarization.h
trunk/ImageProcessing/opencv/components/CameraViewer/include/CameraViewer/CameraViewer.h
trunk/ImageProcessing/opencv/components/Chromakey/include/Chromakey/Chromakey.h
trunk/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h
trunk/ImageProcessing/opencv/components/Edge/include/Edge/Edge.h
trunk/ImageProcessing/opencv/components/Findcontour/include/Findcontour/Findcontour.h
trunk/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h
trunk/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h
trunk/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h
trunk/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CalibrationServiceSVC_impl.h
trunk/ImageProcessing/opencv/components/ImageSubstraction/include/ImageSubstraction/ImageSubstraction.h
trunk/ImageProcessing/opencv/components/MFCamera/include/MFCamera/MFCapture.h
trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
trunk/ImageProcessing/opencv/components/OpenCVCamera/include/OpenCVCamera/OpenCVCamera.h
trunk/ImageProcessing/opencv/components/Perspective/include/Perspective/Perspective.h
trunk/ImageProcessing/opencv/components/RockPaperScissors/include/RockPaperScissors/RockPaperScissors.h
trunk/ImageProcessing/opencv/components/Rotate/include/Rotate/Rotate.h
trunk/ImageProcessing/opencv/components/Scale/include/Scale/Scale.h
trunk/ImageProcessing/opencv/components/Sepia/include/Sepia/Sepia.h
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/include/SubStractCaptureImage/SubStractCaptureImage.h
trunk/ImageProcessing/opencv/components/Template/include/Template/Template.h
trunk/ImageProcessing/opencv/components/Translate/include/Translate/Translate.h
Log:
[fix] modified the include file
Modified: trunk/ImageProcessing/opencv/components/Affine/include/Affine/Affine.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/include/Affine/Affine.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Affine/include/Affine/Affine.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/include/BackGroundSubtractionSimple/BackGroundSubtractionSimple.h
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/include/BackGroundSubtractionSimple/BackGroundSubtractionSimple.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/include/BackGroundSubtractionSimple/BackGroundSubtractionSimple.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,7 +19,7 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
#define THRESHOLD_MAX_VALUE 255 /* 2値化の際に使用する最大値 */
#define SCALE ( 1.0 / 255.0 ) /* L*a*b*に変換するために必要なスケールファクタ */
Modified: trunk/ImageProcessing/opencv/components/Binarization/include/Binarization/Binarization.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/include/Binarization/Binarization.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Binarization/include/Binarization/Binarization.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/include/CameraViewer/CameraViewer.h
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/include/CameraViewer/CameraViewer.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/include/CameraViewer/CameraViewer.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,9 +19,9 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
+
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Chromakey/include/Chromakey/Chromakey.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/include/Chromakey/Chromakey.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Chromakey/include/Chromakey/Chromakey.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,8 +20,9 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用 */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
+
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -22,7 +22,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCVHeadファイルのIncluding */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Edge/include/Edge/Edge.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/include/Edge/Edge.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Edge/include/Edge/Edge.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
//OpenCV header file include
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// cvConvertScaleAbs用定数
#define SCALE 1 /* ScaleAbs係数 */
Modified: trunk/ImageProcessing/opencv/components/Findcontour/include/Findcontour/Findcontour.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/include/Findcontour/Findcontour.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Findcontour/include/Findcontour/Findcontour.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
//OpenCV header file include
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
#define THRESHOLD_MAX_VALUE 255 /* 2値化の際に使用する最大値 */
Modified: trunk/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -21,7 +21,7 @@
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
//OpenCV header file include
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
#define DIMENSIONS 1 /* ヒストグラムの次元数 */
#define UNIFORM 1 /* 一様性に関するフラグ */
Modified: trunk/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -21,7 +21,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
//OpenCV header file include
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
/* cvCanny用定数 */
#define APERTURE_SIZE 3 /* Sobelオペレータのサイズ (リファレンス参照) */
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CalibrationServiceSVC_impl.h
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CalibrationServiceSVC_impl.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CalibrationServiceSVC_impl.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -18,9 +18,7 @@
#include <coil/Mutex.h>
/* OpenCVHeadファイルのIncluding */
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/imgcodecs/imgcodecs.hpp>
-#include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/opencv.hpp>
/*!
* @class CalibrationServiceSVC_impl
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/include/ImageSubstraction/ImageSubstraction.h
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/include/ImageSubstraction/ImageSubstraction.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/include/ImageSubstraction/ImageSubstraction.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,7 +19,7 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
#define NUM_OF_BACKGROUND_FRAMES 50 /* 背景モデルを生成するのに使用する画像の枚数 */
Modified: trunk/ImageProcessing/opencv/components/MFCamera/include/MFCamera/MFCapture.h
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/include/MFCamera/MFCapture.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/MFCamera/include/MFCamera/MFCapture.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -7,7 +7,7 @@
#include "MFUtils.h"
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
enum FMT_Values {
FMT_RGB24, FMT_YUY2, FMT_UNKNOWN=256
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,9 +19,8 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/video/tracking.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
+
#define SEGMENT 150 /* cvSnakeImageで用いる制御点の数 */
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2017-02-07 07:30:24 UTC (rev 183)
@@ -490,7 +490,7 @@
trackRegion = cv::CamShift(backprojectImage,
trackWindow,
trackComp);
- cv::ellipse(resultImage, trackRegion, cv::Scalar(0, 0, 255), 3, cv::LINE_AA);
+ cv::ellipse(resultImage, trackRegion, cv::Scalar(0, 0, 255), 3);
//trackWindow = trackComp.rect;
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/include/OpenCVCamera/OpenCVCamera.h
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/include/OpenCVCamera/OpenCVCamera.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/include/OpenCVCamera/OpenCVCamera.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,8 +19,7 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Perspective/include/Perspective/Perspective.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/include/Perspective/Perspective.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Perspective/include/Perspective/Perspective.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/include/RockPaperScissors/RockPaperScissors.h
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/include/RockPaperScissors/RockPaperScissors.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/include/RockPaperScissors/RockPaperScissors.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,8 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCVHeadファイルのIncluding */
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
#include <string>
#include "Labeling.h"
Modified: trunk/ImageProcessing/opencv/components/Rotate/include/Rotate/Rotate.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/include/Rotate/Rotate.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Rotate/include/Rotate/Rotate.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Scale/include/Scale/Scale.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/include/Scale/Scale.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Scale/include/Scale/Scale.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/Sepia/include/Sepia/Sepia.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/include/Sepia/Sepia.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Sepia/include/Sepia/Sepia.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/include/SubStractCaptureImage/SubStractCaptureImage.h
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/include/SubStractCaptureImage/SubStractCaptureImage.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/include/SubStractCaptureImage/SubStractCaptureImage.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -19,8 +19,7 @@
#include <rtm/idl/ExtendedDataTypesSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
#define MASK_THRESHOLD 1 /* backgroundMaskImageやstillObjectMaskImageを生成するための閾値 */
#define THRESHOLD_MAX_VALUE 255 /* 2値化の際に使用する最大値 */
Modified: trunk/ImageProcessing/opencv/components/Template/include/Template/Template.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/include/Template/Template.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Template/include/Template/Template.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,8 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
//OpenCV headr file include
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
#define THRESHOLD 50 /* 2値化の際の閾値 */
#define THRESHOLD_MAX_VALUE 255 /* 2値化の際に使用する最大値 */
Modified: trunk/ImageProcessing/opencv/components/Translate/include/Translate/Translate.h
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/include/Translate/Translate.h 2017-02-06 06:57:53 UTC (rev 182)
+++ trunk/ImageProcessing/opencv/components/Translate/include/Translate/Translate.h 2017-02-07 07:30:24 UTC (rev 183)
@@ -20,7 +20,7 @@
#include <rtm/idl/InterfaceDataTypesSkel.h>
/* OpenCV用インクルードファイルのインクルード */
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
// Service implementation headers
// <rtc-template block="service_impl_h">
More information about the openrtm-commit
mailing list