Skip to content

Commit 2bb2703

Browse files
sungloksunglok
committed
Upgrade OpenCV and Ceres Solver to their recent version
1 parent 7dbefe5 commit 2bb2703

45 files changed

Lines changed: 545 additions & 713 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎EXTERNAL/OpenCV/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ copy or use the software.
77
For Open Source Computer Vision Library
88
(3-clause BSD License)
99

10-
Copyright (C) 2000-2016, Intel Corporation, all rights reserved.
10+
Copyright (C) 2000-2019, Intel Corporation, all rights reserved.
1111
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
1212
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
1313
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.

‎EXTERNAL/ceres/LICENSE‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
Copyright (c) 2014, Tal Ben-Nun
2-
All rights reserved.
1+
Ceres Solver - A fast non-linear least squares minimizer
2+
Copyright 2015 Google Inc. All rights reserved.
3+
http://ceres-solver.org/
34

45
Redistribution and use in source and binary forms, with or without
56
modification, are permitted provided that the following conditions are met:
67

7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
9-
8+
* Redistributions of source code must retain the above copyright notice,
9+
this list of conditions and the following disclaimer.
1010
* Redistributions in binary form must reproduce the above copyright notice,
1111
this list of conditions and the following disclaimer in the documentation
1212
and/or other materials provided with the distribution.
13-
14-
* Neither the name of ceres-windows nor the names of its
15-
contributors may be used to endorse or promote products derived from
16-
this software without specific prior written permission.
13+
* Neither the name of Google Inc. nor the names of its contributors may be
14+
used to endorse or promote products derived from this software without
15+
specific prior written permission.
1716

1817
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1918
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28-
19+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
21+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
POSSIBILITY OF SUCH DAMAGE.

‎msvs/3dv_tutorial.sln‎

Lines changed: 98 additions & 95 deletions
Large diffs are not rendered by default.

‎msvs/bundle_adjustment_global/bundle_adjustment_global.vcxproj‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,71 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
8+
<ProjectConfiguration Include="Release|x64">
99
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup Label="Globals">
1414
<ProjectGuid>{64E65811-6F72-479E-BEAB-1DADE0952A7B}</ProjectGuid>
15-
<Keyword>Win32Proj</Keyword>
1615
<RootNamespace>3dv_tutorial</RootNamespace>
1716
</PropertyGroup>
1817
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
2019
<ConfigurationType>Application</ConfigurationType>
2120
<UseDebugLibraries>true</UseDebugLibraries>
22-
<PlatformToolset>v120</PlatformToolset>
23-
<CharacterSet>Unicode</CharacterSet>
21+
<PlatformToolset>v142</PlatformToolset>
2422
</PropertyGroup>
25-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2624
<ConfigurationType>Application</ConfigurationType>
2725
<UseDebugLibraries>false</UseDebugLibraries>
28-
<PlatformToolset>v120</PlatformToolset>
26+
<PlatformToolset>v142</PlatformToolset>
2927
<WholeProgramOptimization>true</WholeProgramOptimization>
30-
<CharacterSet>Unicode</CharacterSet>
3128
</PropertyGroup>
3229
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3330
<ImportGroup Label="ExtensionSettings">
3431
</ImportGroup>
35-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
32+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
3633
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3734
</ImportGroup>
38-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
35+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3936
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4037
</ImportGroup>
4138
<PropertyGroup Label="UserMacros" />
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4340
<LinkIncremental>true</LinkIncremental>
4441
<OutDir>..\..\bin\</OutDir>
4542
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
4744
<LinkIncremental>false</LinkIncremental>
4845
<OutDir>..\..\bin\</OutDir>
4946
</PropertyGroup>
50-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
47+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5148
<ClCompile>
52-
<PrecompiledHeader>
53-
</PrecompiledHeader>
5449
<WarningLevel>Level3</WarningLevel>
5550
<Optimization>Disabled</Optimization>
56-
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;GOOGLE_GLOG_DLL_DECL=;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
51+
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5752
<SDLCheck>true</SDLCheck>
5853
<AdditionalIncludeDirectories>..\..\EXTERNAL\OpenCV\include;..\..\EXTERNAL\ceres\include</AdditionalIncludeDirectories>
5954
</ClCompile>
6055
<Link>
6156
<SubSystem>Console</SubSystem>
6257
<GenerateDebugInformation>true</GenerateDebugInformation>
6358
<AdditionalLibraryDirectories>..\..\EXTERNAL\OpenCV\lib;..\..\EXTERNAL\ceres\lib</AdditionalLibraryDirectories>
64-
<AdditionalDependencies>opencv_world320d.lib;ceres_debug.lib;libglog_static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
59+
<AdditionalDependencies>opencv_world411d.lib;ceres-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
6560
</Link>
6661
</ItemDefinitionGroup>
67-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6863
<ClCompile>
6964
<WarningLevel>Level3</WarningLevel>
70-
<PrecompiledHeader>
71-
</PrecompiledHeader>
7265
<Optimization>MaxSpeed</Optimization>
7366
<FunctionLevelLinking>true</FunctionLevelLinking>
7467
<IntrinsicFunctions>true</IntrinsicFunctions>
75-
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;GOOGLE_GLOG_DLL_DECL=;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
68+
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7669
<SDLCheck>true</SDLCheck>
7770
<AdditionalIncludeDirectories>..\..\EXTERNAL\OpenCV\include;..\..\EXTERNAL\ceres\include</AdditionalIncludeDirectories>
7871
</ClCompile>
@@ -82,7 +75,7 @@
8275
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8376
<OptimizeReferences>true</OptimizeReferences>
8477
<AdditionalLibraryDirectories>..\..\EXTERNAL\OpenCV\lib;..\..\EXTERNAL\ceres\lib</AdditionalLibraryDirectories>
85-
<AdditionalDependencies>opencv_world320.lib;ceres.lib;libglog_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
78+
<AdditionalDependencies>opencv_world411.lib;ceres.lib;%(AdditionalDependencies)</AdditionalDependencies>
8679
</Link>
8780
</ItemDefinitionGroup>
8881
<ItemGroup>

