[openrtm-commit:00127] r28 - in trunk/ImageProcessing/opencv: bin build components/Affine components/BackGroundSubtractionSimple components/Binarization components/CameraViewer components/Chromakey components/Dilationerosion components/Edge components/Findcontour components/Flip components/Histogram components/Houghline components/IEEE1394Camera components/ImageCalibration components/ImageSubstraction components/ObjectTracking components/OpenCVCamera components/PGRCamera components/Perspective components/RockPaperScissors components/Rotate components/Scale components/Sepia components/SubStractCaptureImage components/Template components/Translate installer installer/Bitmaps rtm rtm/idl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 29日 (日) 01:21:11 JST
Author: n-ando
Date: 2011-05-29 01:21:11 +0900 (Sun, 29 May 2011)
New Revision: 28
Modified:
trunk/ImageProcessing/opencv/bin/
trunk/ImageProcessing/opencv/build/
trunk/ImageProcessing/opencv/components/Affine/
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/
trunk/ImageProcessing/opencv/components/Binarization/
trunk/ImageProcessing/opencv/components/CameraViewer/
trunk/ImageProcessing/opencv/components/Chromakey/
trunk/ImageProcessing/opencv/components/Dilationerosion/
trunk/ImageProcessing/opencv/components/Edge/
trunk/ImageProcessing/opencv/components/Findcontour/
trunk/ImageProcessing/opencv/components/Flip/
trunk/ImageProcessing/opencv/components/Histogram/
trunk/ImageProcessing/opencv/components/Houghline/
trunk/ImageProcessing/opencv/components/IEEE1394Camera/
trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h
trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394CameraComp_vc9.vcproj
trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj
trunk/ImageProcessing/opencv/components/ImageCalibration/
trunk/ImageProcessing/opencv/components/ImageSubstraction/
trunk/ImageProcessing/opencv/components/ObjectTracking/
trunk/ImageProcessing/opencv/components/OpenCVCamera/
trunk/ImageProcessing/opencv/components/PGRCamera/
trunk/ImageProcessing/opencv/components/Perspective/
trunk/ImageProcessing/opencv/components/RockPaperScissors/
trunk/ImageProcessing/opencv/components/Rotate/
trunk/ImageProcessing/opencv/components/Scale/
trunk/ImageProcessing/opencv/components/Sepia/
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/
trunk/ImageProcessing/opencv/components/Template/
trunk/ImageProcessing/opencv/components/Translate/
trunk/ImageProcessing/opencv/installer/
trunk/ImageProcessing/opencv/installer/Bitmaps/
trunk/ImageProcessing/opencv/rtm/
trunk/ImageProcessing/opencv/rtm/idl/
Log:
ignore *.user files
Property changes on: trunk/ImageProcessing/opencv/bin
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/build
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Affine
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Binarization
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/CameraViewer
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Chromakey
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Dilationerosion
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Edge
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Findcontour
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Flip
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Histogram
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Houghline
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/IEEE1394Camera
___________________________________________________________________
Added: svn:ignore
+ *.user
Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h 2011-05-28 15:44:37 UTC (rev 27)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera.h 2011-05-28 16:21:11 UTC (rev 28)
@@ -11,13 +11,13 @@
#define IEEE1394CAMERA_H
//DirectShow
-#include <dshow.h>
-#include <streams.h>
+//#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 "qedit.h"
#include <comdef.h>
//OpenRTM
Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394CameraComp_vc9.vcproj
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394CameraComp_vc9.vcproj 2011-05-28 15:44:37 UTC (rev 27)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394CameraComp_vc9.vcproj 2011-05-28 16:21:11 UTC (rev 28)
@@ -64,6 +64,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(rtm_libd) $(coil_libd) $(ds_libd) $(skel_libd)"
+ AdditionalLibraryDirectories="baseclass\$(ConfigurationName)"
OutputFile="$(OutDir)\IEEE1394CameraComp.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -137,6 +138,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(rtm_lib) $(coil_lib) $(ds_lib) $(skel_lib)"
+ AdditionalLibraryDirectories="baseclass\$(ConfigurationName)"
OutputFile="$(OutDir)\IEEE1394CameraComp.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj 2011-05-28 15:44:37 UTC (rev 27)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/IEEE1394Camera_vc9.vcproj 2011-05-28 16:21:11 UTC (rev 28)
@@ -66,7 +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""
+ AdditionalLibraryDirectories="baseclass\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
+ AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include\x86\";"$(MyWindowsSdkDir)\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"
@@ -140,7 +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\""
+ AdditionalLibraryDirectories="baseclass\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Property changes on: trunk/ImageProcessing/opencv/components/ImageCalibration
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/ImageSubstraction
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/ObjectTracking
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/OpenCVCamera
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/PGRCamera
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Perspective
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/RockPaperScissors
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Rotate
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Scale
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Sepia
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/SubStractCaptureImage
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Template
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/components/Translate
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/installer
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/installer/Bitmaps
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/rtm
___________________________________________________________________
Added: svn:ignore
+ *.user
Property changes on: trunk/ImageProcessing/opencv/rtm/idl
___________________________________________________________________
Added: svn:ignore
+ *.user
openrtm-commit メーリングリストの案内