[openrtm-commit:00033] r16 - trunk/ImageProcessing/opencv/components/IEEE1394Camera

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-05-05 23:41:26 +0900 (Thu, 05 May 2011)
New Revision: 16

Modified:
   trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h
   trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj
Log:
Correspondence to a bug of the WindowsSdk.

Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h	2011-05-05 14:39:51 UTC (rev 15)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h	2011-05-05 14:41:26 UTC (rev 16)
@@ -13,6 +13,10 @@
 //DirectShow
 #include <dshow.h>
 #include <streams.h>
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
 #include <qedit.h>
 #include <comdef.h>
 

Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj	2011-05-05 14:39:51 UTC (rev 15)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj	2011-05-05 14:41:26 UTC (rev 16)
@@ -43,6 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
 				PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -65,6 +66,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="$(rtm_libd) $(coil_libd) $(ds_libd) $(skel_libd)"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories=""$(DXSDK_DIR)\Lib\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -117,6 +119,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
 				PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,6 +140,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="$(rtm_lib) $(coil_lib) $(ds_lib) $(skel_lib)"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories=""$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Lib\x86\""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"