URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008
ChangeLog:
2008-11-10 Matthieu Garrigues <garrigues(a)lrde.epita.fr>
Put Licence to 70 cols.
* milena/doc/benchmark/morpho/erosion.cc: .
* milena/mln/accu/count_adjacent_vertices.hh: .
* milena/mln/accu/height.hh: .
* milena/mln/border/fill.hh: .
* milena/mln/border/get.hh: .
* milena/mln/canvas/morpho/algebraic_union_find.hh: .
* milena/mln/convert/to_p_array.hh: .
* milena/mln/convert/to_upper_window.hh: .
* milena/mln/convert/to_window.hh: .
* milena/mln/core/alias/dpoint1d.hh: .
* milena/mln/core/alias/dpoint2d.hh: .
* milena/mln/core/alias/dpoint2d_h.hh: .
* milena/mln/core/alias/dpoint3d.hh: .
* milena/mln/core/alias/point1d.hh: .
* milena/mln/core/alias/point2d.hh: .
* milena/mln/core/alias/point2d_h.hh: .
* milena/mln/core/alias/point3d.hh: .
* milena/mln/core/alias/point3df.hh: .
* milena/mln/core/alias/window1d.hh: .
* milena/mln/core/alias/window3d.hh: .
* milena/mln/core/dpoints_pixter.hh: .
* milena/mln/core/image/bgraph_image.hh: .
* milena/mln/core/image/bgraph_psite.hh: .
* milena/mln/core/image/decorated_image.hh: .
* milena/mln/core/image/fi_adaptor.hh: .
* milena/mln/core/image/graph_elt_neighborhood.hh: .
* milena/mln/core/image/graph_elt_window.hh: .
* milena/mln/core/image/graph_image.hh: .
* milena/mln/core/image/graph_neighborhood_piter.hh: .
* milena/mln/core/image/graph_window_piter.hh: .
* milena/mln/core/image/line_graph_elt_neighborhood.hh: .
* milena/mln/core/image/line_graph_elt_window.hh: .
* milena/mln/core/image/line_graph_image.hh: .
* milena/mln/core/image/line_graph_neighborhood_piter.hh: .
* milena/mln/core/image/line_graph_psite.hh: .
* milena/mln/core/image/line_graph_window_piter.hh: .
* milena/mln/core/internal/force_exact.hh: .
* milena/mln/core/internal/image_value_morpher.hh: .
* milena/mln/core/internal/line_graph_vicinity_piter.hh: .
* milena/mln/core/internal/pixel_iterator_base.hh: .
* milena/mln/core/pixter1d.hh: .
* milena/mln/core/pixter2d.hh: .
* milena/mln/core/pixter3d.hh: .
* milena/mln/core/site_set/p_bgraph.hh: .
* milena/mln/core/site_set/p_bgraph_piter.hh: .
* milena/mln/core/site_set/p_edges.hh: .
* milena/mln/core/site_set/p_graph.hh: .
* milena/mln/core/site_set/p_graph_piter.hh: .
* milena/mln/core/site_set/p_line_graph.hh: .
* milena/mln/core/site_set/p_line_graph_piter.hh: .
* milena/mln/core/site_set/p_vertices.hh: .
* milena/mln/core/trait/qlf_value.hh: .
* milena/mln/debug/graph.hh: .
* milena/mln/geom/seeds2tiling.hh: .
* milena/mln/geom/seeds2tiling_roundness.hh: .
* milena/mln/labeling/background.hh: .
* milena/mln/labeling/flat_zones.hh: .
* milena/mln/labeling/foreground.hh: .
* milena/mln/labeling/regional_maxima.hh: .
* milena/mln/labeling/regional_minima.hh: .
* milena/mln/level/memset_.hh: .
* milena/mln/linear/gaussian.hh: .
* milena/mln/make/voronoi.hh: .
* milena/mln/math/abs.hh: .
* milena/mln/metal/abort.hh: .
* milena/mln/morpho/closing_area.hh: .
* milena/mln/morpho/closing_area_on_vertices.hh: .
* milena/mln/morpho/closing_attribute.hh: .
* milena/mln/morpho/closing_height.hh: .
* milena/mln/morpho/closing_volume.hh: .
* milena/mln/morpho/opening_area.hh: .
* milena/mln/morpho/opening_area_on_vertices.hh: .
* milena/mln/morpho/opening_attribute.hh: .
* milena/mln/morpho/opening_height.hh: .
* milena/mln/morpho/opening_volume.hh: .
* milena/mln/set/inter.hh: .
* milena/mln/tag/skeleton.hh: .
* milena/mln/trait/ch_value.hh: .
* milena/mln/util/graph.hh: .
* milena/mln/util/greater_point.hh: .
* milena/mln/util/greater_psite.hh: .
* milena/mln/util/internal/boost_graph.hh: .
* milena/mln/util/internal/boost_graph_access.hh: .
* milena/mln/util/internal/boost_graph_property.hh: .
* milena/mln/util/internal/boost_graph_structure.hh: .
* milena/mln/util/internal/graph_base.hh: .
* milena/mln/util/ord_pair.hh: .
* milena/mln/value/int_u_sat.hh: .
* milena/mln/value/proxy.hh: .
* milena/mln/value/stack.hh: .
* milena/mln/win/line.hh: .
* milena/sandbox/garrigues/ocr/check.sh: .
* milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc: .
* milena/sandbox/garrigues/ocr/skeleton.hh: .
* milena/sandbox/jardonnet/array/old/1d.hh: .
* milena/sandbox/jardonnet/array/old/2d.hh: .
* milena/sandbox/jardonnet/array/old/3d.hh: .
* milena/sandbox/jardonnet/array/old/all.hh: .
* milena/sandbox/jardonnet/array/old/nd.hh: .
* milena/sandbox/jardonnet/array/old/objs.hh: .
* milena/sandbox/levillain/morpho/lower_completion.hh: .
* milena/sandbox/levillain/morpho/shortest_path_watershed.hh: .
* milena/sandbox/nivault/dmap.hh: .
* milena/sandbox/pellegrin/set/core/p_bgraph.hh: .
* milena/sandbox/pellegrin/set/core/p_graph.hh: .
* milena/sandbox/pellegrin/set/core/p_line_graph.hh: .
* milena/sandbox/vigouroux/color.hh: .
* milena/sandbox/vigouroux/color/color.hh: .
* milena/sandbox/vigouroux/color/hsi.hh: .
* milena/sandbox/vigouroux/color/hsl.hh: .
* milena/sandbox/vigouroux/color/hsv.hh: .
* milena/sandbox/vigouroux/color/nrgb.hh: .
* milena/sandbox/vigouroux/color/rgb.hh: .
* milena/sandbox/vigouroux/color/xyz.hh: .
* milena/sandbox/vigouroux/color/yiq.hh: .
* milena/sandbox/vigouroux/color/yuv.hh: .
* milena/sandbox/vigouroux/convert/abstract/colorconv.hh: .
* milena/sandbox/vigouroux/convert/abstract/conversion.hh: .
* milena/sandbox/vigouroux/convert/basics.hh: .
* milena/sandbox/vigouroux/convert/bound.hh: .
* milena/sandbox/vigouroux/convert/cast.hh: .
* milena/sandbox/vigouroux/convert/conversion.hh: .
* milena/sandbox/vigouroux/convert/conversion_ng_se.hh: .
* milena/sandbox/vigouroux/convert/force.hh: .
* milena/sandbox/vigouroux/convert/nrgbxyz.hh: .
* milena/sandbox/vigouroux/convert/rgbhsi.hh: .
* milena/sandbox/vigouroux/convert/rgbhsl.hh: .
* milena/sandbox/vigouroux/convert/rgbhsv.hh: .
* milena/sandbox/vigouroux/convert/rgbnrgb.hh: .
* milena/sandbox/vigouroux/convert/rgbxyz.hh: .
* milena/sandbox/vigouroux/convert/rgbyiq.hh: .
* milena/sandbox/vigouroux/convert/rgbyuv.hh: .
* milena/sandbox/vigouroux/convert/stretch.hh: .
* milena/tests/timer.hh: .
---
doc/benchmark/morpho/erosion.cc | 10 ++-
mln/accu/count_adjacent_vertices.hh | 3 -
mln/accu/height.hh | 3 -
mln/border/fill.hh | 3 -
mln/border/get.hh | 3 -
mln/canvas/morpho/algebraic_union_find.hh | 3 -
mln/convert/to_p_array.hh | 3 -
mln/convert/to_upper_window.hh | 3 -
mln/convert/to_window.hh | 3 -
mln/core/alias/dpoint1d.hh | 3 -
mln/core/alias/dpoint2d.hh | 3 -
mln/core/alias/dpoint2d_h.hh | 3 -
mln/core/alias/dpoint3d.hh | 3 -
mln/core/alias/point1d.hh | 3 -
mln/core/alias/point2d.hh | 3 -
mln/core/alias/point2d_h.hh | 3 -
mln/core/alias/point3d.hh | 3 -
mln/core/alias/point3df.hh | 3 -
mln/core/alias/window1d.hh | 3 -
mln/core/alias/window3d.hh | 3 -
mln/core/dpoints_pixter.hh | 3 -
mln/core/image/bgraph_image.hh | 3 -
mln/core/image/bgraph_psite.hh | 3 -
mln/core/image/decorated_image.hh | 3 -
mln/core/image/fi_adaptor.hh | 3 -
mln/core/image/graph_elt_neighborhood.hh | 3 -
mln/core/image/graph_elt_window.hh | 3 -
mln/core/image/graph_image.hh | 3 -
mln/core/image/graph_neighborhood_piter.hh | 3 -
mln/core/image/graph_window_piter.hh | 3 -
mln/core/image/line_graph_elt_neighborhood.hh | 3 -
mln/core/image/line_graph_elt_window.hh | 3 -
mln/core/image/line_graph_image.hh | 3 -
mln/core/image/line_graph_neighborhood_piter.hh | 3 -
mln/core/image/line_graph_psite.hh | 3 -
mln/core/image/line_graph_window_piter.hh | 3 -
mln/core/internal/force_exact.hh | 3 -
mln/core/internal/image_value_morpher.hh | 3 -
mln/core/internal/line_graph_vicinity_piter.hh | 3 -
mln/core/internal/pixel_iterator_base.hh | 3 -
mln/core/pixter1d.hh | 3 -
mln/core/pixter2d.hh | 3 -
mln/core/pixter3d.hh | 3 -
mln/core/site_set/p_bgraph.hh | 3 -
mln/core/site_set/p_bgraph_piter.hh | 3 -
mln/core/site_set/p_graph.hh | 3 -
mln/core/site_set/p_graph_piter.hh | 3 -
mln/core/site_set/p_line_graph.hh | 3 -
mln/core/site_set/p_line_graph_piter.hh | 3 -
mln/core/trait/qlf_value.hh | 3 -
mln/debug/graph.hh | 3 -
mln/geom/seeds2tiling.hh | 3 -
mln/geom/seeds2tiling_roundness.hh | 3 -
mln/labeling/background.hh | 3 -
mln/labeling/flat_zones.hh | 3 -
mln/labeling/foreground.hh | 3 -
mln/labeling/regional_maxima.hh | 3 -
mln/labeling/regional_minima.hh | 3 -
mln/level/memset_.hh | 3 -
mln/linear/gaussian.hh | 2
mln/make/voronoi.hh | 3 -
mln/math/abs.hh | 3 -
mln/metal/abort.hh | 3 -
mln/morpho/closing_area.hh | 3 -
mln/morpho/closing_area_on_vertices.hh | 3 -
mln/morpho/closing_attribute.hh | 3 -
mln/morpho/closing_height.hh | 3 -
mln/morpho/closing_volume.hh | 3 -
mln/morpho/opening_area.hh | 3 -
mln/morpho/opening_area_on_vertices.hh | 3 -
mln/morpho/opening_attribute.hh | 3 -
mln/morpho/opening_height.hh | 3 -
mln/morpho/opening_volume.hh | 3 -
mln/set/inter.hh | 3 -
mln/tag/skeleton.hh | 3 -
mln/trait/ch_value.hh | 3 -
mln/util/graph.hh | 3 -
mln/util/greater_point.hh | 3 -
mln/util/greater_psite.hh | 3 -
mln/util/internal/boost_graph.hh | 3 -
mln/util/internal/boost_graph_access.hh | 3 -
mln/util/internal/boost_graph_property.hh | 3 -
mln/util/internal/boost_graph_structure.hh | 3 -
mln/util/internal/graph_base.hh | 3 -
mln/util/ord_pair.hh | 3 -
mln/value/int_u_sat.hh | 3 -
mln/value/proxy.hh | 3 -
mln/value/stack.hh | 3 -
sandbox/garrigues/ocr/check.sh | 11 ++-
sandbox/garrigues/ocr/ocr_with_preprocess.cc | 49 +++++++++-------
sandbox/garrigues/ocr/skeleton.hh | 58 ++++++++++++--------
sandbox/jardonnet/array/old/1d.hh | 3 -
sandbox/jardonnet/array/old/2d.hh | 3 -
sandbox/jardonnet/array/old/3d.hh | 3 -
sandbox/jardonnet/array/old/all.hh | 3 -
sandbox/jardonnet/array/old/objs.hh | 3 -
sandbox/levillain/morpho/lower_completion.hh | 3 -
sandbox/levillain/morpho/shortest_path_watershed.hh | 3 -
sandbox/nivault/dmap.hh | 3 -
sandbox/pellegrin/set/core/p_bgraph.hh | 3 -
sandbox/pellegrin/set/core/p_graph.hh | 3 -
sandbox/pellegrin/set/core/p_line_graph.hh | 3 -
sandbox/vigouroux/color.hh | 3 -
sandbox/vigouroux/color/color.hh | 3 -
sandbox/vigouroux/color/hsi.hh | 3 -
sandbox/vigouroux/color/hsl.hh | 3 -
sandbox/vigouroux/color/hsv.hh | 3 -
sandbox/vigouroux/color/nrgb.hh | 3 -
sandbox/vigouroux/color/rgb.hh | 3 -
sandbox/vigouroux/color/xyz.hh | 3 -
sandbox/vigouroux/color/yiq.hh | 3 -
sandbox/vigouroux/color/yuv.hh | 3 -
sandbox/vigouroux/convert/abstract/colorconv.hh | 3 -
sandbox/vigouroux/convert/abstract/conversion.hh | 3 -
sandbox/vigouroux/convert/basics.hh | 3 -
sandbox/vigouroux/convert/bound.hh | 3 -
sandbox/vigouroux/convert/cast.hh | 3 -
sandbox/vigouroux/convert/conversion.hh | 3 -
sandbox/vigouroux/convert/force.hh | 3 -
sandbox/vigouroux/convert/nrgbxyz.hh | 3 -
sandbox/vigouroux/convert/rgbhsi.hh | 3 -
sandbox/vigouroux/convert/rgbhsl.hh | 3 -
sandbox/vigouroux/convert/rgbhsv.hh | 3 -
sandbox/vigouroux/convert/rgbnrgb.hh | 3 -
sandbox/vigouroux/convert/rgbxyz.hh | 3 -
sandbox/vigouroux/convert/rgbyiq.hh | 3 -
sandbox/vigouroux/convert/rgbyuv.hh | 3 -
sandbox/vigouroux/convert/stretch.hh | 3 -
tests/timer.hh | 3 -
129 files changed, 326 insertions(+), 176 deletions(-)
Index: branches/cleanup-2008/milena/tests/timer.hh
===================================================================
--- branches/cleanup-2008/milena/tests/timer.hh (revision 2837)
+++ branches/cleanup-2008/milena/tests/timer.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc
===================================================================
--- branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc (revision 2837)
+++ branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc (revision 2838)
@@ -41,6 +41,7 @@
#include <mln/value/int_u8.hh>
#include <mln/morpho/erosion.hh>
+#include <mln/arith/diff_abs.hh>
#include "tests/data.hh"
#include "tests/timer.hh"
@@ -84,7 +85,7 @@
// trace::quiet = false;
timer t;
-
+ /*
// Rectangle
std::cout << "-------------------------- Rectangle: " << std::endl;
@@ -271,9 +272,9 @@
mln_assertion(test);
std::cout << " " << (test ? "OK" : "KO!!!") << std::endl;
}
-
+ */
std::cout << "-------------------------- Octagon: " << std::endl;
-
+ border::thickness = 0;
// Octagon
{
t.start();
@@ -286,6 +287,9 @@
t.start();
out = morpho::erosion(lena, oct);
std::cout << "dispach on octagon: " << t << std::endl;
+ io::pgm::save(out, "out_oct.pgm");
+ io::pgm::save(arith::diff_abs(out, ref), "diff.pgm");
+
bool test = out == ref;
mln_assertion(test);
std::cout << " " << (test ? "OK" : "KO!!!") << std::endl;
Index: branches/cleanup-2008/milena/mln/trait/ch_value.hh
===================================================================
--- branches/cleanup-2008/milena/mln/trait/ch_value.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/trait/ch_value.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/debug/graph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/debug/graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/debug/graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_line_graph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_line_graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_line_graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_line_graph_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_line_graph_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_line_graph_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_graph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_bgraph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_bgraph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_bgraph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_graph_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_graph_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_graph_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_bgraph_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/site_set/p_bgraph_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/site_set/p_bgraph_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/site_set/p_vertices.hh
===================================================================
Index: branches/cleanup-2008/milena/mln/core/site_set/p_edges.hh
===================================================================
Index: branches/cleanup-2008/milena/mln/core/image/decorated_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/decorated_image.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/decorated_image.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_neighborhood_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_neighborhood_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_neighborhood_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_window_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_window_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_window_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/graph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_image.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/graph_image.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_elt_neighborhood.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_elt_neighborhood.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_elt_neighborhood.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_elt_window.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_elt_window.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_elt_window.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_psite.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_psite.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_psite.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/graph_window_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_window_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/graph_window_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/graph_neighborhood_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_neighborhood_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/graph_neighborhood_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/graph_elt_window.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_elt_window.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/graph_elt_window.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/graph_elt_neighborhood.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_elt_neighborhood.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/graph_elt_neighborhood.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/bgraph_psite.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/bgraph_psite.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/bgraph_psite.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/trait/qlf_value.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/trait/qlf_value.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/trait/qlf_value.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/pixter1d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/pixter1d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/pixter1d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/pixter2d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/pixter2d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/pixter2d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/pixter3d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/pixter3d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/pixter3d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/dpoints_pixter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/dpoints_pixter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/dpoints_pixter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/internal/pixel_iterator_base.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/internal/pixel_iterator_base.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/internal/pixel_iterator_base.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/internal/force_exact.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/internal/force_exact.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/internal/force_exact.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/internal/line_graph_vicinity_piter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/internal/line_graph_vicinity_piter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/internal/line_graph_vicinity_piter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/internal/image_value_morpher.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/internal/image_value_morpher.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/internal/image_value_morpher.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/dpoint1d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/dpoint1d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/dpoint1d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/dpoint2d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/dpoint2d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/dpoint2d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/dpoint3d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/dpoint3d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/dpoint3d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/point2d_h.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/point2d_h.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/point2d_h.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/point3df.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/point3df.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/point3df.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/dpoint2d_h.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/dpoint2d_h.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/dpoint2d_h.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/window1d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/window1d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/window1d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/window3d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/window3d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/window3d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/point1d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/point1d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/point1d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/point2d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/point2d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/point2d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/core/alias/point3d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/alias/point3d.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/core/alias/point3d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/math/abs.hh
===================================================================
--- branches/cleanup-2008/milena/mln/math/abs.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/math/abs.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/metal/abort.hh
===================================================================
--- branches/cleanup-2008/milena/mln/metal/abort.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/metal/abort.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/level/memset_.hh
===================================================================
--- branches/cleanup-2008/milena/mln/level/memset_.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/level/memset_.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/linear/gaussian.hh
===================================================================
--- branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2838)
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2002, 2003, 2004, 2008 EPITA Research and Development
+// Copyright (C) 2001, 2002, 2003, 2004, 2008 EPITA Research and
// Laboratory
//
// This file is part of the Olena Library. This library is free
Index: branches/cleanup-2008/milena/mln/tag/skeleton.hh
===================================================================
--- branches/cleanup-2008/milena/mln/tag/skeleton.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/tag/skeleton.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/accu/count_adjacent_vertices.hh
===================================================================
--- branches/cleanup-2008/milena/mln/accu/count_adjacent_vertices.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/accu/count_adjacent_vertices.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/accu/height.hh
===================================================================
--- branches/cleanup-2008/milena/mln/accu/height.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/accu/height.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/value/proxy.hh
===================================================================
--- branches/cleanup-2008/milena/mln/value/proxy.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/value/proxy.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/value/int_u_sat.hh
===================================================================
--- branches/cleanup-2008/milena/mln/value/int_u_sat.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/value/int_u_sat.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/value/stack.hh
===================================================================
--- branches/cleanup-2008/milena/mln/value/stack.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/value/stack.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/make/voronoi.hh
===================================================================
--- branches/cleanup-2008/milena/mln/make/voronoi.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/make/voronoi.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/border/fill.hh
===================================================================
--- branches/cleanup-2008/milena/mln/border/fill.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/border/fill.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/border/get.hh
===================================================================
--- branches/cleanup-2008/milena/mln/border/get.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/border/get.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/convert/to_upper_window.hh
===================================================================
--- branches/cleanup-2008/milena/mln/convert/to_upper_window.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/convert/to_upper_window.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/convert/to_p_array.hh
===================================================================
--- branches/cleanup-2008/milena/mln/convert/to_p_array.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/convert/to_p_array.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/convert/to_window.hh
===================================================================
--- branches/cleanup-2008/milena/mln/convert/to_window.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/convert/to_window.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh
===================================================================
--- branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh
===================================================================
--- branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/set/inter.hh
===================================================================
--- branches/cleanup-2008/milena/mln/set/inter.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/set/inter.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/closing_volume.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/closing_volume.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/closing_volume.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/closing_area.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/closing_area.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/closing_area.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/closing_height.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/closing_height.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/closing_height.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/opening_area_on_vertices.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/opening_area_on_vertices.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/opening_area_on_vertices.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/closing_attribute.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/closing_attribute.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/closing_attribute.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/opening_attribute.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/opening_attribute.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/opening_attribute.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/opening_volume.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/opening_volume.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/opening_volume.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/closing_area_on_vertices.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/closing_area_on_vertices.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/closing_area_on_vertices.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/opening_height.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/opening_height.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/opening_height.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/morpho/opening_area.hh
===================================================================
--- branches/cleanup-2008/milena/mln/morpho/opening_area.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/morpho/opening_area.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/canvas/morpho/algebraic_union_find.hh
===================================================================
--- branches/cleanup-2008/milena/mln/canvas/morpho/algebraic_union_find.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/canvas/morpho/algebraic_union_find.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/labeling/flat_zones.hh
===================================================================
--- branches/cleanup-2008/milena/mln/labeling/flat_zones.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/labeling/flat_zones.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/labeling/foreground.hh
===================================================================
--- branches/cleanup-2008/milena/mln/labeling/foreground.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/labeling/foreground.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/labeling/regional_minima.hh
===================================================================
--- branches/cleanup-2008/milena/mln/labeling/regional_minima.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/labeling/regional_minima.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/labeling/regional_maxima.hh
===================================================================
--- branches/cleanup-2008/milena/mln/labeling/regional_maxima.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/labeling/regional_maxima.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/labeling/background.hh
===================================================================
--- branches/cleanup-2008/milena/mln/labeling/background.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/labeling/background.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/greater_psite.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/greater_psite.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/greater_psite.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/ord_pair.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/ord_pair.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/ord_pair.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/graph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/greater_point.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/greater_point.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/greater_point.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/internal/boost_graph_access.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/internal/boost_graph_access.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/internal/boost_graph_access.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/internal/graph_base.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/internal/graph_base.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/internal/graph_base.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/internal/boost_graph.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/internal/boost_graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/internal/boost_graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/mln/util/internal/boost_graph_property.hh
===================================================================
--- branches/cleanup-2008/milena/mln/util/internal/boost_graph_property.hh (revision 2837)
+++ branches/cleanup-2008/milena/mln/util/internal/boost_graph_property.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/levillain/morpho/lower_completion.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/levillain/morpho/lower_completion.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/levillain/morpho/lower_completion.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/levillain/morpho/shortest_path_watershed.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/levillain/morpho/shortest_path_watershed.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/levillain/morpho/shortest_path_watershed.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2005, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_bgraph.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_bgraph.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_bgraph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_line_graph.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_line_graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_line_graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_graph.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_graph.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/pellegrin/set/core/p_graph.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/nivault/dmap.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/nivault/dmap.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/nivault/dmap.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/nd.hh
===================================================================
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/1d.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/jardonnet/array/old/1d.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/jardonnet/array/old/1d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/2d.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/jardonnet/array/old/2d.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/jardonnet/array/old/2d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/3d.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/jardonnet/array/old/3d.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/jardonnet/array/old/3d.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Development Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/all.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/jardonnet/array/old/all.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/jardonnet/array/old/all.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/jardonnet/array/old/objs.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/jardonnet/array/old/objs.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/jardonnet/array/old/objs.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2838)
@@ -83,11 +83,11 @@
initialize(is_crest, input);
level::fill(is_crest, false);
- mln_piter_(image2d<value::int_u8>) p(dist_map.domain());
+ mln_piter_(image2d<bool>) p(input.domain());
mln_niter_(neighb2d) n(nbh, p);
for_all(p)
{
- if (!input(p) || dist_map(p) < 10)
+ if (!input(p) || dist_map(p) < 0)
continue;
unsigned nb_eq = 0;
@@ -108,8 +108,12 @@
return is_crest;
}
+
image2d<bool>
- skeleton(const image2d<bool>& input, unsigned nbh_i)
+ skeleton_with_constraint(const image2d<bool>& input,
+ unsigned nbh_i,
+ const image2d<bool>& K,
+ const image2d<value::int_u8>& priority)
{
mln_assertion(nbh_i == 4 || nbh_i == 8);
@@ -117,24 +121,6 @@
image2d<bool> output;
initialize(output, input);
-
- int vals[] = { 0, 9, 0, 9, 0,
- 9, 6, 4, 6, 9,
- 0, 4, 0, 4, 0, // Values of distances.
- 9, 6, 4, 6, 9,
- 0, 9, 0, 9, 0 };
-
- image2d<value::int_u8> dist_map_n = transform::distance(value::int_u8(), logical::not_(input), nbh, make::w_window2d_int(vals));
- image2d<value::int_u8> dist_map = arith::revert(dist_map_n);
-
- io::pgm::save(dist_map, "distance.pgm");
- io::pgm::save(dist_map_n, "distance_n.pgm");
-
- // Make K
- image2d<bool> K = crest(input, dist_map_n, nbh);
-
- io::pbm::save(K, "K.pbm");
-
typedef mln_site_(image2d<bool>) P;
p_priority<value::int_u8, p_queue_fast<P> > q;
@@ -147,7 +133,7 @@
for_all(p)
if (!input(p) &&
is_simple_point2d(input, nbh_i, p)) // p is a simple point of background
- q.push(dist_map(p), p);
+ q.push(priority(p), p);
}
// Propagation.
@@ -169,7 +155,7 @@
{
output(n) = false; // Remove n from object
// save_state(output);
- q.push(dist_map(n), n);
+ q.push(priority(n), n);
}
}
}
@@ -177,6 +163,32 @@
return output;
}
+
+ image2d<bool>
+ skeleton(const image2d<bool>& input, unsigned nbh_i)
+ {
+ mln_assertion(nbh_i == 4 || nbh_i == 8);
+ neighb2d nbh = int_to_neighb(nbh_i);
+
+ int vals[] = { 0, 9, 0, 9, 0,
+ 9, 6, 4, 6, 9,
+ 0, 4, 0, 4, 0, // Values of distances.
+ 9, 6, 4, 6, 9,
+ 0, 9, 0, 9, 0 };
+
+ image2d<value::int_u8> dist_map_n = transform::distance(value::int_u8(), logical::not_(input), nbh, make::w_window2d_int(vals));
+ image2d<value::int_u8> dist_map = arith::revert(dist_map_n);
+
+ io::pgm::save(dist_map, "distance.pgm");
+ io::pgm::save(dist_map_n, "distance_n.pgm");
+
+ // Make K
+ image2d<bool> K = crest(input, dist_map_n, nbh);
+ io::pbm::save(K, "K.pbm");
+
+ return skeleton_with_constraint(input, nbh_i, K, dist_map);
+ }
+
} // end of namespace mln
#endif
Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/check.sh
===================================================================
--- branches/cleanup-2008/milena/sandbox/garrigues/ocr/check.sh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/check.sh (revision 2838)
@@ -1,20 +1,23 @@
+output_dir=tmp/`date '+%y_%m_%d__%H_%M_%S'`
+mkdir $output_dir
for i in input/*.pbm ; do
echo "==========================================="
echo "--------- $i"
echo "==========================================="
ref="$i.txt"
+ echo "______________________________Reference"
cat $ref
sed -e 's/\(.\)/\1\n/g' $ref > tmp/ref
total=`cat tmp/ref | wc -l `
- ./ocr_without_preprocess $i tmp/`basename $i` > tmp/without
- echo "_______________without preprocessing"
+ echo "______________________________without preprocessing"
+ ./ocr_without_preprocess $i > tmp/without
cat tmp/without
cat tmp/without | sed -e 's/\(.\)/\1\n/g' > tmp/without
- ./ocr_with_preprocess $i tmp/`basename $i` > tmp/with
- echo "_______________with preprocessing"
+ echo "______________________________with preprocessing"
+ ./ocr_with_preprocess $i $output_dir/`basename $i` > tmp/with
cat tmp/with
cat tmp/with | sed -e 's/\(.\)/\1\n/g' > tmp/with
Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc
===================================================================
--- branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2838)
@@ -50,6 +50,7 @@
#include <mln/labeling/regional_maxima.hh>
#include <mln/morpho/dilation.hh>
#include <mln/win/octagon2d.hh>
+#include <mln/border/resize.hh>
#include <mln/io/pgm/load.hh>
#include <mln/io/pgm/save.hh>
@@ -63,12 +64,13 @@
// _COMPILATION_
// g++ -DNDEBUG -O3 -I../../.. ocr.cc -L/usr/lib -ltesseract_full -lpthread
+// image2d<int_u8> tmp = clone(cast_image<int_u8>(Var)); \
+
#if 1
# define OCR_TEST(Var) \
{ \
- image2d<int_u8> tmp = clone(cast_image<int_u8>(Var)); \
float score = 0.f; \
- char* s = tesseract("fra", tmp, &score); \
+ char* s = tesseract("fra", Var, &score); \
std::cerr << #Var << ": " << score << std::endl << s; \
delete[] s; \
}
@@ -93,10 +95,11 @@
mln::border::thickness = 0;
io::pbm::load(input, argv[1]);
- OCR_TEST(input);
+// OCR_TEST(input);
// Resize
image2d<int_u8> enlarged = enlarge(logical::not_(input), 2);
+ image2d<bool> big = geom::resize(logical::not_(input), 4);
io::pgm::save(enlarged, std::string(argv[2]) + "_1_enlarge.pgm");
OCR_TEST(enlarged);
@@ -124,25 +127,9 @@
OCR_TEST(skel);
// Dilation
- image2d<bool> dilate;
win::octagon2d oct(5);
- { // FIXME?
-#if 1
- image2d<int_u8> tmp;
- initialize(tmp, skel);
- initialize(dilate, skel);
- mln_piter_(image2d<int_u8>) p(tmp.domain());
- for_all(p)
- tmp(p) = skel(p);
- tmp = morpho::dilation(tmp, oct);
- for_all(p)
- dilate(p) = tmp(p);
-#else
- // Should be using this but it doesn't work :(
- dilate = morpho::dilation(skel, oct);
-#endif
- }
-
+ image2d<bool> dilate = morpho::dilation(skel, oct);
+ border::resize(dilate, 0);
io::pbm::save(dilate, std::string(argv[2]) + "_5_dilation.pbm");
OCR_TEST(dilate);
@@ -153,6 +140,26 @@
io::pbm::save(subsampled, argv[2]);
+
+ image2d<bool> K = crest(big, blur, c4());
+ OCR_TEST(K);
+ io::pbm::save(K, std::string(argv[2]) + "_7_K.pbm");
+
+ image2d<bool> skel_on_gaussian = skeleton_with_constraint(big, 4, K, arith::revert(blur));
+ OCR_TEST(skel_on_gaussian);
+ io::pbm::save(skel_on_gaussian, std::string(argv[2]) + "_8_skeleton_on_blur.pbm");
+
+ // Dilation
+ image2d<bool> dilate_on_gaussian = morpho::dilation(skel_on_gaussian, oct);
+ border::resize(dilate_on_gaussian, 0);
+ io::pbm::save(dilate_on_gaussian, std::string(argv[2]) + "_9_dilation_on_gaussian.pbm");
+ OCR_TEST(dilate_on_gaussian);
+
+ // Subsampling
+ image2d<bool> subsampled_on_gaussian = subsampling::subsampling(dilate_on_gaussian, dpoint2d(1,1), 2);
+ io::pbm::save(subsampled_on_gaussian, std::string(argv[2]) + "_91_subsampling_on_gaussian.pbm");
+ OCR_TEST(subsampled_on_gaussian);
+
{
float score = 0;
char* s = tesseract("fra", subsampled, &score);
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsl.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsl.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsl.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbnrgb.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbnrgb.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbnrgb.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbxyz.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbxyz.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbxyz.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/conversion.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/conversion.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/conversion.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/cast.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/cast.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/cast.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsv.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsv.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsv.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyiq.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyiq.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyiq.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/force.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/force.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/force.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/conversion_ng_se.hh
===================================================================
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/nrgbxyz.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/nrgbxyz.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/nrgbxyz.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/basics.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/basics.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/basics.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/colorconv.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/colorconv.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/colorconv.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/conversion.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/conversion.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/abstract/conversion.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/bound.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/bound.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/bound.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/stretch.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/stretch.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/stretch.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyuv.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyuv.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbyuv.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsi.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsi.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/convert/rgbhsi.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/hsi.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/hsi.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/hsi.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/yuv.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/yuv.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/yuv.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/hsl.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/hsl.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/hsl.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/nrgb.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/nrgb.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/nrgb.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/xyz.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/xyz.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/xyz.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/hsv.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/hsv.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/hsv.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/yiq.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/yiq.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/yiq.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/rgb.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/rgb.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/rgb.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003 EPITA Research and Development
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
Index: branches/cleanup-2008/milena/sandbox/vigouroux/color/color.hh
===================================================================
--- branches/cleanup-2008/milena/sandbox/vigouroux/color/color.hh (revision 2837)
+++ branches/cleanup-2008/milena/sandbox/vigouroux/color/color.hh (revision 2838)
@@ -1,4 +1,5 @@
-// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory
+// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and
+// Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
* apps/statues/mesh-complex-segm.cc,
* doc/benchmark/canvas.cc,
* doc/oldies/2006__tour_1.txt,
* doc/oldies/2006__tour_2.txt,
* doc/tutorial/examples/image_plain.cc,
* doc/tutorial/examples/sub_image.cc,
* doc/tutorial/samples/fill-call-1.cc,
* doc/tutorial/samples/fill-part-image.cc,
* doc/tutorial/samples/fill-subdomain-shorter.cc,
* doc/tutorial/samples/fill-subdomain.cc,
* doc/tutorial/samples/fill-subimage-cfun.cc,
* doc/tutorial/samples/ima2d-7.cc,
* doc/tutorial/samples/ima2d-rot.cc,
* doc/tutorial/samples/paste-call-1.cc,
* doc/tutorial/tutorial.tex: rename level::fill/paste as
data::fill/paste.
---
milena/ChangeLog | 21 ++++++++++++++++++++
milena/apps/statues/mesh-complex-segm.cc | 2 +-
milena/doc/benchmark/canvas.cc | 4 +-
milena/doc/oldies/2006__tour_1.txt | 10 ++++----
milena/doc/oldies/2006__tour_2.txt | 4 +-
milena/doc/tutorial/examples/image_plain.cc | 6 ++--
milena/doc/tutorial/examples/sub_image.cc | 4 +-
milena/doc/tutorial/samples/fill-call-1.cc | 4 +-
milena/doc/tutorial/samples/fill-part-image.cc | 4 +-
.../doc/tutorial/samples/fill-subdomain-shorter.cc | 4 +-
milena/doc/tutorial/samples/fill-subdomain.cc | 8 +++---
milena/doc/tutorial/samples/fill-subimage-cfun.cc | 4 +-
milena/doc/tutorial/samples/ima2d-7.cc | 2 +-
milena/doc/tutorial/samples/ima2d-rot.cc | 4 +-
milena/doc/tutorial/samples/paste-call-1.cc | 4 +-
milena/doc/tutorial/tutorial.tex | 20 +++++++++---------
16 files changed, 63 insertions(+), 42 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index e1a51ee..1ae05f4 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,26 @@
2008-12-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Update tutorial according to the last renamings.
+
+ * apps/statues/mesh-complex-segm.cc,
+ * doc/benchmark/canvas.cc,
+ * doc/oldies/2006__tour_1.txt,
+ * doc/oldies/2006__tour_2.txt,
+ * doc/tutorial/examples/image_plain.cc,
+ * doc/tutorial/examples/sub_image.cc,
+ * doc/tutorial/samples/fill-call-1.cc,
+ * doc/tutorial/samples/fill-part-image.cc,
+ * doc/tutorial/samples/fill-subdomain-shorter.cc,
+ * doc/tutorial/samples/fill-subdomain.cc,
+ * doc/tutorial/samples/fill-subimage-cfun.cc,
+ * doc/tutorial/samples/ima2d-7.cc,
+ * doc/tutorial/samples/ima2d-rot.cc,
+ * doc/tutorial/samples/paste-call-1.cc,
+ * doc/tutorial/tutorial.tex: rename level::fill/paste as
+ data::fill/paste.
+
+2008-12-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Fix compilation issues.
* tests/unit_test/Makefile.am,
diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc
index 05fffe0..00c9d13 100644
--- a/milena/apps/statues/mesh-complex-segm.cc
+++ b/milena/apps/statues/mesh-complex-segm.cc
@@ -146,7 +146,7 @@ int main(int argc, char* argv[])
`---------*/
mln::rgb8_2complex_image3df output(wshed.domain());
- mln::level::fill(output, mln::literal::white);
+ mln::data::fill(output, mln::literal::white);
// FIXME: Use a colorize functor instead.
// Choose random colors for each basin number.
diff --git a/milena/doc/benchmark/canvas.cc b/milena/doc/benchmark/canvas.cc
index b40a6c3..fd7f698 100644
--- a/milena/doc/benchmark/canvas.cc
+++ b/milena/doc/benchmark/canvas.cc
@@ -110,10 +110,10 @@ namespace mln
labeling<F>::init()
{
initialize(deja_vu, f.input);
- mln::level::fill(deja_vu, false);
+ mln::data::fill(deja_vu, false);
initialize(parent, f.input);
initialize(output, f.input);
- mln::level::fill(output, L(literal::zero));
+ mln::data::fill(output, L(literal::zero));
nlabels = 0;
}
diff --git a/milena/doc/oldies/2006__tour_1.txt b/milena/doc/oldies/2006__tour_1.txt
index b083281..26be330 100644
--- a/milena/doc/oldies/2006__tour_1.txt
+++ b/milena/doc/oldies/2006__tour_1.txt
@@ -25,7 +25,7 @@ image1d<T> and image3d<T> are similarly constructed
char[] values = { 'a', 'b', 'c',
'd', 'e', 'f' };
image2d<char> ima(2, 3);
-level::fill(ima, values);
+data::fill(ima, values);
debug::print(ima.bbox());
// [(0, 0)..(1, 2)]
@@ -54,7 +54,7 @@ debug::print(ima, p);
bbox2d bb = set(from(1,5), to(2,7));
image2d<char> ima2(bb);
ima2.set_name("ima2");
-level::fill(ima2, values);
+data::fill(ima2, values);
debug::print(ima2);
// 5 6 7
@@ -127,7 +127,7 @@ int[] values = { 0, 1, 1, 1, 0,
0, 1, 1, 1, 0,
0, 0, 0, 0, 0 };
image2d<bool> ima(from(1,1), to(4,4));
-level::fill(ima, values);
+data::fill(ima, values);
debug::print(ima);
// 1 2 3 4 5
// - - - - -
@@ -145,7 +145,7 @@ debug::print(ima2);
// 3| 0 0 0 0 0
// 4| 0 0 0 0 0
-actually, after level::fill we have:
+actually, after data::fill we have:
// 0 1 2 3 4 5 6
// - - - - - - -
@@ -232,7 +232,7 @@ int[] values = { 0, 1, 1, 1, 0,
0, 1, 1, 1, 0,
0, 0, 0, 0, 0 };
image2d_without_border<bool> ima(from(1,1), to(4,4));
-level::fill(ima, values);
+data::fill(ima, values);
debug::print(ima);
// 1 2 3 4 5
// - - - - -
diff --git a/milena/doc/oldies/2006__tour_2.txt b/milena/doc/oldies/2006__tour_2.txt
index e4d7011..ea06530 100644
--- a/milena/doc/oldies/2006__tour_2.txt
+++ b/milena/doc/oldies/2006__tour_2.txt
@@ -21,7 +21,7 @@ T: value type
int[] values = { 'a', 'b', 'c',
'd', 'e', 'f' };
image2d<char> ima(2, 3);
-level::fill(ima, values);
+data::fill(ima, values);
debug::print(ima.bbox());
// [(0, 0)..(1, 2)]
@@ -51,7 +51,7 @@ debug::print(ima, p);
bbox2d bb = set(from(1,5), to(2,7));
image2d<char> ima2(bb);
ima2.set_name("ima2");
-level::fill(ima2, values);
+data::fill(ima2, values);
debug::print(ima2);
// 5 6 7
diff --git a/milena/doc/tutorial/examples/image_plain.cc b/milena/doc/tutorial/examples/image_plain.cc
index 94ad5c6..4bfdf79 100644
--- a/milena/doc/tutorial/examples/image_plain.cc
+++ b/milena/doc/tutorial/examples/image_plain.cc
@@ -2,7 +2,7 @@
# include <mln/core/image/plain.hh>
# include <mln/debug/println.hh>
# include <mln/debug/iota.hh>
-# include <mln/level/fill_with_value.hh>
+# include <mln/data/fill_with_value.hh>
# include <mln/opt/at.hh>
@@ -36,7 +36,7 @@ int main()
debug::println(ima);
image2d<I_> mos(2, 2);
- level::fill_with_value(mos, ima);
- level::fill_with_value(opt::at(mos, 1,1), 0);
+ data::fill_with_value(mos, ima);
+ data::fill_with_value(opt::at(mos, 1,1), 0);
picture(mos);
}
diff --git a/milena/doc/tutorial/examples/sub_image.cc b/milena/doc/tutorial/examples/sub_image.cc
index 533ffe7..0321d30 100644
--- a/milena/doc/tutorial/examples/sub_image.cc
+++ b/milena/doc/tutorial/examples/sub_image.cc
@@ -6,7 +6,7 @@
# include <mln/debug/println.hh>
# include <mln/morpho/elementary/gradient.hh>
-# include <mln/level/fill_with_value.hh>
+# include <mln/data/fill_with_value.hh>
int main()
@@ -22,7 +22,7 @@ int main()
debug::println(sub);
debug::println(morpho::elementary::gradient(sub, c4()));
- level::fill_with_value((ima | box2d(2,3)).rw(), 0);
+ data::fill_with_value((ima | box2d(2,3)).rw(), 0);
debug::println(ima);
trait::image::print(sub);
diff --git a/milena/doc/tutorial/samples/fill-call-1.cc b/milena/doc/tutorial/samples/fill-call-1.cc
index d41a5d9..1afba03 100644
--- a/milena/doc/tutorial/samples/fill-call-1.cc
+++ b/milena/doc/tutorial/samples/fill-call-1.cc
@@ -8,11 +8,11 @@ int main()
// \}
// \{
- level::fill(imga, 'a');
+ data::fill(imga, 'a');
// \}
// \{
- level::fill((imga | box2d(1,2)).rw(), 'a');
+ data::fill((imga | box2d(1,2)).rw(), 'a');
// \}
}
diff --git a/milena/doc/tutorial/samples/fill-part-image.cc b/milena/doc/tutorial/samples/fill-part-image.cc
index 0c90f35..e3ad3a2 100644
--- a/milena/doc/tutorial/samples/fill-part-image.cc
+++ b/milena/doc/tutorial/samples/fill-part-image.cc
@@ -29,13 +29,13 @@ int main()
// contained in arr and fill these ones
// with 0.
// We must call "rw()" here.
- level::fill((ima | arr).rw(), 0);
+ data::fill((ima | arr).rw(), 0);
debug::println((ima | arr));
mln_VAR(ima2, ima | arr);
// We do not need to call "rw()" here.
- level::fill(ima2, 0);
+ data::fill(ima2, 0);
// \}
debug::println(ima2);
diff --git a/milena/doc/tutorial/samples/fill-subdomain-shorter.cc b/milena/doc/tutorial/samples/fill-subdomain-shorter.cc
index 7526682..fc4d725 100644
--- a/milena/doc/tutorial/samples/fill-subdomain-shorter.cc
+++ b/milena/doc/tutorial/samples/fill-subdomain-shorter.cc
@@ -26,8 +26,8 @@ int main()
image2d<rgb8> ima2;
initialize(ima2, ima);
- level::fill(ima2, literal::black);
+ data::fill(ima2, literal::black);
- level::fill((ima2 | (pw::value(lab) == pw::cst(2u))).rw(), literal::red);
+ data::fill((ima2 | (pw::value(lab) == pw::cst(2u))).rw(), literal::red);
// \}
}
diff --git a/milena/doc/tutorial/samples/fill-subdomain.cc b/milena/doc/tutorial/samples/fill-subdomain.cc
index efe8d58..a5ec65e 100644
--- a/milena/doc/tutorial/samples/fill-subdomain.cc
+++ b/milena/doc/tutorial/samples/fill-subdomain.cc
@@ -36,8 +36,8 @@ int main()
image2d<label_8> tmp;
initialize(tmp, lbl);
- level::fill(tmp, 0);
- level::fill((tmp | lbl_2.domain()).rw(), 1);
+ data::fill(tmp, 0);
+ data::fill((tmp | lbl_2.domain()).rw(), 1);
doc::ppmsave(debug::colorize(rgb8(), tmp, 1), "fill-subdomain");
// Create a black image from ima.
@@ -45,9 +45,9 @@ int main()
// \{
image2d<rgb8> ima2;
initialize(ima2, ima);
- level::fill(ima2, literal::black);
+ data::fill(ima2, literal::black);
- level::fill((ima2 | lbl_2.domain()).rw(), literal::red);
+ data::fill((ima2 | lbl_2.domain()).rw(), literal::red);
// \}
doc::ppmsave(ima2, "fill-subdomain");
diff --git a/milena/doc/tutorial/samples/fill-subimage-cfun.cc b/milena/doc/tutorial/samples/fill-subimage-cfun.cc
index 6f3a4dd..2ff6c6c 100644
--- a/milena/doc/tutorial/samples/fill-subimage-cfun.cc
+++ b/milena/doc/tutorial/samples/fill-subimage-cfun.cc
@@ -30,9 +30,9 @@ int main()
// \{
image2d<rgb8> ima2;
initialize(ima2, ima);
- level::fill(ima2, literal::black);
+ data::fill(ima2, literal::black);
- level::fill((ima2 | row_oddity).rw(), literal::red);
+ data::fill((ima2 | row_oddity).rw(), literal::red);
// \}
doc::ppmsave(ima2, "fill-subimage-cfun");
diff --git a/milena/doc/tutorial/samples/ima2d-7.cc b/milena/doc/tutorial/samples/ima2d-7.cc
index d15d3b9..3f4cd35 100644
--- a/milena/doc/tutorial/samples/ima2d-7.cc
+++ b/milena/doc/tutorial/samples/ima2d-7.cc
@@ -8,6 +8,6 @@ int main()
image2d<value::int_u8> img2b;
initialize(img2b, img2a);
- level::fill(img2b, img2a);
+ data::fill(img2b, img2a);
// \}
}
diff --git a/milena/doc/tutorial/samples/ima2d-rot.cc b/milena/doc/tutorial/samples/ima2d-rot.cc
index 84cd1ad..6463a5c 100644
--- a/milena/doc/tutorial/samples/ima2d-rot.cc
+++ b/milena/doc/tutorial/samples/ima2d-rot.cc
@@ -12,14 +12,14 @@ int main()
// Declare the image to be rotated.
image2d<value::rgb8> ima1_(220, 220);
- level::fill(ima1_, literal::cyan);
+ data::fill(ima1_, literal::cyan);
border::fill(ima1_, literal::yellow);
// Set an infinite extension.
mln_VAR(ima1, extend(ima1_, pw::cst(literal::yellow)));
// Declare the output image.
image2d<value::rgb8> ima2(220, 220);
- level::fill(ima2, literal::cyan);
+ data::fill(ima2, literal::cyan);
border::fill(ima2, literal::yellow);
box2d extended_domain= ima1.domain();
diff --git a/milena/doc/tutorial/samples/paste-call-1.cc b/milena/doc/tutorial/samples/paste-call-1.cc
index 88d4f88..01a8bc5 100644
--- a/milena/doc/tutorial/samples/paste-call-1.cc
+++ b/milena/doc/tutorial/samples/paste-call-1.cc
@@ -9,10 +9,10 @@ int main()
image2d<unsigned char> imga(imgb.domain());
// Initialize the image values.
- level::fill(imgb, 'b');
+ data::fill(imgb, 'b');
// Paste the content of imgb in imga.
- level::paste(imgb, imga);
+ data::paste(imgb, imga);
debug::println(imga);
// \}
diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex
index f8e758b..a2affa1 100644
--- a/milena/doc/tutorial/tutorial.tex
+++ b/milena/doc/tutorial/tutorial.tex
@@ -1031,7 +1031,7 @@ Sometimes, you may want to initialize an image from another one:
\var{img2b} is declared without specifying a domain. Its border size is set to
the default one, e.g 0. By using \code{initialize} \var{img2b} is initialized
with the same domain and border/extension as \var{img2a}. The data is not
- copied though. Other routines like \code{level::fill} can be called in order to
+ copied though. Other routines like \code{data::fill} can be called in order to
do so (See also \doxyref{fillop}).
@@ -1405,7 +1405,7 @@ passed as parameter. These macros can be used with any container like images or
site sets.
Here follow an example with the implemantions of the most basic routines which
-use the \code{for\_all} loop: \code{level::fill()} and \code{level::paste()}.
+use the \code{for\_all} loop: \code{data::fill()} and \code{data::paste()}.
\doxycode{fill}
@@ -1474,9 +1474,9 @@ Routine name & Description \\ \hline
level::clone() & creates a deep copy of an object. Any shared data is
duplicated. \\
-level::fill() & fill an object with a value. \\
+data::fill() & fill an object with a value. \\
-level::paste() & paste object data to another object. \\
+data::paste() & paste object data to another object. \\
labeling::blobs() & find and label the different components of an image. \\
@@ -1497,17 +1497,17 @@ have not been initialized yet. So we fill \var{imga} with the value 'a':
\doxycode[2]{fill-call-1}
-The ``\code{fill}'' algorithm is located in the sub-namespace "\namespace{mln::level}" since this
-algorithm deals with the ``level'' of site values.
+The ``\code{fill}'' algorithm is located in the sub-namespace "\namespace{mln::data}" since this
+algorithm deals with the site values.
Note that the term "level" refers to the fact that an image can be considered as
a landscape where the elevation at a particular location/site is given by
the corresponding site value.
-The full name of this routine is ``\namespace{mln::level::fill}''.
+The full name of this routine is ``\namespace{mln::data::fill}''.
To access to a particular algorithm, the proper file shall be included.
The file names of algorithms strictly map their C++ name; so
-\namespace{mln::level::fill} is defined in the file \header{mln/level/fill.hh}.
+\namespace{mln::data::fill} is defined in the file \header{mln/data/fill.hh}.
%----------------
\subsection*{Note}
@@ -1515,7 +1515,7 @@ Most algorithms in Olena are constructed following the classical scheme: "output
algo(input)", where the input image is only read. However some few algorithms
take an input image in order to modify it. To enforce this particular feature,
the user shall explicitly state that the image is provided so that its data is
-modified "read/write". The algorithm call shall be ``\code{level::fill(ima.rw(),
+modified "read/write". The algorithm call shall be ``\code{data::fill(ima.rw(),
val)}''. When forgetting the ``\code{rw()}'' call it does not compile.
\doxycode[3]{fill-call-1}
@@ -1551,7 +1551,7 @@ Gives:
The notion of site sets plays an important role in Olena. Many tests are
performed at run-time to ensure that the program is correct.
-For instance, the algorithm level::paste tests that the set of sites of imgb
+For instance, the algorithm data::paste tests that the set of sites of imgb
(whose values are to be pasted) is a subset of the destination image.
--
1.5.6.5
* configure.ac: here.
* INSTALL: fix content about DNDEBUG.
---
ChangeLog | 8 ++++++++
INSTALL | 17 ++++++++---------
configure.ac | 1 +
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 25aeb2a..5f2cd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-22 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix configure.ac and INSTALL files.
+
+ * configure.ac: here.
+
+ * INSTALL: fix content about DNDEBUG.
+
2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr>
Enable the generation of version.hh.
diff --git a/INSTALL b/INSTALL
index 354f7c0..9a6bba1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -143,15 +143,14 @@ for Olena. This is a problem for GCC 2.95 and probably other compilers.
need other flags. If you know these flags, add them to `CXXFLAGS'.
-1.3.3 Debugging flags make Olena slow
--------------------------------------
-
-Because Olena depends on C++ optimizations to provide the best
-performance, and enabling debugging flags often disable optimizations,
-you are advised to override the `CXXFLAGS_OPTIMIZE' with any options
-that gives the best optimization/conformance tradeoff. However, note
-that passing `-DNDEBUG' disable many sanity checks, while providing
-only a poor performance improvement.
+1.3.3 Debugging flags
+---------------------
+
+All over the code, many sanity checks are enabled by default. They are
+convenient since they make sure nothing wrong is passed to the functions.
+However, once the program is stable they may not be necessary anymore.
+Passing `-DNDEBUG' to the CXXFLAGS disable many sanity checks, while providing
+*high* performance improvement.
diff --git a/configure.ac b/configure.ac
index 1d5ca57..5d7b719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,7 @@ AC_CONFIG_FILES([
milena/tests/core/other/Makefile
milena/tests/core/routine/Makefile
milena/tests/core/site_set/Makefile
+ milena/tests/data/Makefile
milena/tests/debug/Makefile
milena/tests/display/Makefile
milena/tests/draw/Makefile
--
1.5.6.5
* core/routine/init.hh: include init.hxx.
* core/routine/init.hxx: references all the init_() functions. Must be
updated each time a new init_() is added. This file must be used like
convert/from_to.hxx.
---
milena/ChangeLog | 14 +++++-
milena/mln/core/routine/init.hh | 12 +++---
milena/mln/core/routine/init.hxx | 92 ++++++++++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+), 8 deletions(-)
create mode 100644 milena/mln/core/routine/init.hxx
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 32d2dcd..5936533 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,4 +1,14 @@
-2008-12-22 Guillaume Lazzara <z(a)lrde.epita.fr>
+2008-12-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add forward declarations for all init_() functions.
+
+ * core/routine/init.hh: include init.hxx.
+
+ * core/routine/init.hxx: references all the init_() functions. Must be
+ updated each time a new init_() is added. This file must be used like
+ convert/from_to.hxx.
+
+2008-12-29 Guillaume Lazzara <z(a)lrde.epita.fr>
Fix compilation issues.
@@ -22,7 +32,7 @@
* tests/unit_test/mln_data_all.cc
* tests/unit_test/mln_data_essential.cc: add new unit tests.
-2008-12-22 Guillaume Lazzara <z(a)lrde.epita.fr>
+2008-12-29 Guillaume Lazzara <z(a)lrde.epita.fr>
Add a dispatch in from_to.
diff --git a/milena/mln/core/routine/init.hh b/milena/mln/core/routine/init.hh
index 5b0f9ed..476c374 100644
--- a/milena/mln/core/routine/init.hh
+++ b/milena/mln/core/routine/init.hh
@@ -28,23 +28,23 @@
#ifndef MLN_CORE_ROUTINE_INIT_HH
# define MLN_CORE_ROUTINE_INIT_HH
-/*! \file mln/core/routine/init.hh
- *
- * \brief Definition of function that initialize an image from another
- * one.
- */
+/// \file mln/core/routine/init.hh
+///
+/// Definition of function that initialize an image from another
+/// one.
# include <mln/tag/init.hh>
# include <mln/geom/bbox.hh>
# include <mln/border/find.hh>
+# include <core/routine/init.hxx>
namespace mln
{
- // Fwd decl.
+ // Forward declaration.
template <typename Subject, typename T, typename M>
void init_(Subject, T& target, const Object<M>& model);
diff --git a/milena/mln/core/routine/init.hxx b/milena/mln/core/routine/init.hxx
new file mode 100644
index 0000000..cfeb5ea
--- /dev/null
+++ b/milena/mln/core/routine/init.hxx
@@ -0,0 +1,92 @@
+// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE)
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef MLN_CORE_ROUTINE_INIT_HXX
+# define MLN_CORE_ROUTINE_INIT_HXX
+
+/// \file mln/core/routine/init.hxx
+///
+// All overloaded "mln::init" routines have to be declared in
+// the present file. It allows for *deferred* use of these routines.
+
+namespace mln
+{
+
+ // Forward declarations.
+ namespace fun { namespace i2v { template <typename T> class array; } }
+ namespace fun { namespace l2l { template <typename T> class relabel; } }
+ namespace pw { template <typename F, typename S> class image; }
+ template <typename I, typename F> class image_if;
+
+
+
+ /// Kind: function_t
+ /// Type: F,
+ /// From: pw::image<F,S>
+ template <typename F, typename S>
+ void init_(tag::function_t, F& f, const pw::image<F,S>& model);
+
+
+ /// Kind: image_t
+ /// Type: pw::image<F,S>
+ /// From: J
+ template <typename F, typename S, typename J>
+ void init_(tag::image_t, mln::pw::image<F,S>& target, const J& model);
+
+
+ /// Kind: function_t
+ /// Type: F
+ /// From: image_if<I,F>
+ template <typename I, typename F>
+ void init_(tag::function_t, F& f, const image_if<I,F>& model);
+
+ /// Kind: image_t
+ /// Type: F
+ /// From: J
+ template <typename I, typename F, typename J>
+ void init_(tag::image_t, image_if<I,F>& target, const J& model);
+
+
+ /// Kind: function_t
+ /// Type: fun::i2v::array<T1>
+ /// From: fun::i2v::array<T2>
+ template <typename T1, typename T2>
+ void init_(tag::function_t,
+ fun::i2v::array<T1>& f,
+ const fun::i2v::array<T2>& model);
+
+ /// Kind: function_t
+ /// Type: fun::l2l::relabel<T1>
+ /// From: fun::l2l::relabel<T2>
+ template <typename T1, typename T2>
+ void init_(tag::function_t,
+ fun::l2l::relabel<T1>& f,
+ const fun::l2l::relabel<T2>& model);
+
+} // end of namespace mln
+
+#endif // ! MLN_CORE_ROUTINE_INIT_HXX
--
1.5.6.5