Merge pull request #1236 from dcoeurjo/rel0.9.3

Preparing 0.9.3

.travis/install_deps_macos.sh

@@ -5,7 +5,7 @@
 #
 brew update
 #brew install qt5 doxygen homebrew/science/hdf5 graphviz graphicsmagick fftw eigen homebrew/boneyard/libqglviewer
-brew install qt5 doxygen  graphviz graphicsmagick fftw eigen homebrew/boneyard/libqglviewer
+brew install qt5 graphicsmagick fftw eigen homebrew/boneyard/libqglviewer
 
 ## Temporary HDF5 build issue
 export BTYPE="$BTYPE -DWITH_HDF5=false" && echo "Disabling HDF5 on MacOS";

.travis/main_build.sh

@@ -7,22 +7,22 @@ cd build
 
 ### Cmake
 echo "Using C++ = $CXXCOMPILER"
-cmake ..  $BTYPE -DCMAKE_CXX_COMPILER=$CXXCOMPILER -DCMAKE_C_COMPILER=$CCOMPILER 
+cmake ..  $BTYPE -DCMAKE_CXX_COMPILER=$CXXCOMPILER -DCMAKE_C_COMPILER=$CCOMPILER
 
 
 ### DGtal Core build
 if [ $NEEDCORE = "true" ];
 then
-    make -j 3 DGtal 
+    make -j 3 DGtal
 fi
 
 echo "NeedExample $NEEDEXAMPLESANDTESTS"
 ### DGtal Examples and Examples
 if [ $NEEDEXAMPLESANDTESTS = "true" ];
 then
-    cd examples ; make  -j 3 ; echo "PWD"; pwd ; ls -l ..
+    cd examples ; make  -j 3
     cd ../tests ;  make -j 3
-    make test  ARGS=--output-on-failure
+    ctest -j 3--output-on-failure
 fi
 
 ### DGtal doc

CMakeLists.txt

@@ -15,7 +15,7 @@ ENDIF()
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 SET(DGtal_VERSION_MAJOR 0)
 SET(DGtal_VERSION_MINOR 9)
-SET(DGtal_VERSION_PATCH 3beta)
+SET(DGtal_VERSION_PATCH 3)
 SET(DGTAL_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}")
 SET(PROJECT_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}")
 SET(VERSION ${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH})

ChangeLog.md

@@ -1,38 +1,44 @@
-  # DGtal 0.9.3
+# DGtal 0.9.3
 
 ## New Features / Critical Changes
 
 - *Configuration/General*
