Merge branch 'master' into AddOpenSimplexToConvexity

ChangeLog.md

@@ -18,7 +18,9 @@
 
 - *Geometry*
   - Bug fix in ArithmeticalDSSComputerOnSurfels (Tristan Roussillon, [#1742](https://github.com/DGtal-team/DGtal/pull/1742))
-
+
+- *Topology*
+  - Fixing images in the Cubical Complex documentation page (David Coeurjolly, [#1748](https://github.com/DGtal-team/DGtal/pull/1748)) 
 
 # DGtal 1.4.1
 

src/DGtal/shapes/doc/moduleShape.dox

@@ -205,7 +205,7 @@ The following images show you binary operations apply on two Ball2D (results are
 @image html union_shapes.png "Plus operation"
 @image html intersection_shapes.png "Intersection operation"
 @image html minus_shapes.png "Minus operation"
-@image html union_shapes_golf.png "Minus operations" width=5cm
+@image html union_shapes_golf.png "Minus operations" 
 @image latex union_shapes.png "Plus operation" width=5cm
 @image latex intersection_shapes.png "Intersection operation" width=5cm
 @image latex minus_shapes.png "Minus operation" width=5cm

src/DGtal/topology/doc/moduleCubicalComplex.dox

@@ -335,10 +335,10 @@ c) attach a cubical complex \f$X\f$ to be thinned:
 d) run the algorithm (here two iterations):
 @snippet topology/cubicalComplexThinning.cpp thinn
 
-@image html ComplexBeforeThinning.png "The starting complex X before thinning." width=3cm
+@image html ComplexBeforeThinning.png "The starting complex X before thinning." 
 @image latex ComplexBeforeThinning.png "The starting complex X before thinning." width=3cm
 
-@image html ParDirCollapse_2.png  "The starting complex X after two iterations of ParDirCollapse." width=5cm
+@image html ParDirCollapse_2.png  "The starting complex X after two iterations of ParDirCollapse."
 @image latex ParDirCollapse_2.png  "The starting complex X after two iterations of ParDirCollapse." width=5cm
 
 The second scheme, so-called SurfaceCollapse is similar to ParDirCollapse. The only difference is that after each
@@ -351,7 +351,7 @@ To run SurfaceCollapse we apply steps a--c for ParDirCollapse and then we apply
 d) run the algorithm:
 @snippet topology/cubicalComplexThinning.cpp thinnSurface
 
-@image html ParDirCollapse_collapseSurface.png "The starting complex X after SurfaceCollapse." width=3cm
+@image html ParDirCollapse_collapseSurface.png "The starting complex X after SurfaceCollapse." 
 @image latex ParDirCollapse_collapseSurface.png "The starting complex X after SurfaceCollapse." width=3cm
 
 The last scheme, so-called IsthmusCollapse is similar to SurfaceCollapse. The only difference is that after each
@@ -365,7 +365,7 @@ To run SurfaceCollapse we apply steps a--c for ParDirCollapse and then we apply
 d) run the algorithm:
 @snippet topology/cubicalComplexThinning.cpp thinnIsthmus
 
-@image html ParDirCollapse_collapseIsthmus.png "The starting complex X after IsthmusCollapse." width=3cm
+@image html ParDirCollapse_collapseIsthmus.png "The starting complex X after IsthmusCollapse." 
 @image latex ParDirCollapse_collapseIsthmus.png "The starting complex X after IsthmusCollapse." width=3cm
 
 For more details see the example topology/cubicalComplexThinning.cpp.