1 files changed, 2 insertions, 67 deletions
diff --git a/DCP/DCP.vcxproj b/DCP/DCP.vcxproj
index b2ef313..68eeb69 100644
--- a/DCP/DCP.vcxproj
+++ b/DCP/DCP.vcxproj
@@ -5,18 +5,10 @@
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{1543533F-481B-40EC-BEFC-90E46456A5F8}</ProjectGuid>
@@ -30,12 +22,6 @@
    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@@ -43,31 +29,16 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
+    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
+    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <NuGetPackageImportStamp>ed7df352</NuGetPackageImportStamp>
@@ -75,15 +46,9 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <PrecompiledHeader>
@@ -97,19 +62,6 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -127,23 +79,6 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="dcp.h" />
    <ClInclude Include="dcp_core.h" />

diff --git a/DCP/DCP.vcxproj b/DCP/DCP.vcxproj index b2ef313..68eeb69 100644 --- a/DCP/DCP.vcxproj +++ b/DCP/DCP.vcxproj
@@ -5,18 +5,10 @@
5	<Configuration>Debug</Configuration>	5	<Configuration>Debug</Configuration>
6	<Platform>Win32</Platform>	6	<Platform>Win32</Platform>
7	</ProjectConfiguration>	7	</ProjectConfiguration>
8	<ProjectConfiguration Include="Debug\|x64">
9	<Configuration>Debug</Configuration>
10	<Platform>x64</Platform>
11	</ProjectConfiguration>
12	<ProjectConfiguration Include="Release\|Win32">	8	<ProjectConfiguration Include="Release\|Win32">
13	<Configuration>Release</Configuration>	9	<Configuration>Release</Configuration>
14	<Platform>Win32</Platform>	10	<Platform>Win32</Platform>
15	</ProjectConfiguration>	11	</ProjectConfiguration>
16	<ProjectConfiguration Include="Release\|x64">
17	<Configuration>Release</Configuration>
18	<Platform>x64</Platform>
19	</ProjectConfiguration>
20	</ItemGroup>	12	</ItemGroup>
21	<PropertyGroup Label="Globals">	13	<PropertyGroup Label="Globals">
22	<ProjectGuid>{1543533F-481B-40EC-BEFC-90E46456A5F8}</ProjectGuid>	14	<ProjectGuid>{1543533F-481B-40EC-BEFC-90E46456A5F8}</ProjectGuid>
@@ -30,12 +22,6 @@
30	<PlatformToolset>v120</PlatformToolset>	22	<PlatformToolset>v120</PlatformToolset>
31	<CharacterSet>Unicode</CharacterSet>	23	<CharacterSet>Unicode</CharacterSet>
32	</PropertyGroup>	24	</PropertyGroup>
33	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'" Label="Configuration">
34	<ConfigurationType>Application</ConfigurationType>
35	<UseDebugLibraries>true</UseDebugLibraries>
36	<PlatformToolset>v120</PlatformToolset>
37	<CharacterSet>Unicode</CharacterSet>
38	</PropertyGroup>
39	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration">	25	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration">
40	<ConfigurationType>Application</ConfigurationType>	26	<ConfigurationType>Application</ConfigurationType>
41	<UseDebugLibraries>false</UseDebugLibraries>	27	<UseDebugLibraries>false</UseDebugLibraries>
@@ -43,31 +29,16 @@
43	<WholeProgramOptimization>true</WholeProgramOptimization>	29	<WholeProgramOptimization>true</WholeProgramOptimization>
44	<CharacterSet>Unicode</CharacterSet>	30	<CharacterSet>Unicode</CharacterSet>
45	</PropertyGroup>	31	</PropertyGroup>
46	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'" Label="Configuration">
47	<ConfigurationType>Application</ConfigurationType>
48	<UseDebugLibraries>false</UseDebugLibraries>
49	<PlatformToolset>v120</PlatformToolset>
50	<WholeProgramOptimization>true</WholeProgramOptimization>
51	<CharacterSet>Unicode</CharacterSet>
52	</PropertyGroup>
53	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />	32	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
54	<ImportGroup Label="ExtensionSettings">	33	<ImportGroup Label="ExtensionSettings">
55	</ImportGroup>	34	</ImportGroup>
56	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">	35	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
57	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	36	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />	37	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
59	</ImportGroup>
60	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'" Label="PropertySheets">
61	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
63	</ImportGroup>	38	</ImportGroup>
64	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">	39	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
65	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	40	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />	41	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
67	</ImportGroup>
68	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'" Label="PropertySheets">
69	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70	<Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
71	</ImportGroup>	42	</ImportGroup>
72	<PropertyGroup Label="UserMacros">	43	<PropertyGroup Label="UserMacros">
73	<NuGetPackageImportStamp>ed7df352</NuGetPackageImportStamp>	44	<NuGetPackageImportStamp>ed7df352</NuGetPackageImportStamp>
@@ -75,15 +46,9 @@
75	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">	46	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
76	<LinkIncremental>true</LinkIncremental>	47	<LinkIncremental>true</LinkIncremental>
77	</PropertyGroup>	48	</PropertyGroup>
78	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">
79	<LinkIncremental>true</LinkIncremental>
80	</PropertyGroup>
81	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">	49	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
82	<LinkIncremental>false</LinkIncremental>	50	<LinkIncremental>false</LinkIncremental>
83	</PropertyGroup>	51	</PropertyGroup>
84	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">
85	<LinkIncremental>false</LinkIncremental>
86	</PropertyGroup>
87	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">	52	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
88	<ClCompile>	53	<ClCompile>
89	<PrecompiledHeader>	54	<PrecompiledHeader>
@@ -97,19 +62,6 @@
97	<GenerateDebugInformation>true</GenerateDebugInformation>	62	<GenerateDebugInformation>true</GenerateDebugInformation>
98	</Link>	63	</Link>
99	</ItemDefinitionGroup>	64	</ItemDefinitionGroup>
100	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">
101	<ClCompile>
102	<PrecompiledHeader>
103	</PrecompiledHeader>
104	<WarningLevel>Level3</WarningLevel>
105	<Optimization>Disabled</Optimization>
106	<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107	</ClCompile>
108	<Link>
109	<SubSystem>Console</SubSystem>
110	<GenerateDebugInformation>true</GenerateDebugInformation>
111	</Link>
112	</ItemDefinitionGroup>
113	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">	65	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
114	<ClCompile>	66	<ClCompile>
115	<WarningLevel>Level3</WarningLevel>	67	<WarningLevel>Level3</WarningLevel>
@@ -127,23 +79,6 @@
127	<OptimizeReferences>true</OptimizeReferences>	79	<OptimizeReferences>true</OptimizeReferences>
128	</Link>	80	</Link>
129	</ItemDefinitionGroup>	81	</ItemDefinitionGroup>
130	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">
131	<ClCompile>
132	<WarningLevel>Level3</WarningLevel>
133	<PrecompiledHeader>
134	</PrecompiledHeader>
135	<Optimization>MaxSpeed</Optimization>
136	<FunctionLevelLinking>true</FunctionLevelLinking>
137	<IntrinsicFunctions>true</IntrinsicFunctions>
138	<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139	</ClCompile>
140	<Link>
141	<SubSystem>Console</SubSystem>
142	<GenerateDebugInformation>true</GenerateDebugInformation>
143	<EnableCOMDATFolding>true</EnableCOMDATFolding>
144	<OptimizeReferences>true</OptimizeReferences>
145	</Link>
146	</ItemDefinitionGroup>
147	<ItemGroup>	82	<ItemGroup>
148	<ClInclude Include="dcp.h" />	83	<ClInclude Include="dcp.h" />
149	<ClInclude Include="dcp_core.h" />	84	<ClInclude Include="dcp_core.h" />