Skip to content

Commit

Permalink
Prepare OpenMVG v1.4 release openMVG#1357
Browse files Browse the repository at this point in the history
- Update OpenMVG version from v1.3.0 to v1.4.0.
  • Loading branch information
pmoulon committed Jul 15, 2018
1 parent 903b2f4 commit 34330bb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 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.3-0'
version: '1.4-0'
summary: OpenMVG (open Multiple View Geometry)
description: |
OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
Expand Down Expand Up @@ -117,7 +117,7 @@ parts:
openmvg:
plugin: cmake
source: https://github.com/openMVG/openMVG.git
source-tag: v1.3
source-tag: v1.4
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-2017, OpenMVG authors'
copyright = u'2013-2018, 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.3'
version = '1.4'
# The full version, including alpha/beta/rc tags.
release = '1.3'
release = '1.4'

# 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-2017, openMVG authors'
epub_copyright = u'2013-2018, 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 3
#define OPENMVG_VERSION_MINOR 4
#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.3.0".
// OpenMVG version as a string; for example "1.4.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 34330bb

Please sign in to comment.