14 Sep
2011
14 Sep
'11
7:14 p.m.
This is a merge commit message of the following branches:
Merge: 6342ded c4bb3f8
Conflicts:
ChangeLog
milena/ChangeLog
milena/ChangeLog | 29 ++++++++++
milena/mln/io/dicom/load.hh | 32 ++++++----
.../reconstruction/by_dilation/union_find.hh | 17 +++++-
.../morpho/reconstruction/by_erosion/union_find.hh | 17 +++++-
.../morpho/reconstruction/by_dilation/Makefile.am | 14 +++--
.../reconstruction/by_dilation/union_find.cc | 58 -------------------
.../by_dilation/union_find_on_functions.cc | 59 ++++++++++++++++++++
.../by_dilation/union_find_on_sets.cc | 58 +++++++++++++++++++
.../morpho/reconstruction/by_erosion/Makefile.am | 14 +++--
.../morpho/reconstruction/by_erosion/union_find.cc | 58 -------------------
.../by_erosion/union_find_on_functions.cc | 59 ++++++++++++++++++++
.../by_erosion/union_find_on_sets.cc | 58 +++++++++++++++++++
scribo/ChangeLog | 6 +-
13 files changed, 333 insertions(+), 146 deletions(-)
diff --cc milena/ChangeLog
index f7955cc,98f7f77..d6c5474
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@@ -1,441 -1,32 +1,470 @@@
+ 2011-05-12 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/io/dicom/load.hh: Fix invalid data while loading large
+ image.
+
+ 2010-12-10 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Ensure non implemented reconstructions on sets abort at run time.
+
+ * mln/morpho/reconstruction/by_dilation/union_find.hh,
+ * mln/morpho/reconstruction/by_erosion/union_find.hh
+ (union_find_dispatch(image::kind::logic, Image, Image, Neighborhood)):
+ Here.
+ * tests/morpho/reconstruction/by_dilation/union_find.cc,
+ * tests/morpho/reconstruction/by_erosion/union_find.cc:
+ Rename as...
+ * tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc,
+ * tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc:
+ ...these.
+ * tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc,
+ * tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc:
+ New tests.
+ * tests/morpho/reconstruction/by_dilation/Makefile.am,
+ * tests/morpho/reconstruction/by_erosion/Makefile.am:
+ Adjust.
+ (check_PROGRAMS): Add union_find_on_sets.
+ (union_find_on_sets_SOURCES): New.
+ (XFAIL_TESTS): New. Add union_find_on_sets.
+
+2011-05-20 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr>
+
+ * img/lena.pgm: Replace by official version;
+ see http://www.ece.rice.edu/~wakin/images/
+
+2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Address some errors reported by clang.
+
+ * mln/data/fill.hh (mln::data::internal::fill_dispatch): Move this
+ function after the routines it calls.
+
+2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Address clang's warnings.
+
+ * mln/algebra/h_vec.hh,
+ * mln/core/image/dmorph/sub_image.hh,
+ * mln/core/internal/pixel_impl.hh,
+ * mln/core/site_set/box.hh,
+ * mln/core/site_set/p_array.hh,
+ * mln/metal/vec.hh,
+ * mln/pw/internal/image_base.hh,
+ * mln/topo/adj_higher_face_iter.hh,
+ * mln/topo/adj_lower_face_iter.hh,
+ * mln/topo/algebraic_face.hh,
+ * mln/topo/face.hh,
+ * mln/topo/face_data.hh:
+ Use `class' and `struct' uniformly in declarations and
+ definitions.
+ * mln/convert/impl/from_double_to_value.hh,
+ * mln/convert/impl/from_float_to_value.hh,
+ * mln/convert/impl/from_int_to_value.hh,
+ * mln/core/image/complex_window_piter.hh,
+ * mln/core/point.hh,
+ * mln/opt/element.hh,
+ * mln/value/lut_vec.hh:
+ Comment out unused arguments.
+ * mln/topo/complex.hh [NDEBUG]: Avoid a warning about an unused
+ variable.
+
+2009-10-06 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Update tests/core/image/graph_image.
+
+ * tests/core/image/graph_image.cc (main): Actually print the
+ graph.
+ Update comments.
+
+2011-06-09 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Make Milena's copyright headers uniform.
+
+ * apps/mesh-segm-skel/io.hh,
+ * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc,
+ * apps/mesh-segm-skel/mesh-complex-max-curv.cc,
+ * apps/mesh-segm-skel/mesh-complex-segm.cc,
+ * apps/mesh-segm-skel/mesh-complex-skel.cc,
+ * apps/mesh-segm-skel/mesh-max-curv.cc,
+ * apps/mesh-segm-skel/mesh-pinv-curv.cc,
+ * apps/mesh-segm-skel/mesh-segm.cc,
+ * apps/mesh-segm-skel/mesh-skel.cc,
+ * apps/mesh-segm-skel/off-to-vtk-bin.cc,
+ * apps/mesh-segm-skel/save_bin_alt.hh,
+ * apps/mesh-segm-skel/trimesh/misc.hh,
+ * apps/papers/levillain.09.ismm/complex.cc,
+ * apps/papers/levillain.09.ismm/image2d.cc,
+ * doc/benchmark/canvas.cc,
+ * doc/benchmark/median/median_bench.cc,
+ * doc/benchmark/morpho/erosion.cc,
+ * doc/examples/trash/erosion.cc,
+ * doc/examples/trash/graph.cc,
+ * doc/examples/trash/labeling_algo.cc,
+ * doc/examples/trash/mk_graph.cc,
+ * doc/oldies/2008__tour1.cc,
+ * doc/oldies/2008__tour1_extra.cc,
+ * doc/oldies/2008__tour2.cc,
+ * doc/oldies/2008__tour3.cc,
+ * doc/tools/sample_utils.hh,
+ * mln/morpho/watershed/topological.hh,
+ * trash/bgraph_image.cc,
+ * trash/bgraph_image.hh,
+ * trash/bgraph_psite.hh,
+ * trash/boost_graph.cc,
+ * trash/boost_graph.hh,
+ * trash/boost_graph_access.hh,
+ * trash/boost_graph_property.hh,
+ * trash/boost_graph_structure.hh,
+ * trash/clock_neighb.hh,
+ * trash/clock_neighb2d.cc,
+ * trash/clock_neighb2d.hh,
+ * trash/clock_neighb2d_bis.cc,
+ * trash/display_color_pretty.cc,
+ * trash/display_color_pretty.hh,
+ * trash/display_remove.hh,
+ * trash/display_save.hh,
+ * trash/display_save_and_show.hh,
+ * trash/display_show.cc,
+ * trash/display_show.hh,
+ * trash/fi_adaptor.cc,
+ * trash/fi_adaptor.hh,
+ * trash/graph_image.hh,
+ * trash/line_graph_image.hh,
+ * trash/mono_obased_rle_encode.hh,
+ * trash/mono_obased_rle_image.cc,
+ * trash/mono_obased_rle_image.hh,
+ * trash/mono_rle_encode.hh,
+ * trash/mono_rle_image.cc,
+ * trash/mono_rle_image.hh,
+ * trash/neighb_get.hh,
+ * trash/neighb_image.cc,
+ * trash/neighb_image.hh,
+ * trash/obased_rle_encode.hh,
+ * trash/obased_rle_image.cc,
+ * trash/obased_rle_image.hh,
+ * trash/p_bgraph.cc,
+ * trash/p_bgraph.hh,
+ * trash/p_bgraph_piter.hh,
+ * trash/rle_encode.hh,
+ * trash/rle_image.cc,
+ * trash/rle_image.hh,
+ * trash/save_and_show.cc,
+ * trash/sparse_encode.hh,
+ * trash/sparse_image.cc,
+ * trash/sparse_image.hh,
+ * trash/t_image.cc,
+ * trash/t_image.hh,
+ * trash/to_tiles.cc,
+ * trash/to_tiles.hh,
+ * trash/translate_image.cc,
+ * trash/translate_image.hh,
+ * trash/value_enc_image.cc,
+ * trash/value_enc_image.hh,
+ * trash/value_encode.hh:
+ Here.
+
+2011-09-13 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/concept/function.hh: Be consistent in operator=()
+ prototype.
+
+2011-09-13 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Prevent g++ 4.2 from issuing bad code for constrained-connectivity.
+
+ * apps/constrained-connectivity/Makefile.am
+ (constrained_connectivity_CXXFLAGS): New.
+ Append $(STRICT_ALIASING_CXXFLAGS).
+
+2011-09-12 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix the return type of mln::Function<E>::operator=.
+
+ * mln/core/concept/function.hh: Here.
+
+2011-09-12 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Stop warning about Debian's g++ 4.2 compiler issues.
+
+ * mln/data/memcpy_.hh
+ (mln::data::impl_::memcpy__<Pd, Ps>(Pd&, const Ps&, std::size_t)):
+ Here.
+
+2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/value/builtin/carrays.hh: Fix a compilation error with
+ Apple's clang 2.1.
+
+2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Workaround for Apple's llvm-gcc 4.2.1 on Mac OS Lion 10.7.1
+
+ * mln/core/concept/function.hh: Add operator=() in Function
+ concept class.
+
+2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/Makefile.am: Fix devel-refman output directory.
+
+2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/border/mirror.cc: Add missing includes.
+
+2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix doc generation.
+
+ * doc/Doxyfile.in: Enable source code parsing and listing. Fix
+ include directories.
+
+ * doc/ref-guide.tex,
+ * doc/technical.tex: Use .sty files as input files instead of
+ packages.
+
+ * doc/tutorial.tex: Use .sty files as input files instead of
+ packages. Fix references.
+
+ * mln/core/concept/object.hh: Fix copyright.
+
+2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/image/vertex_image.hh: Fix invalid construction.
+
+2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add comments.
+
+ * mln/accu/take.hh,
+ * mln/border/mirror.hh: Here.
+
+2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/border/mirror.cc: Revamp test.
+
+2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Small fixes in Milena.
+
+ * mln/draw/site_set.hh: Remove call to exact().
+
+ * mln/morpho/skeleton_constrained.hh: Add a missing const in fast
+ implementation.
+
+ * mln/topo/is_simple_2d.hh: Add a comment.
+
+ * mln/topo/skeleton/is_simple_point.hh: Fix a wrong neighborhood
+ type.
+
+ * tests/topo/skeleton/is_simple_point.cc: Fix compilation.
+
+2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/morpho/skeleton_constrained.hh: Fix algorithm.
+
+2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Regen generated files in Milena.
+
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk: Here.
+
+2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/debug/println_with_border.spe.hh: Improve output for 3D
+ images.
+
+2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add vbbox() method.
+
+ * mln/core/image/image1d.hh,
+ * mln/core/image/image2d.hh,
+ * mln/core/image/image3d.hh: Here.
+
+2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Rename back nslices to nslis.
+
+ * mln/core/image/image3d.hh,
+ * mln/core/internal/box_impl.hh,
+ * mln/core/site_set/box.hh,
+ * mln/debug/slices_2d.hh,
+ * mln/geom/all.hh,
+ * mln/geom/size3d.hh,
+ * mln/linear/gaussian.hh,
+ * mln/linear/gaussian/impl.hh,
+ * mln/make/box3d.hh,
+ * mln/make/image.hh,
+ * mln/make/image3d.hh,
+ * mln/registration/icp.hh,
+ * tests/core/alias/box3d.cc,
+ * tests/core/image/image3d.cc,
+ * tests/geom/Makefile.am,
+ * tests/io/pbms/load.cc,
+ * tests/io/pgms/load.cc,
+ * tests/io/ppms/load.cc: Rename nslices to nslis.
+
+ * mln/geom/nslices.hh,
+ * tests/geom/nslices.cc: Rename as...
+
+ * mln/geom/nslis.hh,
+ * tests/geom/nslis.cc: ...this.
+
+2011-08-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/figures/ima2d-rot-2.ppm: Regen.
+
+2011-08-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix tests.
+
+ * tests/labeling/blobs_and_compute.cc,
+ * tests/morpho/skeleton_constrained.cc: Here.
+
+2011-08-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix genericity in skeleton computation.
+
+ * mln/morpho/skeleton_constrained.hh,
+ * mln/topo/skeleton/is_simple_point.hh: Expect a double
+ neighborhood.
+
+ * mln/topo/is_simple_2d.hh: Add a fast implementation.
+
+2011-08-08 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Small fixes.
+
+ * mln/core/point.hh: Fix point1d conversion.
+
+ * mln/debug/draw_graph.hh: Don't write outside output image.
+
+ * mln/win/multiple_size.hh: Avoid a warning.
+
+2011-08-05 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/util/timer.hh: Add support for milliseconds output.
+
+2011-06-28 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/morpho/skeleton_constrained.hh: Add a missing include.
+
+2011-06-28 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/border/equalize.hh: Fix an invalid assertion.
+
+2011-06-27 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/debug/draw_graph.hh: Limit the use of exact().
+
+2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/draw/polygon.hh: New.
+
+2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a missing conversion routine for object ids.
+
+ * mln/convert/from_to.hxx,
+ * mln/util/object_id.hh: Here.
+
+2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/draw/site_set.hh: new.
+
+2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add new sample programs.
+
+ * src/debug/Makefile.am: New targets.
+
+ * src/debug/show_groups_bboxes_filtered.cc,
+ * src/debug/show_text_lines_wo_seps.cc: New.
+
+2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix precision issue with algebra::vec conversion.
+
+ * mln/core/point.hh: Round float values.
+
+ * tests/geom/rotate.cc: Add a test to be sure there is no
+ precision issues.
+
+2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add fastest versions for skeleton constrained related algorithms.
+
+ * mln/morpho/skeleton_constrained.hh,
+ * mln/topo/skeleton/crest.hh: Add fastest versions.
+
+ * mln/topo/skeleton/is_simple_point.hh: Rewrite as functor and add
+ fastest versions.
+
+ * tests/topo/skeleton/is_simple_point.cc: Fix test.
+
+2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr>
+
+ * mln/io/magick/save.hh: Add support for opacity.
+
+2011-04-05 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/accu/stat/median_h.hh: Add missing operator=().
+
+2011-03-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Regen generated files.
+
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk: Here.
+
+2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Regen generated files.
+
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk: Here.
+
+2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/labeling/colorize.hh: Add a missing inline.
+
+2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add more from_to overloards.
+
+ * mln/convert/impl/from_unsigned_to_value.hh,
+ * mln/value/label.hh: Here.
+
+2011-03-01 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/labeling/fill_holes.hh: Improve speed.
+
+2011-03-01 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/fun/v2v/rgb_to_luma.hh: New function for grayscale
+ conversion.
+
+2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/util/array.hh: Add last() method.
+
+2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add an optional base index for debug::iota.
+
+ * mln/debug/iota.hh,
+ * mln/debug/iota.spe.hh: Here.
+
+2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/convert/to_qimage_nocopy.cc: Fix a warning.
+
+2011-01-20 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix a serious bug with gcc 4.5 and later.
+
+ * mln/value/equiv.hh: Return values by copy.
+
2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
Work around g++ 4.5 deficiencies to compile Milena.
hooks/post-receive
--
Olena, a generic and efficient image processing platform