‎msvs/bundle_adjustment_global/bundle_adjustment_global.vcxproj.user‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
44
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
5-
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
65
</PropertyGroup>
7-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
87
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
9-
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
108
</PropertyGroup>
119
</Project>

‎msvs/bundle_adjustment_inc/bundle_adjustment_inc.vcxproj‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,71 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
8+
<ProjectConfiguration Include="Release|x64">
99
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup Label="Globals">
1414
<ProjectGuid>{968A197A-66E1-499E-B3DE-E7760D74081B}</ProjectGuid>
15-
<Keyword>Win32Proj</Keyword>
1615
<RootNamespace>3dv_tutorial</RootNamespace>
1716
</PropertyGroup>
1817
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
2019
<ConfigurationType>Application</ConfigurationType>
2120
<UseDebugLibraries>true</UseDebugLibraries>
22-
<PlatformToolset>v120</PlatformToolset>
23-
<CharacterSet>Unicode</CharacterSet>
21+
<PlatformToolset>v142</PlatformToolset>
2422
</PropertyGroup>
25-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2624
<ConfigurationType>Application</ConfigurationType>
2725
<UseDebugLibraries>false</UseDebugLibraries>
28-
<PlatformToolset>v120</PlatformToolset>
26+
<PlatformToolset>v142</PlatformToolset>
2927
<WholeProgramOptimization>true</WholeProgramOptimization>
30-
<CharacterSet>Unicode</CharacterSet>
3128
</PropertyGroup>
3229
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3330
<ImportGroup Label="ExtensionSettings">
3431
</ImportGroup>
35-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
32+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
3633
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3734
</ImportGroup>
38-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
35+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3936
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4037
</ImportGroup>
4138
<PropertyGroup Label="UserMacros" />
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4340
<LinkIncremental>true</LinkIncremental>
4441
<OutDir>..\..\bin\</OutDir>
4542
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
4744
<LinkIncremental>false</LinkIncremental>
4845
<OutDir>..\..\bin\</OutDir>
4946
</PropertyGroup>
50-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
47+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5148
<ClCompile>
52-
<PrecompiledHeader>
53-
</PrecompiledHeader>
5449
<WarningLevel>Level3</WarningLevel>
5550
<Optimization>Disabled</Optimization>
56-
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;GOOGLE_GLOG_DLL_DECL=;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
51+
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5752
<SDLCheck>true</SDLCheck>
5853
<AdditionalIncludeDirectories>..\..\EXTERNAL\OpenCV\include;..\..\EXTERNAL\ceres\include</AdditionalIncludeDirectories>
5954
</ClCompile>
6055
<Link>
6156
<SubSystem>Console</SubSystem>
6257
<GenerateDebugInformation>true</GenerateDebugInformation>
6358
<AdditionalLibraryDirectories>..\..\EXTERNAL\OpenCV\lib;..\..\EXTERNAL\ceres\lib</AdditionalLibraryDirectories>
64-
<AdditionalDependencies>opencv_world320d.lib;ceres_debug.lib;libglog_static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
59+
<AdditionalDependencies>opencv_world411d.lib;ceres-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
6560
</Link>
6661
</ItemDefinitionGroup>
67-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6863
<ClCompile>
6964
<WarningLevel>Level3</WarningLevel>
70-
<PrecompiledHeader>
71-
</PrecompiledHeader>
7265
<Optimization>MaxSpeed</Optimization>
7366
<FunctionLevelLinking>true</FunctionLevelLinking>
7467
<IntrinsicFunctions>true</IntrinsicFunctions>
75-
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;GOOGLE_GLOG_DLL_DECL=;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
68+
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7669
<SDLCheck>true</SDLCheck>
7770
<AdditionalIncludeDirectories>..\..\EXTERNAL\OpenCV\include;..\..\EXTERNAL\ceres\include</AdditionalIncludeDirectories>
7871
</ClCompile>
@@ -82,7 +75,7 @@
8275
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8376
<OptimizeReferences>true</OptimizeReferences>
8477
<AdditionalLibraryDirectories>..\..\EXTERNAL\OpenCV\lib;..\..\EXTERNAL\ceres\lib</AdditionalLibraryDirectories>
85-
<AdditionalDependencies>opencv_world320.lib;ceres.lib;libglog_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
78+
<AdditionalDependencies>opencv_world411.lib;ceres.lib;%(AdditionalDependencies)</AdditionalDependencies>
8679
</Link>
8780
</ItemDefinitionGroup>
8881
<ItemGroup>

‎msvs/bundle_adjustment_inc/bundle_adjustment_inc.vcxproj.user‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
44
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
5-
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
65
</PropertyGroup>
7-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
87
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
9-
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
108
</PropertyGroup>
119
</Project>

0 commit comments

Comments
 (0)