Prepare OpenMVG 2.0 openMVG#1944

wahello · Oct 20, 2021 · 1caec67 · 1caec67
1 parent a196ceb
commit 1caec67
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/dist/snap/snapcraft.yaml b/dist/snap/snapcraft.yaml
@@ -1,7 +1,7 @@
 # This recipe is known to work under Ubuntu 16.04 (yet, the generated .snap
 # file will work on any Linux distribution having snap installed).
 name: openmvg
-version: '1.6-0'
+version: '2.0-0'
 summary: OpenMVG (open Multiple View Geometry)
 description: |
   OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
@@ -31,6 +31,9 @@ apps:
   ComputeStructureFromKnownPoses:
     command: openMVG_main_ComputeStructureFromKnownPoses
     plugs: [home]
+  ComputeVLAD:
+    command: openMVG_main_ComputeVLAD
+    plugs: [home]
   ConvertList:
     command: openMVG_main_ConvertList
     plugs: [home]
@@ -64,6 +67,9 @@ apps:
   geodesy-registration-to-gps-position:
     command: openMVG_main_geodesy_registration_to_gps_position
     plugs: [home]
+  GeometricFilter:
+    command: openMVG_main_GeometricFilter
+    plugs: [home]
   SfM:
     command: openMVG_main_SfM
     plugs: [home]
@@ -117,7 +123,7 @@ parts:
   openmvg:
     plugin: cmake
     source: https://github.com/openMVG/openMVG.git
-    source-tag: v1.6
+    source-tag: v2.0
     build-packages:
       - build-essential
       - libpng12-dev

diff --git a/docs/sphinx/rst/conf.py b/docs/sphinx/rst/conf.py
@@ -56,16 +56,16 @@
 
 # General information about the project.
 project = u'openMVG'
-copyright = u'2013-2020, OpenMVG authors'
+copyright = u'2013-2021, OpenMVG authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.6'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.6'
+release = '2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -280,7 +280,7 @@
 epub_title = u'openMVG'
 epub_author = u'openMVG authors'
 epub_publisher = u'Pierre MOULON & al.'
-epub_copyright = u'2013-2020, openMVG authors'
+epub_copyright = u'2013-2021, openMVG authors'
 
 # The basename for the epub file. It defaults to the project name.
 #epub_basename = u'openMVG'

diff --git a/src/openMVG/version.hpp b/src/openMVG/version.hpp
@@ -9,15 +9,15 @@
 #ifndef OPENMVG_VERSION_HPP
 #define OPENMVG_VERSION_HPP
 
-#define OPENMVG_VERSION_MAJOR 1
-#define OPENMVG_VERSION_MINOR 6
+#define OPENMVG_VERSION_MAJOR 2
+#define OPENMVG_VERSION_MINOR 0
 #define OPENMVG_VERSION_REVISION 0
 
 // Preprocessor to string conversion
 #define OPENMVG_TO_STRING_HELPER(x) #x
 #define OPENMVG_TO_STRING(x) OPENMVG_TO_STRING_HELPER(x)
 
-// OpenMVG version as a string; for example "1.6.0".
+// OpenMVG version as a string; for example "2.0.0".
 #define OPENMVG_VERSION_STRING OPENMVG_TO_STRING(OPENMVG_VERSION_MAJOR) "." \
   OPENMVG_TO_STRING(OPENMVG_VERSION_MINOR) "." \
   OPENMVG_TO_STRING(OPENMVG_VERSION_REVISION)