Prepare OpenMVG v1.5 openMVG#1560

nucbaixu · Jul 15, 2019 · 606d1c9 · 606d1c9
1 parent 6b2c192
commit 606d1c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 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.4-0'
+version: '1.5-0'
 summary: OpenMVG (open Multiple View Geometry)
 description: |
   OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
@@ -106,6 +106,9 @@ apps:
   ChangeLocalOrigin:
     command: openMVG_main_ChangeLocalOrigin
     plugs: [home]
+  Spherical2Cubic:
+    command: openMVG_main_openMVGSpherical2Cubic
+    plugs: [home]
   SfM-GlobalPipeline-py:
     command: python3 $SNAP/bin/SfM_GlobalPipeline.py
     plugs: [home]
@@ -117,7 +120,7 @@ parts:
   openmvg:
     plugin: cmake
     source: https://github.com/openMVG/openMVG.git
-    source-tag: v1.4
+    source-tag: v1.5
     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-2018, OpenMVG authors'
+copyright = u'2013-2019, 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.4'
+version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '1.5'
 
 # 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-2018, openMVG authors'
+epub_copyright = u'2013-2019, 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
@@ -10,14 +10,14 @@
 #define OPENMVG_VERSION_HPP
 
 #define OPENMVG_VERSION_MAJOR 1
-#define OPENMVG_VERSION_MINOR 4
+#define OPENMVG_VERSION_MINOR 5
 #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.4.0".
+// OpenMVG version as a string; for example "1.5.0".
 #define OPENMVG_VERSION_STRING OPENMVG_TO_STRING(OPENMVG_VERSION_MAJOR) "." \
   OPENMVG_TO_STRING(OPENMVG_VERSION_MINOR) "." \
   OPENMVG_TO_STRING(OPENMVG_VERSION_REVISION)