Skip to content

Commit

Permalink
Prepare OpenMVG v1.3 release openMVG#1150
Browse files Browse the repository at this point in the history
- Update OpenMVG version from v1.2.0 to v1.3.0.
  • Loading branch information
pmoulon committed Nov 23, 2017
1 parent c3d9e4a commit 0ec6d15
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 83 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.2-0'
version: '1.3-0'
summary: OpenMVG (open Multiple View Geometry)
description: |
OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
Expand Down Expand Up @@ -111,7 +111,7 @@ parts:
openmvg:
plugin: cmake
source: https://github.com/openMVG/openMVG.git
source-tag: v1.2
source-tag: v1.3
build-packages:
- build-essential
- libpng12-dev
Expand Down
4 changes: 2 additions & 2 deletions docs/sphinx/rst/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
# built documents.
#
# The short X.Y version.
version = '1.2'
version = '1.3'
# The full version, including alpha/beta/rc tags.
release = '1.2'
release = '1.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
27 changes: 11 additions & 16 deletions docs/sphinx/rst/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.. openMVG documentation master file, created by
sphinx-quickstart on Wed Oct 30 11:05:58 2013.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

======================
openMVG documentation!
Expand All @@ -10,14 +6,14 @@ openMVG documentation!
.. toctree::
:maxdepth: 1
:hidden:
openMVG/openMVG.rst
openMVG_Samples/openMVG_Samples.rst
software/softwares.rst
nonFree/patented.rst
dependencies/external_libs.rst
third_party/third_party.rst
FAQ/FAQ.rst

openMVG/openMVG
openMVG_Samples/openMVG_Samples
software/softwares
nonFree/patented
dependencies/external_libs
third_party/third_party
FAQ/FAQ
bibliography


Expand Down Expand Up @@ -50,11 +46,11 @@ OpenMVG is cut in various modules:
* **Libraries**, core modules,

* comes with unit tests that assert algorithms results and show how use the code.

* **Samples**,

* show how to use the library to build high_level algorithms.

* **Softwares**,

* ready to use tools to perform toolchain processing:
Expand Down Expand Up @@ -95,11 +91,10 @@ Dependencies
OpenMVG comes as a standalone distribution, you don't need to install libraries to make it compiles
and run.
On Linux openMVG will use the local png, zlib and jpeg libraries if they are availables.

Indices and tables
----------------------

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

11 changes: 0 additions & 11 deletions docs/sphinx/rst/openMVG/other/pointCloudHandler.rst

This file was deleted.

50 changes: 0 additions & 50 deletions docs/sphinx/rst/software/SfM/UsingGeodesy.rst

This file was deleted.

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 2
#define OPENMVG_VERSION_MINOR 3
#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.2.0".
// OpenMVG version as a string; for example "1.3.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 0ec6d15

Please sign in to comment.