Merge pull request #387 from DGtal-team/rel1.1

Release 1.1

.travis.yml

@@ -1,6 +1,6 @@
 language: cpp
-dist: trusty
-sudo: false
+dist: xenial
+
 os:
 - linux
 - osx
@@ -66,7 +66,7 @@ before_script:
   fi
 - if [ $CONFIG == "Debug,QGLVIEWER" AND  $TRAVIS_OS_NAME == linux  ]; then export
   DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug
-  -DWITH_QGLVIEWER=true  -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'";
+  -DWITH_QGLVIEWER=true  -DWITH_ITK=false -DWITH_EIGEN=true -DWITH_QT5=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'";
   fi
 - cd $SRC_DIR
 - git clone --depth=1 git://github.com/DGtal-team/DGtal.git

.travis/install_deps_macos.sh

@@ -3,11 +3,13 @@
 #
 # Note: gmp and boost already installed
 #
-brew update
+brew update > brew.log
 #brew install qt5 doxygen homebrew/science/hdf5 graphviz graphicsmagick fftw eigen
 brew install qt5 graphicsmagick fftw eigen
 # Explicit install of libqglviewer
-brew install http://liris.cnrs.fr/david.coeurjolly/misc/libqglviewer.rb
+# Explicit install of libqglviewer
+brew tap DGtal-team/homebrew-dgtal
+brew install libqglviewer
 
 ## Temporary HDF5 build issue
 export BTYPE="$BTYPE -DWITH_HDF5=false" && echo "Disabling HDF5 on MacOS";

CMakeLists.txt

@@ -24,7 +24,7 @@ message(STATUS "DGtal found.")
 
 
  # -----------------------------------------------------------------------------
- # CPP11 
+ # CPP11
  # -----------------------------------------------------------------------------
  set (CMAKE_CXX_STANDARD 11)
  set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -57,7 +57,7 @@ include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
 SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 SET(DGtalTools_VERSION_MAJOR 1)
 SET(DGtalTools_VERSION_MINOR 1)
-SET(DGtalTools_VERSION_PATCH beta)
+SET(DGtalTools_VERSION_PATCH 0)
 SET(DGTALTOOLS_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
 SET(PROJECT_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
 SET(VERSION ${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH})
@@ -81,7 +81,7 @@ if ( Boost_FOUND )
   include_directories(SYSTEM ${Boost_INCLUDE_DIRS} )
   SET(DGtalToolsLibDependencies ${DGtalToolsLibDependencies}
      ${Boost_LIBRAIRIES})
-   SET(DGtalLibInc ${Boost_INCLUDE_DIRS})  
+   SET(DGtalLibInc ${Boost_INCLUDE_DIRS})
 endif( Boost_FOUND )
 
 

ChangeLog.md

@@ -17,17 +17,16 @@
     Kerautret [#366](https://github.com/DGtal-team/DGtalTools/pull/366))
   - curvatureScaleSpaceBCC: better use of exportFile with template specialisation.
     (Bertrand Kerautret, [#375](https://github.com/DGtal-team/DGtalTools/pull/375))
- 
+
 - *volumetric:
   - Passing argument by const reference in (min|max|mean)Val of volSubSample.
     (Roland Denis, [#359](https://github.com/DGtal-team/DGtalTools/pull/359/files))
   - Using SourceForge to download doxygen sources during Travis CI jobs.
     (Roland Denis [#360](https://github.com/DGtal-team/DGtalTools/pull/360))
   - volMask: new tool to extract a new image from the a masked image.
     (Jonas Lamy and Bertrand Kerautret [374](https://github.com/DGtal-team/DGtalTools/pull/374))
-
-  - volAddBorder: Add an option that sets zero value to domain boundary voxels without 
-    changing the domain extent (Bertrand Kertautret 
+  - volAddBorder: Add an option that sets zero value to domain boundary voxels without
+    changing the domain extent (Bertrand Kertautret
     [#371](https://github.com/DGtal-team/DGtalTools/pull/371))
   - Fix a wrong error message that appears when using the tool (wrong IO error)
     (Bertrand Kerautret
@@ -38,24 +37,24 @@
      (Bertrand Kerautret [#372](https://github.com/DGtal-team/DGtalTools/pull/372))
   -  Fix missing title page and various small doc corrections.
      (Bertrand Kerautret [#381](https://github.com/DGtal-team/DGtalTools/pull/381))
-     
+
 - *converters*
   - itk2vol: change the type of the threshold parameter in order to be able to
     convert ITK images of type double, it also adds a new option to mask the
-    source image using another image.  (Bertrand Kerautret, 
+    source image using another image.  (Bertrand Kerautret,
     [#367](https://github.com/DGtal-team/DGtalTools/pull/367))
 
 - *estimators*
   - volSurfaceRegularization now in the "make install" command. (David
     Coeurjolly, [#376](https://github.com/DGtal-team/DGtalTools/pull/376))
   - 3dLocalEstimators now included in the main build and fix compilation issues
-    and documentation added. 
-    [#382](https://github.com/DGtal-team/DGtalTools/issues/382). 
+    and documentation added.
+    [#382](https://github.com/DGtal-team/DGtalTools/issues/382).
     (Bertrand Kerautret [#383](https://github.com/DGtal-team/DGtalTools/pull/383))
-    
+
 - *converters*
   - volBoundary2obj improved using new Shortcuts helpers.
-    (Bertrand Kerautret 
+    (Bertrand Kerautret
     [#370](https://github.com/DGtal-team/DGtalTools/pull/370))
 
 - *imageProcessing*:
@@ -87,7 +86,7 @@
     - Fix compilation and execution with Visual Studio for volSurfaceRegularization.
       (Raphael Lenain
       [#353](https://github.com/DGtal-team/DGtalTools/pull/353))
-      
+
 - *volumetric*
     - New tool to fill the interior of a voxel set (volFillInterior).
       (David  Coeurjolly,[#343](https://github.com/DGtal-team/DGtalTools/pull/334)).