- - Set flag -std=c++11 only if needed. Modern compilers set compatible flags
-   by default (gnu++14, etc). (Pablo H Cerdan,
-   [#1222](https://github.com/DGtal-team/DGtal/pull/1222))
  - The project has a now a unique compiled library: DGtal. The DGtalIO
    target has been removed. (David Coeurjolly,
    [#1226](https://github.com/DGtal-team/DGtal/pull/1226))
  - New mandatory dependency for DGtal: zlib must be installed in the system.
-   (David Coeurjolly, #1228](https://github.com/DGtal-team/DGtal/pull/1228))
+   (David Coeurjolly, [#1228](https://github.com/DGtal-team/DGtal/pull/1228))
+
+- *Topology Package*
+ -  Implementation of ParDirCollapse with CollapseSurface and CollapseIsthmus.
+    (Mohamad ONAYSSI, Bibiana MARTINEZ, Mohamed MELLOULI, Kacper PLUTA,
+    [#1199](https://github.com/DGtal-team/DGtal/pull/1199))
 
 - *Geometry Package*
  - VoronoiMap, PowerMap, (Reverse)DistanceTransformation and ReducedMedialAxis
    now work on toric domains (with per-dimension periodicity specification).
    (David Coeurjolly, Roland Denis,
    [#1206](https://github.com/DGtal-team/DGtal/pull/1206))
+
 - *IO*
  - New version (3) for the VOL file format that allows (zlib) compressed volumetric
    data. VolReady and VolWriter can still manage Version 2 Vols.
-   (David Coeurjolly, #1228](https://github.com/DGtal-team/DGtal/pull/1228))
+   (David Coeurjolly, [#1228](https://github.com/DGtal-team/DGtal/pull/1228))
 
 ## Changes
 
- - *Configuration/General*
-  - Continuous integration Travis bots are now based on ubunutu/trusty containers.
-    (David Coeurjolly, [#1227](https://github.com/DGtal-team/DGtal/pull/1208))
-
+- *Configuration/General*
+ - Continuous integration Travis bots are now based on ubunutu/trusty containers.
+   (David Coeurjolly, [#1227](https://github.com/DGtal-team/DGtal/pull/1208))
+ - Set flag -std=c++11 only if needed. Modern compilers set compatible flags
+   by default (gnu++14, etc). (Pablo H Cerdan,
+   [#1222](https://github.com/DGtal-team/DGtal/pull/1222))
+
  - *Documentation*
   - All the example descriptions are now in their the examples file (instead in
     dox files).
     (Bertrand Kerautret, #1240](https://github.com/DGtal-team/DGtal/pull/1240)
- 
+
 ## Bug Fixes
 
 - *Configuration/General*
@@ -60,13 +66,8 @@
  - Viewer3D: fix bad rendering when changing the scale.
    (Bertrand Kerautret, [#1217](https://github.com/DGtal-team/DGtal/pull/1217))
 
-- *Topology Package*
- -  Implementation of ParDirCollapse with CollapseSurface and CollapseIsthmus.
-    (Mohamad ONAYSSI, Bibiana MARTINEZ, Mohamed MELLOULI, Kacper PLUTA,
-    [#1199](https://github.com/DGtal-team/DGtal/pull/1199))
-
 - *Documentation*
- - Fixing various bib references.
+ - Fixing various BibTeX references.
    (Bertrand Kerautret, [##1237](https://github.com/DGtal-team/DGtal/pull/1237))
 
 # DGtal 0.9.2

examples/dec/exampleDECSurface.cpp

@@ -28,20 +28,20 @@ struct FalseOutsideDomain
 
     typedef typename Predicate::Point Point;
 
-    FalseOutsideDomain(DGtal::ConstAlias<Predicate> predicate, DGtal::ConstAlias<Domain> domain) :
-        predicate(&predicate), domain(&domain)
+    FalseOutsideDomain(DGtal::ConstAlias<Predicate> predicate, DGtal::ConstAlias<Domain> adomain) :
+        myPredicate(&predicate), myDomain(&adomain)
     {
     }
 
     bool
     operator()(const Point& point) const
     {
-        if (!domain->isInside(point)) return false;
-        return (*predicate)(point);
+        if (!myDomain->isInside(point)) return false;
+        return (*myPredicate)(point);
     }
 
-    const Predicate* predicate;
-    const Domain* domain;
+    const Predicate* myPredicate;
+    const Domain* myDomain;
 };
 
 void
@@ -307,4 +307,3 @@ int main(int argc, char* argv[])
 
     return app.exec();
 }
-

examples/dec/exampleDiscreteExteriorCalculusSolve.cpp

@@ -851,7 +851,7 @@ void solve3d_decomposition()
         {
             const int degree = laplace_diag[kk];
             ASSERT( degree >= 0 );
-            ASSERT( degree < degrees.size() );
+            ASSERT( static_cast<unsigned int>(degree) < degrees.size() );
             degrees[degree] ++;
         }
 
@@ -969,4 +969,3 @@ int main(int argc, char* argv[])
 
     return app.exec();
 }
-

examples/dec/examplePropagation.cpp

@@ -271,7 +271,7 @@ void propa_2d()
     trace.endBlock();
 }
 
-int main(int argc, char* argv[])
+int main()
 {
     propa_2d();
     return 0;

examples/tutorial-examples/shapeGridCurveEstimator.cpp

@@ -70,12 +70,12 @@ using namespace DGtal;
 int main()
 {
   //shape
-  typedef Flower2D<Z2i::Space> Flower; 
-  Flower2D<Z2i::Space> flower(Z2i::Point(0,0), 20, 5, 5, 0);
-
   //! [shapeGridCurveEstimator-dig]
   //implicit digitization of a shape of type Flower 
   //into a digital space of type Space
+  typedef Flower2D<Z2i::Space> Flower; 
+  Flower2D<Z2i::Space> flower(Z2i::Point(0,0), 20, 5, 5, 0);
+
   double h = 1; 
   GaussDigitizer<Z2i::Space,Flower> dig;  
   dig.attach( flower );

src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox

@@ -23,7 +23,9 @@ namespace DGtal {
 In this example, we show how to test a
 length estimator of the contour of 
 a generated shape, which is digitized 
-at different resolutions.   
+at different resolutions.
+
+Please have a look to shapeGridCurveEstimator.cpp to get the complete source code of this tutorial.
 
 [TOC]