Skip to content

Commit

Permalink
Prepare OpenMVG v1.6 openMVG#1738
Browse files Browse the repository at this point in the history
- Update version number
  • Loading branch information
pmoulon committed May 13, 2020
1 parent 0cbb7ee commit 74deb33
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
7 changes: 5 additions & 2 deletions dist/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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.5-0'
version: '1.6-0'
summary: OpenMVG (open Multiple View Geometry)
description: |
OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
Expand Down Expand Up @@ -70,6 +70,9 @@ apps:
IncrementalSfM:
command: openMVG_main_IncrementalSfM
plugs: [home]
IncrementalSfM2:
command: openMVG_main_IncrementalSfM2
plugs: [home]
ListMatchingPairs:
command: openMVG_main_ListMatchingPairs
plugs: [home]
Expand Down Expand Up @@ -120,7 +123,7 @@ parts:
openmvg:
plugin: cmake
source: https://github.com/openMVG/openMVG.git
source-tag: v1.5
source-tag: v1.6
build-packages:
- build-essential
- libpng12-dev
Expand Down
8 changes: 4 additions & 4 deletions docs/sphinx/rst/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@

# General information about the project.
project = u'openMVG'
copyright = u'2013-2019, OpenMVG authors'
copyright = u'2013-2020, 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.5'
version = '1.6'
# The full version, including alpha/beta/rc tags.
release = '1.5'
release = '1.6'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -280,7 +280,7 @@
epub_title = u'openMVG'
epub_author = u'openMVG authors'
epub_publisher = u'Pierre MOULON & al.'
epub_copyright = u'2013-2019, openMVG authors'
epub_copyright = u'2013-2020, openMVG authors'

# The basename for the epub file. It defaults to the project name.
#epub_basename = u'openMVG'
Expand Down
4 changes: 2 additions & 2 deletions src/openMVG/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
#define OPENMVG_VERSION_HPP

#define OPENMVG_VERSION_MAJOR 1
#define OPENMVG_VERSION_MINOR 5
#define OPENMVG_VERSION_MINOR 6
#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.5.0".
// OpenMVG version as a string; for example "1.6.0".
#define OPENMVG_VERSION_STRING OPENMVG_TO_STRING(OPENMVG_VERSION_MAJOR) "." \
OPENMVG_TO_STRING(OPENMVG_VERSION_MINOR) "." \
OPENMVG_TO_STRING(OPENMVG_VERSION_REVISION)
Expand Down

0 comments on commit 74deb33

Please sign in to comment.