[openrtm-commit:00203] r53 - trunk/ImageProcessing/opencv

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2011年 6月 28日 (火) 14:49:53 JST 

Author: kurihara
Date: 2011-06-28 14:49:53 +0900 (Tue, 28 Jun 2011)
New Revision: 53

Modified:
   trunk/ImageProcessing/opencv/OpenCV-RTC_vc8.sln
   trunk/ImageProcessing/opencv/OpenCV-RTC_vc9.sln
   trunk/ImageProcessing/opencv/OpenCV_RTM.sln
   trunk/ImageProcessing/opencv/README
   trunk/ImageProcessing/opencv/user_config.vsprops
Log:
Renamed IEEE1394Camera to DirectShowCam.

Modified: trunk/ImageProcessing/opencv/OpenCV-RTC_vc8.sln
===================================================================
--- trunk/ImageProcessing/opencv/OpenCV-RTC_vc8.sln	2011-06-28 05:47:39 UTC (rev 52)
+++ trunk/ImageProcessing/opencv/OpenCV-RTC_vc8.sln	2011-06-28 05:49:53 UTC (rev 53)
@@ -152,17 +152,17 @@
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "./components/IEEE1394Camera/baseclasses_vc8.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "./components/DirectShowCam/baseclasses_vc8.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394Camera", "./components/IEEE1394Camera/IEEE1394Camera_vc8.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCam", "./components/DirectShowCam/DirectShowCam_vc8.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394CameraComp", "./components/IEEE1394Camera/IEEE1394CameraComp_vc8.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCamComp", "./components/DirectShowCam/DirectShowCamComp_vc8.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}

Modified: trunk/ImageProcessing/opencv/OpenCV-RTC_vc9.sln
===================================================================
--- trunk/ImageProcessing/opencv/OpenCV-RTC_vc9.sln	2011-06-28 05:47:39 UTC (rev 52)
+++ trunk/ImageProcessing/opencv/OpenCV-RTC_vc9.sln	2011-06-28 05:49:53 UTC (rev 53)
@@ -152,15 +152,15 @@
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "components\IEEE1394Camera\baseclasses_vc9.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "components\DirectShowCam\baseclasses_vc9.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394Camera", "components\IEEE1394Camera\IEEE1394Camera_vc9.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCam", "components\DirectShowCam\DirectShowCam_vc9.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394CameraComp", "components\IEEE1394Camera\IEEE1394CameraComp_vc9.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCamComp", "components\DirectShowCam\DirectShowCamComp_vc9.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E4054092-4820-11DE-B424-001C23DA0BDF} = {E4054092-4820-11DE-B424-001C23DA0BDF}
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}

Modified: trunk/ImageProcessing/opencv/OpenCV_RTM.sln
===================================================================
--- trunk/ImageProcessing/opencv/OpenCV_RTM.sln	2011-06-28 05:47:39 UTC (rev 52)
+++ trunk/ImageProcessing/opencv/OpenCV_RTM.sln	2011-06-28 05:49:53 UTC (rev 53)
@@ -97,9 +97,9 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PGRCameraComp", "components\PGRCamera\PGRCameraComp_vc9.vcproj", "{6C9954B6-46B6-4B9E-8BC6-C43704C9CE4D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394CameraComp", "components\IEEE1394Camera\IEEE1394CameraComp_vc9.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCamComp", "components\DirectShowCam\DirectShowCamComp_vc9.vcproj", "{B69C7E9B-1A13-4132-ACE7-6101DC2F84EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEEE1394Camera", "components\IEEE1394Camera\IEEE1394Camera_vc9.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowCam", "components\DirectShowCam\DirectShowCam_vc9.vcproj", "{C1F88645-4FE4-4240-B25D-C91D93E154C3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCVRTCSkel", "rtm\idl\libCVRTCSkel_vc9.vcproj", "{E4054092-4820-11DE-B424-001C23DA0BDF}"
 EndProject

Modified: trunk/ImageProcessing/opencv/README
===================================================================
--- trunk/ImageProcessing/opencv/README	2011-06-28 05:47:39 UTC (rev 52)
+++ trunk/ImageProcessing/opencv/README	2011-06-28 05:49:53 UTC (rev 53)
@@ -1,14 +1,14 @@
 - Windwos
 -- ƒRƒ“ƒ|[ƒlƒ“ƒg
---- IEEE1394Camera
-----uDirect Showv‚ð—p‚¢‚č쐬‚µ‚Ü‚µ‚½‚Ì‚ÅIEEE1394‚ÌREADME‚ðŽQl‚µ‚ĉº‚³‚¢B
+--- DirectShowCam
+----uDirect Showv‚ð—p‚¢‚č쐬‚µ‚Ü‚µ‚½‚Ì‚ÅDirectShowCam‚ÌREADME‚ðŽQl‚µ‚ĉº‚³‚¢B
 --- PGRCamera
 ----uPoint GreyvŽÐ‚ÌDragonfly2‚ðŒ³‚Åì¬‚µ‚Ü‚µ‚½‚Ì‚ÅDragonfly2(Windwos—p)ƒ‰ƒCƒuƒ‰ƒŠ‚ª•K—v‚Æ‚È‚è‚Ü‚·B
 
 - Linux
 -- Fedora
 --- ƒRƒ“ƒ|[ƒlƒ“ƒg
----- IEEE1394Camera
+---- DirectShowCam
 ----- Fedora‚̓Tƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB
 ---- OpenCVCamera
 ----- IEEE1394ƒJƒƒ‰‘Ήž
@@ -16,7 +16,7 @@
 ----- Fedora‚̓Tƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB
 -- Ubuntu
 --- ƒRƒ“ƒ|[ƒlƒ“ƒg
----- IEEE1394Camera
+---- DirectShowCam
 ----- Ubuntu‚̓Tƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB
 ---- OpenCVCamera
 ----- IEEE1394ƒJƒƒ‰‘Ήž

Modified: trunk/ImageProcessing/opencv/user_config.vsprops
===================================================================
--- trunk/ImageProcessing/opencv/user_config.vsprops	2011-06-28 05:47:39 UTC (rev 52)
+++ trunk/ImageProcessing/opencv/user_config.vsprops	2011-06-28 05:49:53 UTC (rev 53)
@@ -14,7 +14,7 @@
 	/>
 	<UserMacro
 		Name="MyWindowsSdkDir"
-		Value="C:\Program Files\Microsoft SDKs\Windows\v7.1"
+		Value="C:\Program Files\Microsoft SDKs\Windows\v6.0"
 	/>
 	<UserMacro
 		Name="BaseClassDir"
@@ -54,7 +54,7 @@
 	/>
 	<UserMacro
 		Name="ds_libdir"
-		Value=""$(DXSDK_DIR)\Lib\x86\";"$(SolutionDir)\components\IEEE1394Camera\baseclass\$(ConfigurationName)""
+		Value=""$(DXSDK_DIR)\Lib\x86\";"$(SolutionDir)\components\DirectShowCam\baseclass\$(ConfigurationName)""
 	/>
 	<UserMacro
 		Name="ds_lib"
@@ -74,6 +74,6 @@
 	/>
 	<UserMacro
 		Name="WindowsSdkDir"
-		Value="C:\Program Files\Microsoft SDKs\Windows\v7.1"
+		Value="C:\Program Files\Microsoft SDKs\Windows\v6.0"
 	/>
 </VisualStudioPropertySheet>

openrtm-commit メーリングリストの案内