[Olena-patches] olena-2.0-34-gb654f0d Merge branch 'apps-ismm-2009' into next

This is a merge commit message of the following branches: Merge: e337270 d590e49 Conflicts: milena/ChangeLog milena/ChangeLog | 82 + milena/apps/papers/levillain.09.ismm/Makefile.am | 28 +- .../papers/levillain.09.ismm/classif-1complex.cc | 307 + .../apps/papers/levillain.09.ismm/classif-graph.cc | 287 + .../apps/papers/levillain.09.ismm/classseedsi.pbm | 6415 ++++++++++++++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 259 +- .../papers/levillain.09.ismm/influence_zones.hh | 84 + milena/apps/papers/levillain.09.ismm/io.hh | 242 + 8 files changed, 7451 insertions(+), 253 deletions(-) diff --cc milena/ChangeLog index bdd98f1,295f398..745f38b --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,113 -1,85 +1,195 @@@ + 2011-11-24 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Honor a precondition in classification examples (ISMM 2009). + + * apps/papers/levillain.09.ismm/classif-graph.cc, + * apps/papers/levillain.09.ismm/classif-1complex.cc: + Do not use a value outside the range [0, nbasins] in `canvas_wst' + to prevent a failed precondition in labeling::colorize (when + NDEBUG is not defined). + Reported by David Coeurjolly <david.coeurjolly at liris.cnrs.fr>. + + 2011-10-11 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Graph-based version of the classification example. + + * apps/papers/levillain.09.ismm/classif-graph.cc: New. + * apps/papers/levillain.09.ismm/Makefile.am (noinst_PROGRAMS): + Add classif-graph. + (classif_graph_SOURCES): New. + (noinst_DATA): Add classwst-graph.ppm. + (classwst-graph.ppm): New target. + + 2011-10-10 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Rename apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Rename as... + * apps/papers/levillain.09.ismm/classif-1complex.cc: ...this. + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS, noinst_DATA): s/classif/classif-1complex/. + (classif_SOURCES, classwst.pnm): Replace by... + (classif_1complex_SOURCES, classwst-1complex.ppm): ...these. + + 2011-10-10 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Aesthetic changes in apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Here. + Remove useless headers inclusions. + Adjust comments. + + 2011-10-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Fix and clean up apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc (main): Actually use + the chain() routine from chain.hh instead of ad hoc code. + Move code related to the construction of the 1-complex (graph) + image on which the processing chain is run... + (make_complex_image): ...here. + * apps/papers/levillain.09.ismm/Makefile.am (classwst.pnm): Change + the lambda (area) parameter to 4. + + 2011-10-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Import the WST-based classification in apps/papers/levillain.09.ismm. + + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS): Add classif. + (classif_SOURCES): Add classif.cc + (dist_noinst_DATA): Add classseedsi.pbm. + (noinst_DATA): Add classwst.pnm. + (classwst.pnm): New target. + * apps/papers/levillain.09.ismm/classif.cc: New. + Copied and adapted from + sandbox/theo/esiee/laurent/presentation/classif.cc. + * apps/papers/levillain.09.ismm/classseedsi.pbm: New. + + 2011-10-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Split apps/papers/levillain.09.ismm/graph.cc. + + * apps/papers/levillain.09.ismm/graph.cc: Misc. changes. + (mln::influence_zones) + (mln::io::neato::save): + Move functions... + * apps/papers/levillain.09.ismm/influence_zones.hh, + * apps/papers/levillain.09.ismm/io.hh: + ...here (new files). + * apps/papers/levillain.09.ismm/Makefile.am (noinst_HEADERS): + Add io.hh and influence_zones.hh + +2011-11-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix the initialization of all global constants (ticket #43) + + * mln/debug/slices_2d.hh, + * mln/io/dump/get_header.hh, + * mln/io/fld/header.hh, + * mln/io/fld/load.hh, + * mln/io/fld/load_header.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/math/jacobi.hh, + * mln/morpho/hit_or_miss.hh, + * mln/world/binary_2d/subsample.hh: Add missing 'inline'. + + * tests/Makefile.am (CXXFLAGS): Add -DMLN_WO_GLOBAL_VARS. + + * tests/global_vars1.cc, + * tests/global_vars2.cc: Make take MLN_WO_GLOBAL_VARS into + consideration. + +2011-11-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix invalid minimum value for builtin floating types. (ticket #247) + + * mln/value/builtin/floatings.hh: Here. + + * tests/value/builtin/floatings.cc: write test. + +2011-11-24 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. + +2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation with multiple files. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/grays.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/white.hh: Add missing inline keyword and + MLN_WO_GLOBAL_VARS guards. + +2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix more compilation issues with g++ 4.6.1 and clang++. + + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/grays.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/zero.hh: Add default constructors. + +2011-11-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation issues with g++ 4.6.1 and clang++. + + * mln/topo/center_only_iter.hh, + * mln/topo/face.hh, + * mln/trait/images.hh, + * mln/convert/from_to.hxx, + * mln/core/image/dmorph/sub_image.hh, + * mln/core/routine/init.hxx, + * mln/algebra/vec.hh: Make declaration and forward declarations + consistent. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/white.hh: Add a default constructor for global + variable types. + + * mln/canvas/browsing/internal/graph_first_search.hh: Avoid a + warning for an unused variable. + + * mln/data/was.median.hh: Fix type of the reference. + 2011-10-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Handle the case of filling an empty border. hooks/post-receive -- Olena, a generic and efficient image processing platform