[openrtm-commit:02420] r2938 - in branches/DEV_IQ_2016/OpenRTM-aist: utils/rtcd utils/rtcprof utils/rtcsh win32/OpenRTM-aist win32/OpenRTM-aist/examples/Composite win32/OpenRTM-aist/examples/ConfigSample win32/OpenRTM-aist/examples/ExtTrigger win32/OpenRTM-aist/examples/LTTSample win32/OpenRTM-aist/examples/SeqIO win32/OpenRTM-aist/examples/SimpleIO win32/OpenRTM-aist/examples/SimpleService win32/OpenRTM-aist/examples/USBCamera win32/OpenRTM-aist/ext/ec/logical_time win32/OpenRTM-aist/ext/local_service/nameservice_file win32/OpenRTM-aist/ext/sdo/observer win32/OpenRTM-aist/rtm win32/OpenRTM-aist/rtm/ext win32/OpenRTM-aist/rtm/idl win32/OpenRTM-aist/rtm/idl/device_interfaces win32/OpenRTM-aist/utils/rtcd win32/OpenRTM-aist/utils/rtcprof
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 10日 (金) 18:08:47 JST
Author: sec_fukai
Date: 2017-02-10 18:08:47 +0900 (Fri, 10 Feb 2017)
New Revision: 2938
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcd/rtcd.cpp
branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcprof/rtcprof.cpp
branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcsh/rtcsh.cpp
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/Composite/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ConfigSample/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SeqIO/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleIO/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.cpp
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.h
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquireComp.cpp
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.cpp
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.h
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitorComp.cpp
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/logical_time/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/ext/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcd/Makefile.am
branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcprof/Makefile.am
Log:
[incompat,->DEV_IQ_2016] Delete qck cmd from Makefiles for windows. refs #3938
Modified: branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcd/rtcd.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcd/rtcd.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcd/rtcd.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file rtcd.cpp
* @brief RT component server daemon
Modified: branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcprof/rtcprof.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcprof/rtcprof.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcprof/rtcprof.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file rtcprof.cpp
* @brief RT-Component profile dump command
Modified: branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcsh/rtcsh.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcsh/rtcsh.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/utils/rtcsh/rtcsh.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file rtcsh.cpp
* @brief RTComponent manager shell
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -25,7 +25,6 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc9.sln \
`find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
- qkc -O- -ms OpenRTM-aist_vc9.sln
OpenRTM-aist_vc10.sln:
$(top_srcdir)/build/slntool.py \
@@ -33,7 +32,6 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc10.sln \
`find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -O- -ms OpenRTM-aist_vc10.sln
OpenRTM-aist_vc11.sln:
$(top_srcdir)/build/slntool.py \
@@ -41,7 +39,6 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc11.sln \
`find ./ -name '*_vc11.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -O- -ms OpenRTM-aist_vc11.sln
OpenRTM-aist_vc12.sln:
$(top_srcdir)/build/slntool.py \
@@ -49,7 +46,6 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc12.sln \
`find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -O- -ms OpenRTM-aist_vc12.sln
OpenRTM-aist_vc14.sln:
$(top_srcdir)/build/slntool.py \
@@ -57,7 +53,6 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc14.sln \
`find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -O- -ms OpenRTM-aist_vc14.sln
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/Composite/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/Composite/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -17,8 +17,5 @@
cp -p $(top_srcdir)/examples/Composite/*.cpp .
cp -p $(top_srcdir)/examples/Composite/*.h .
cp -p $(top_srcdir)/examples/Composite/*.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.conf
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ConfigSample/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ConfigSample/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -14,8 +14,5 @@
cp -p $(top_srcdir)/examples/ConfigSample/*.cpp .
cp -p $(top_srcdir)/examples/ConfigSample/*.h .
cp -p $(top_srcdir)/examples/ConfigSample/*.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.conf
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -14,7 +14,5 @@
cp -p $(top_srcdir)/examples/ExtTrigger/*.cpp .
cp -p $(top_srcdir)/examples/ExtTrigger/*.h .
cp -p $(top_srcdir)/examples/ExtTrigger/rtc.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -17,10 +17,5 @@
cp -p $(top_srcdir)/src/ext/ec/logical_time/example/LTTSample.conf .
cp -p $(top_srcdir)/src/ext/ec/logical_time/example/idl/*.idl .
cp -p $(top_srcdir)/src/ext/ec/logical_time/example/idl/*.idl .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.conf
- qkc -O- -ms *.py
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SeqIO/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SeqIO/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -14,7 +14,5 @@
cp -p $(top_srcdir)/examples/SeqIO/*.cpp .
cp -p $(top_srcdir)/examples/SeqIO/*.h .
cp -p $(top_srcdir)/examples/SeqIO/rtc.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleIO/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleIO/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -14,7 +14,5 @@
cp -p $(top_srcdir)/examples/SimpleIO/*.cpp .
cp -p $(top_srcdir)/examples/SimpleIO/*.h .
cp -p $(top_srcdir)/examples/SimpleIO/rtc.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -16,8 +16,5 @@
cp -p $(top_srcdir)/examples/SimpleService/*.h .
cp -p $(top_srcdir)/examples/SimpleService/*.idl .
cp -p $(top_srcdir)/examples/SimpleService/rtc.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -27,7 +27,6 @@
--out USBCameraAcquireComp_vc9.vcproj \
--source USBCameraAcquire.cpp USBCameraAcquireComp.cpp \
--header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquireComp_vc9.vcproj
USBCameraAcquire_vc9.vcproj:
$(top_srcdir)/build/vcprojtool.py vcproj \
--type RTCDLL \
@@ -37,7 +36,6 @@
--out USBCameraAcquire_vc9.vcproj \
--source USBCameraAcquire.cpp \
--header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquire_vc9.vcproj
USBCameraMonitorComp_vc9.vcproj:
$(top_srcdir)/build/vcprojtool.py vcproj \
--type RTCEXE \
@@ -47,7 +45,6 @@
--out USBCameraMonitorComp_vc9.vcproj \
--source USBCameraMonitor.cpp USBCameraMonitorComp.cpp \
--header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitorComp_vc9.vcproj
USBCameraMonitor_vc9.vcproj:
$(top_srcdir)/build/vcprojtool.py vcproj \
--type RTCDLL \
@@ -57,7 +54,6 @@
--out USBCameraMonitor_vc9.vcproj \
--source USBCameraMonitor.cpp \
--header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitor_vc9.vcproj
USBCameraAcquireComp_vc10.vcxproj:
$(top_srcdir)/build/vcxprojtool.py vcxproj \
@@ -68,7 +64,6 @@
--out USBCameraAcquireComp_vc10.vcxproj \
--source USBCameraAcquire.cpp USBCameraAcquireComp.cpp \
--header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquireComp_vc10.vcxproj
USBCameraAcquire_vc10.vcxproj:
$(top_srcdir)/build/vcxprojtool.py vcxproj \
--type RTCDLL \
@@ -78,7 +73,6 @@
--out USBCameraAcquire_vc10.vcxproj \
--source USBCameraAcquire.cpp \
--header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquire_vc10.vcxproj
USBCameraMonitorComp_vc10.vcxproj:
$(top_srcdir)/build/vcxprojtool.py vcxproj \
--type RTCEXE \
@@ -88,7 +82,6 @@
--out USBCameraMonitorComp_vc10.vcxproj \
--source USBCameraMonitor.cpp USBCameraMonitorComp.cpp \
--header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitorComp_vc10.vcxproj
USBCameraMonitor_vc10.vcxproj:
$(top_srcdir)/build/vcxprojtool.py vcxproj \
--type RTCDLL \
@@ -98,7 +91,6 @@
--out USBCameraMonitor_vc10.vcxproj \
--source USBCameraMonitor.cpp \
--header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitor_vc10.vcxproj
sln: USBCamera_vc9.sln USBCamera_vc10.sln
@@ -107,14 +99,12 @@
--vcversion VC9 \
--out USBCamera_vc9.sln \
`find ./ -name '*_vc9.vcproj'`
- qkc -O- -ms USBCamera_vc9.sln
USBCamera_vc10.sln: vc10proj
$(top_srcdir)/build/slntool.py \
--vcversion VC10 \
--out USBCamera_vc10.sln \
`find ./ -name '*_vc10.vcxproj'`
- qkc -O- -ms USBCamera_vc10.sln
dist-hook: vcproj sln lst
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraAcquire.cpp
* @brief USB Camera Acquire component
@@ -86,9 +86,9 @@
RTC::ReturnCode_t USBCameraAcquire::onActivated(RTC::UniqueId ec_id)
{
- //ƒJƒƒ‰ƒfƒoƒCƒX‚Ì’Tõ
+ //カメラデãƒã‚¤ã‚¹ã®æŽ¢ç´¢
if(NULL==(m_capture = cvCreateCameraCapture(CV_CAP_ANY))){
- cout<<"ƒJƒƒ‰‚ª‚݂‚©‚è‚Ü‚¹‚ñ"<<endl;
+ cout<<"カメラãŒã¿ã¤ã‹ã‚Šã¾ã›ã‚“"<<endl;
return RTC::RTC_ERROR;
}
return RTC::RTC_OK;
@@ -98,7 +98,7 @@
RTC::ReturnCode_t USBCameraAcquire::onDeactivated(RTC::UniqueId ec_id)
{
- //ƒJƒƒ‰—pƒƒ‚ƒŠ‚̉ð•ú
+ //カメラ用メモリã®è§£æ”¾
cvReleaseCapture(&m_capture);
return RTC::RTC_OK;
}
@@ -114,7 +114,7 @@
cam_frame = cvQueryFrame(m_capture);
if(NULL == cam_frame)
{
- std::cout << "‰æ‘œ‚ªƒLƒƒƒvƒ`ƒƒ‚Å‚«‚Ü‚¹‚ñ!!" << std::endl;
+ std::cout << "ç”»åƒãŒã‚ャプãƒãƒ£ã§ãã¾ã›ã‚“!!" << std::endl;
return RTC::RTC_ERROR;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.h 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquire.h 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraAcquire.h
* @brief USB Camera Acquire component
@@ -124,7 +124,7 @@
private:
int dummy;
- CvCapture* m_capture; //ƒJƒƒ‰—pƒƒ‚ƒŠ
+ CvCapture* m_capture; //カメラ用メモリ
};
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquireComp.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquireComp.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraAcquireComp.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraAcquireComp.cpp
* @brief Standalone component
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraMonitor.cpp
* @brief 'hellow
@@ -102,7 +102,7 @@
{
m_img=cvCreateImage(cvSize(m_img_width,m_img_height),IPL_DEPTH_8U,3);
- //‰æ‘œ•\Ž¦—pƒEƒBƒ“ƒhƒE‚Ìì¬
+ //ç”»åƒè¡¨ç¤ºç”¨ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ä½œæˆ
cvNamedWindow("CaptureImage", CV_WINDOW_AUTOSIZE);
std::cout << "m_img->nChannels :" << m_img->nChannels << std::endl;
@@ -117,7 +117,7 @@
RTC::ReturnCode_t USBCameraMonitor::onDeactivated(RTC::UniqueId ec_id)
{
cvReleaseImage(&m_img);
- //•\Ž¦ƒEƒBƒ“ƒhƒE‚ÌÁ‹Ž
+ //表示ウィンドウã®æ¶ˆåŽ»
cvDestroyWindow("CaptureImage");
return RTC::RTC_OK;
}
@@ -142,7 +142,7 @@
memcpy(m_img->imageData,(void *)&(m_in.data[0]),m_in.data.length());
- //‰æ‘œ•\Ž¦
+ //ç”»åƒè¡¨ç¤º
cvShowImage("CaptureImage", m_img);
cvWaitKey(1);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.h 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitor.h 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraMonitor.h
* @brief 'hellow
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitorComp.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitorComp.cpp 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/USBCameraMonitorComp.cpp 2017-02-10 09:08:47 UTC (rev 2938)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file USBCameraMonitorComp.cpp
* @brief Standalone component
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/logical_time/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/logical_time/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/logical_time/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -15,8 +15,5 @@
cp -p $(top_srcdir)/src/ext/ec/logical_time/*.cpp .
cp -p $(top_srcdir)/src/ext/ec/logical_time/*.h .
cp -p $(top_srcdir)/src/ext/ec/logical_time/*.idl .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -13,7 +13,5 @@
src:
cp -p $(top_srcdir)/src/ext/local_service/nameservice_file/*.cpp .
cp -p $(top_srcdir)/src/ext/local_service/nameservice_file/*.h .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -14,8 +14,5 @@
cp -p $(top_srcdir)/src/ext/sdo/observer/*.cpp .
cp -p $(top_srcdir)/src/ext/sdo/observer/*.h .
cp -p $(top_srcdir)/src/ext/sdo/observer/*.idl .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -19,8 +19,6 @@
cp -p $(top_srcdir)/src/lib/rtm/*.h .
cp -p $(top_srcdir)/src/lib/rtm/version.txt .
cp -p config_rtc.h.in config_rtc.h
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/ext/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/ext/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/ext/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -11,7 +11,6 @@
src:
cp -p $(top_srcdir)/src/lib/rtm/ext/*.idl .
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -13,7 +13,6 @@
src:
cp -p $(top_srcdir)/src/lib/rtm/idl/*.idl .
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -11,7 +11,6 @@
src:
cp -p $(top_srcdir)/src/lib/rtm/idl/device_interfaces/*.idl .
- qkc -O- -ms *.idl
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcd/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcd/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -12,6 +12,5 @@
src:
cp -p $(top_srcdir)/utils/rtcd/*.cpp .
- qkc -O- -ms *.cpp
dist-hook: src
Modified: branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcprof/Makefile.am 2017-02-10 08:44:49 UTC (rev 2937)
+++ branches/DEV_IQ_2016/OpenRTM-aist/win32/OpenRTM-aist/utils/rtcprof/Makefile.am 2017-02-10 09:08:47 UTC (rev 2938)
@@ -12,6 +12,5 @@
src:
cp -p $(top_srcdir)/utils/rtcprof/*.cpp .
- qkc -O- -ms *.cpp
dist-hook: src
More information about the openrtm-commit
mailing list