- Olena-patches

olena: olena-2.0-868-gf303e00 Do not use mln_VAR in Scribo.
by Roland Levillain 19 Jun '14

19 Jun '14

* scribo/debug/text_areas_image.hh, * src/misc/dmap.cc, * src/misc/morpho.cc, * src/misc/rectangularity.cc, * src/primitive/group/group_from_rag.cc: Here. * scribo/filter/objects_with_holes.hh, * scribo/table/internal/repair_lines.hh, * src/text_recognition_in_picture.cc: Do not include mln/core/var.hh. --- scribo/ChangeLog | 15 +++++++++++++++ scribo/scribo/debug/text_areas_image.hh | 8 ++++---- scribo/scribo/filter/objects_with_holes.hh | 3 +-- scribo/scribo/table/internal/repair_lines.hh | 7 ++----- scribo/src/misc/dmap.cc | 12 ++++++------ scribo/src/misc/morpho.cc | 11 +++++++---- scribo/src/misc/rectangularity.cc | 6 +++--- scribo/src/primitive/group/group_from_rag.cc | 21 ++++++++++++--------- scribo/src/text_recognition_in_picture.cc | 5 ++--- 9 files changed, 52 insertions(+), 36 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 22b10be..b23336f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +2014-06-19 Roland Levillain <roland(a)lrde.epita.fr> + + Do not use mln_VAR in Scribo. + + * scribo/debug/text_areas_image.hh, + * src/misc/dmap.cc, + * src/misc/morpho.cc, + * src/misc/rectangularity.cc, + * src/primitive/group/group_from_rag.cc: + Here. + * scribo/filter/objects_with_holes.hh, + * scribo/table/internal/repair_lines.hh, + * src/text_recognition_in_picture.cc: + Do not include mln/core/var.hh. + 2014-06-18 Roland Levillain <roland(a)lrde.epita.fr> Make src/primitive/group/group_from_rag.cc compile again. diff --git a/scribo/scribo/debug/text_areas_image.hh b/scribo/scribo/debug/text_areas_image.hh index f20ba24..2028524 100644 --- a/scribo/scribo/debug/text_areas_image.hh +++ b/scribo/scribo/debug/text_areas_image.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development Laboratory +// (LRDE). // // This file is part of Olena. // @@ -36,7 +36,6 @@ # include <mln/core/image/imorph/tr_image.hh> -# include <mln/core/var.hh> # include <mln/core/routine/duplicate.hh> # include <mln/data/paste.hh> @@ -103,7 +102,8 @@ namespace scribo for_all_comps(i, comps) if (comps(i).is_valid()) { - mln_VAR(tmp, duplicate(input_rgb | comps(i).bbox())); + typedef mln::sub_image<I, box2d> tmp_t; + tmp_t tmp = duplicate(input_rgb | comps(i).bbox()); typedef mln::fun::x2x::translation<P::dim, float> trans_t; trans_t trans(dv - comps(i).bbox().pmin().to_vec()); diff --git a/scribo/scribo/filter/objects_with_holes.hh b/scribo/scribo/filter/objects_with_holes.hh index f915300..c8259d4 100644 --- a/scribo/scribo/filter/objects_with_holes.hh +++ b/scribo/scribo/filter/objects_with_holes.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013, 2014 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -66,7 +66,6 @@ # include <mln/util/timer.hh> # include <mln/value/label_16.hh> -# include <mln/core/var.hh> #include <mln/debug/filename.hh> diff --git a/scribo/scribo/table/internal/repair_lines.hh b/scribo/scribo/table/internal/repair_lines.hh index 85c26cd..811c673 100644 --- a/scribo/scribo/table/internal/repair_lines.hh +++ b/scribo/scribo/table/internal/repair_lines.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2011, 2014 EPITA Research and Development Laboratory +// (LRDE). // // This file is part of Olena. // @@ -57,8 +57,6 @@ # include <mln/value/rgb8.hh> # include <mln/value/label_16.hh> -# include <mln/core/var.hh> - # include <scribo/make/debug_filename.hh> # include <scribo/core/central_sites.hh> @@ -126,7 +124,6 @@ namespace scribo mln::util::array<box<P> > result; std::vector<bool> to_keep(tableboxes.nelements(), true); - //FIXME: use mln_VAR? typedef extension_ima< const image_if<L, diff --git a/scribo/src/misc/dmap.cc b/scribo/src/misc/dmap.cc index e865e26..459b273 100644 --- a/scribo/src/misc/dmap.cc +++ b/scribo/src/misc/dmap.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/labeling/blobs.hh> #include <mln/labeling/colorize.hh> @@ -66,10 +65,11 @@ int main(int argc, char *argv[]) label_16 nlabels; image2d<label_16> lbl = labeling::blobs(ima, c8(), nlabels); - mln_VAR(res, - transform::distance_and_influence_zone_geodesic(lbl, - c8(), - mln_max(unsigned))); + typedef util::couple< image2d<unsigned>, image2d<label_16> > res_t; + res_t res = + transform::distance_and_influence_zone_geodesic(lbl, + c8(), + mln_max(unsigned)); io::pgm::save(labeling::wrap(res.first()), argv[2]); io::ppm::save(labeling::colorize(value::rgb8(), res.second(), nlabels), diff --git a/scribo/src/misc/morpho.cc b/scribo/src/misc/morpho.cc index 3c6dd21..8020568 100644 --- a/scribo/src/misc/morpho.cc +++ b/scribo/src/misc/morpho.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2013, 2014 EPITA Research and Development Laboratory +// (LRDE). // // This file is part of Olena. // @@ -41,7 +41,6 @@ #include <mln/io/ppm/save.hh> #include <mln/transform/distance_and_influence_zone_geodesic.hh> -#include <mln/core/var.hh> #include <mln/win/hline2d.hh> #include <mln/win/disk2d.hh> @@ -76,7 +75,11 @@ int main(int argc, char *argv[]) label_16 nlabels; image2d<label_16> lbl = labeling::blobs(input, c8(), nlabels); - mln_VAR(res, transform::distance_and_influence_zone_geodesic(lbl, c8(), mln_max(unsigned))); + typedef util::couple< image2d<unsigned>, image2d<label_16> > res_t; + res_t res = + transform::distance_and_influence_zone_geodesic(lbl, + c8(), + mln_max(unsigned)); io::pgm::save(labeling::wrap(res.first()), "dmap.pgm"); io::ppm::save(labeling::colorize(rgb8(), res.second(), nlabels), "iz.ppm"); diff --git a/scribo/src/misc/rectangularity.cc b/scribo/src/misc/rectangularity.cc index 41ffb6a..016f687 100644 --- a/scribo/src/misc/rectangularity.cc +++ b/scribo/src/misc/rectangularity.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/literal/colors.hh> @@ -68,7 +67,8 @@ int main(int argc, char *argv[]) label_16 nlabels; image2d<label_16> lbl = labeling::blobs(input, c8(), nlabels); - mln_VAR(dmap, transform::distance_geodesic(lbl, c8(), mln_max(unsigned))); + typedef image2d<unsigned> dmap_t; + dmap_t dmap = transform::distance_geodesic(lbl, c8(), mln_max(unsigned)); io::pgm::save(labeling::wrap(dmap), "dmap.pgm"); diff --git a/scribo/src/primitive/group/group_from_rag.cc b/scribo/src/primitive/group/group_from_rag.cc index f6f159c..86ea1b1 100644 --- a/scribo/src/primitive/group/group_from_rag.cc +++ b/scribo/src/primitive/group/group_from_rag.cc @@ -25,7 +25,6 @@ #include <iostream> -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/edge_image.hh> #include <mln/core/image/vertex_image.hh> @@ -188,13 +187,16 @@ int main(int argc, char* argv[]) /// Getting components links from a Region Adjacency graph. - mln_VAR(rag_data, primitive::link::with_rag(filtered_components, c8())); + typedef util::couple< util::graph, image2d<value::label_16> > rag_data_t; + rag_data_t rag_data = primitive::link::with_rag(filtered_components, c8()); - mln_VAR(v_ima, scribo::graph::compute_vertex(accu::center<point2d>(), - rag_data.first(), - filtered_components.labeled_image(), - filtered_components.nelements())); + typedef vertex_image<void, algebra::vec<2u, float>, util::graph> v_ima_t; + v_ima_t v_ima = + scribo::graph::compute_vertex(accu::center<point2d>(), + rag_data.first(), + filtered_components.labeled_image(), + filtered_components.nelements()); //FOR DEBUGGING PURPOSE { @@ -208,9 +210,10 @@ int main(int argc, char* argv[]) literal::blue); #endif - mln_VAR(pv, - mln::make::p_vertices_with_mass_centers(filtered_components.labeled_image(), - rag_data.first())); + typedef p_vertices<util::graph, mln::fun::i2v::array<point2d> > pv_t; + pv_t pv = + mln::make::p_vertices_with_mass_centers(filtered_components.labeled_image(), + rag_data.first()); mln::debug::draw_graph(before_grouping, pv, literal::green, literal::green); io::ppm::save(before_grouping, diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index 6d711bc..0554192 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -98,7 +98,6 @@ #include <scribo/toolchain/text_in_picture.hh> #include <mln/util/timer.hh> -#include <mln/core/var.hh> #include <scribo/afp/components.hh> -- 1.7.10.4

1 0

olena: olena-2.0-867-g967c577 Re-enable Milena test world/inter_pixel/display_edge.
by Roland Levillain 19 Jun '14

19 Jun '14

* tests/world/inter_pixel/Makefile.am (check_PROGRAMS): Add display edge. --- milena/ChangeLog | 7 +++++++ milena/tests/world/inter_pixel/Makefile.am | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b5fc4a2..d1c7a4b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-06-19 Roland Levillain <roland(a)lrde.epita.fr> + Re-enable Milena test world/inter_pixel/display_edge. + + * tests/world/inter_pixel/Makefile.am (check_PROGRAMS): + Add display edge. + +2014-06-19 Roland Levillain <roland(a)lrde.epita.fr> + Do not use mln_VAR in Milena tests, apps and tools. * apps/constrained-connectivity/constrained-connectivity.cc, diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am index 3d11958..4d58866 100644 --- a/milena/tests/world/inter_pixel/Makefile.am +++ b/milena/tests/world/inter_pixel/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -21,6 +22,7 @@ SUBDIRS = \ check_PROGRAMS = \ compute \ + display_edge \ immerse \ is_pixel \ is_separator \ -- 1.7.10.4

1 0

olena: olena-2.0-866-g8e60535 Do not use mln_VAR in Milena tests, apps and tools.
by Roland Levillain 19 Jun '14

19 Jun '14

* apps/constrained-connectivity/constrained-connectivity.cc, * tests/core/image/dmorph/transformed_image.cc, * tests/core/image/dmorph/unproject_image.cc, * tests/core/image/graph_image.cc, * tests/morpho/tree/filter/filter.cc, * tests/world/inter_pixel/compute.cc, * tests/world/inter_pixel/display_edge.cc: Here. * tests/core/routine/extend.cc, * tests/labeling/foreground.cc, * tests/linear/sobel_2d.cc, * tests/morpho/elementary/gradient.cc, * tests/morpho/elementary/gradient_external.cc, * tests/morpho/elementary/gradient_internal.cc, * tests/morpho/elementary/laplacian.cc, * tests/morpho/skeleton_constrained.cc, * tests/morpho/tree/compute_attribute_image.cc, * tests/morpho/tree/compute_parent.cc, * tests/pw/image.cc, * tests/world/inter_pixel/immerse.cc, * tools/area_flooding.cc: Do not include mln/core/var.hh. --- milena/ChangeLog | 27 ++++++++++++++++ .../constrained-connectivity.cc | 33 ++++++++++++++------ .../tests/core/image/dmorph/transformed_image.cc | 9 +++--- milena/tests/core/image/dmorph/unproject_image.cc | 8 +++-- milena/tests/core/image/graph_image.cc | 8 +++-- milena/tests/core/routine/extend.cc | 5 ++- milena/tests/labeling/foreground.cc | 5 ++- milena/tests/linear/sobel_2d.cc | 5 ++- milena/tests/morpho/elementary/gradient.cc | 4 +-- .../tests/morpho/elementary/gradient_external.cc | 4 +-- .../tests/morpho/elementary/gradient_internal.cc | 4 +-- milena/tests/morpho/elementary/laplacian.cc | 4 +-- milena/tests/morpho/skeleton_constrained.cc | 5 ++- .../tests/morpho/tree/compute_attribute_image.cc | 4 +-- milena/tests/morpho/tree/compute_parent.cc | 4 +-- milena/tests/morpho/tree/filter/filter.cc | 7 +++-- milena/tests/pw/image.cc | 4 +-- milena/tests/world/inter_pixel/compute.cc | 6 ++-- milena/tests/world/inter_pixel/display_edge.cc | 27 ++++++++-------- milena/tests/world/inter_pixel/immerse.cc | 3 +- milena/tools/area_flooding.cc | 3 +- 21 files changed, 109 insertions(+), 70 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index be75602..b5fc4a2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,30 @@ +2014-06-19 Roland Levillain <roland(a)lrde.epita.fr> + + Do not use mln_VAR in Milena tests, apps and tools. + + * apps/constrained-connectivity/constrained-connectivity.cc, + * tests/core/image/dmorph/transformed_image.cc, + * tests/core/image/dmorph/unproject_image.cc, + * tests/core/image/graph_image.cc, + * tests/morpho/tree/filter/filter.cc, + * tests/world/inter_pixel/compute.cc, + * tests/world/inter_pixel/display_edge.cc: + Here. + * tests/core/routine/extend.cc, + * tests/labeling/foreground.cc, + * tests/linear/sobel_2d.cc, + * tests/morpho/elementary/gradient.cc, + * tests/morpho/elementary/gradient_external.cc, + * tests/morpho/elementary/gradient_internal.cc, + * tests/morpho/elementary/laplacian.cc, + * tests/morpho/skeleton_constrained.cc, + * tests/morpho/tree/compute_attribute_image.cc, + * tests/morpho/tree/compute_parent.cc, + * tests/pw/image.cc, + * tests/world/inter_pixel/immerse.cc, + * tools/area_flooding.cc: + Do not include mln/core/var.hh. + 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> Help SWIG wrap mln::internal::image_base. diff --git a/milena/apps/constrained-connectivity/constrained-connectivity.cc b/milena/apps/constrained-connectivity/constrained-connectivity.cc index d6ad094..54739ee 100644 --- a/milena/apps/constrained-connectivity/constrained-connectivity.cc +++ b/milena/apps/constrained-connectivity/constrained-connectivity.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -85,8 +86,6 @@ #include <mln/io/pgm/load.hh> #include <mln/debug/println.hh> -#include <mln/core/var.hh> - int main(int argc, char* argv[]) { @@ -123,7 +122,8 @@ int main(int argc, char* argv[]) debug::println("f:", f); // Compute the associated line graph gradient. - mln_VAR(g, world::inter_pixel::compute (f, fun::vv2v::diff_abs<int_u8>())); + typedef image_if<image2d<int_u8>, world::inter_pixel::is_separator> g_t; + g_t g = world::inter_pixel::compute (f, fun::vv2v::diff_abs<int_u8>()); debug::println("g:", g); @@ -131,7 +131,8 @@ int main(int argc, char* argv[]) typedef morpho::watershed::topo_wst<g_t, world::inter_pixel::dbl_neighb2d> tree_t; tree_t tree(g, world::inter_pixel::e2e()); tree.go(); - mln_VAR(w, morpho::watershed::topological(tree)); + typedef image_if<image2d<int_u8>, world::inter_pixel::is_separator> w_t; + w_t w = morpho::watershed::topological(tree); debug::println("w:", w); // Computing the set of values of W. @@ -145,7 +146,11 @@ int main(int argc, char* argv[]) for (std::set<int_u8>::const_iterator alpha = values.begin(); alpha != values.end(); ++alpha) { - mln_VAR(alpha_cc, w | (pw::value(w) > pw::cst(*alpha))); + typedef image_if< w_t, + fun::greater_v2b_expr_< pw::value_<w_t>, + pw::cst_<int_u8> > > + alpha_cc_t; + alpha_cc_t alpha_cc = w | (pw::value(w) > pw::cst(*alpha)); std::cout << *alpha << "-cc:" << std::endl; /* FIXME: There should be variants of debug::println allowing the user to pass an optional ``support'' larger than the @@ -201,7 +206,8 @@ int main(int argc, char* argv[]) mln_ch_value_(w_t, int_u8) max_val = morpho::tree::compute_attribute_image_from(max_accu, t, init_max_val); // Attribute image of components' height. - mln_ch_value_(w_t, int_u8) height; + typedef mln_ch_value_(w_t, int_u8) height_t; + height_t height; initialize(height, w); for_all(e) height(e) = max_val(e) - min_val(e); @@ -210,9 +216,16 @@ int main(int argc, char* argv[]) // Thresholding W using first integer values with a condition on HEIGHT. for (unsigned alpha = 0; alpha <= 6; ++alpha) { - mln_VAR(alpha_alpha_cc, - w | (pw::value(w) > pw::cst(alpha) - || (pw::value(height) > pw::cst(alpha)))); + typedef image_if< w_t, + fun::or__v2b_expr_< + fun::greater_v2b_expr_< pw::value_<w_t>, + pw::cst_<unsigned> >, + fun::greater_v2b_expr_< pw::value_<height_t>, + pw::cst_<unsigned> > > > + alpha_alpha_cc_t; + alpha_alpha_cc_t alpha_alpha_cc = + w | (pw::value(w) > pw::cst(alpha) + || (pw::value(height) > pw::cst(alpha))); std::cout << "(" << alpha << ", " << alpha << ")-cc:" << std::endl; // FIXME: Same remark as above about println. debug::impl::println(w.unmorph_().domain(), alpha_alpha_cc); diff --git a/milena/tests/core/image/dmorph/transformed_image.cc b/milena/tests/core/image/dmorph/transformed_image.cc index de16db7..b206dd7 100644 --- a/milena/tests/core/image/dmorph/transformed_image.cc +++ b/milena/tests/core/image/dmorph/transformed_image.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/fun/p2p/translation.hh> #include <mln/debug/iota.hh> @@ -42,8 +41,10 @@ int main() debug::iota(ima); dpoint2d dp(-1,+1); - mln_VAR( ima_, transform_domain( ima, - fun::p2p::translation_t<point2d>(dp) ) ); + typedef transformed_image< mln::image2d<int>, + fun::p2p::translation_t<point2d> > ima__t; + ima__t ima_ = transform_domain( ima, + fun::p2p::translation_t<point2d>(dp) ); box2d b_ = geom::bbox(ima_.domain()); diff --git a/milena/tests/core/image/dmorph/unproject_image.cc b/milena/tests/core/image/dmorph/unproject_image.cc index bb7dbde..8c36cea 100644 --- a/milena/tests/core/image/dmorph/unproject_image.cc +++ b/milena/tests/core/image/dmorph/unproject_image.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -26,7 +26,6 @@ #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/unproject_image.hh> -#include <mln/core/var.hh> #include <mln/fun/v2v/projection.hh> @@ -47,7 +46,10 @@ int main() fun::v2v::projection<point2d, 0> f; - mln_VAR( ima_, unproject(ima, make::box2d(3, 3), f) ); + typedef unproject_image< image1d<int>, + box2d, + fun::v2v::projection<point2d, 0u> > ima__t; + ima__t ima_ = unproject(ima, make::box2d(3, 3), f); debug::println(ima_); ima_(point2d(1,1)) = 9; diff --git a/milena/tests/core/image/graph_image.cc b/milena/tests/core/image/graph_image.cc index f27969d..f4be6d1 100644 --- a/milena/tests/core/image/graph_image.cc +++ b/milena/tests/core/image/graph_image.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -30,7 +30,6 @@ #include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/core/concept/function.hh> #include <mln/core/neighb.hh> -#include <mln/core/var.hh> #include <mln/accu/shape/bbox.hh> #include <mln/fun/i2v/array.hh> #include <mln/util/graph.hh> @@ -120,7 +119,10 @@ int main() iota(i) = 10 + i; // Create graph image. - mln_const_VAR(ima, (iota | pv)); + typedef pw::image< fun::i2v::array<unsigned>, + p_vertices< util::graph, + fun::i2v::array<point2d> > > ima_t; + ima_t ima = iota | pv; { // FIXME: Move this part to a special test case. diff --git a/milena/tests/core/routine/extend.cc b/milena/tests/core/routine/extend.cc index 9d3a782..13d3085 100644 --- a/milena/tests/core/routine/extend.cc +++ b/milena/tests/core/routine/extend.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -23,8 +24,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/var.hh> - #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/sub_image.hh> diff --git a/milena/tests/labeling/foreground.cc b/milena/tests/labeling/foreground.cc index 286c166..299f72c 100644 --- a/milena/tests/labeling/foreground.cc +++ b/milena/tests/labeling/foreground.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2013, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/var.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/load.hh> #include <mln/core/alias/neighb2d.hh> diff --git a/milena/tests/linear/sobel_2d.cc b/milena/tests/linear/sobel_2d.cc index 060eaa0..45b58cc 100644 --- a/milena/tests/linear/sobel_2d.cc +++ b/milena/tests/linear/sobel_2d.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/data/stretch.hh> diff --git a/milena/tests/morpho/elementary/gradient.cc b/milena/tests/morpho/elementary/gradient.cc index af99e80..4b735cd 100644 --- a/milena/tests/morpho/elementary/gradient.cc +++ b/milena/tests/morpho/elementary/gradient.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -26,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> diff --git a/milena/tests/morpho/elementary/gradient_external.cc b/milena/tests/morpho/elementary/gradient_external.cc index 98f7ae5..50835a0 100644 --- a/milena/tests/morpho/elementary/gradient_external.cc +++ b/milena/tests/morpho/elementary/gradient_external.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -26,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> diff --git a/milena/tests/morpho/elementary/gradient_internal.cc b/milena/tests/morpho/elementary/gradient_internal.cc index 8f1cb77..0e46cc5 100644 --- a/milena/tests/morpho/elementary/gradient_internal.cc +++ b/milena/tests/morpho/elementary/gradient_internal.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -26,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/make/image2d.hh> diff --git a/milena/tests/morpho/elementary/laplacian.cc b/milena/tests/morpho/elementary/laplacian.cc index 640bed4..809e918 100644 --- a/milena/tests/morpho/elementary/laplacian.cc +++ b/milena/tests/morpho/elementary/laplacian.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +26,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> diff --git a/milena/tests/morpho/skeleton_constrained.cc b/milena/tests/morpho/skeleton_constrained.cc index f3fecca..28b89b9 100644 --- a/milena/tests/morpho/skeleton_constrained.cc +++ b/milena/tests/morpho/skeleton_constrained.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -26,7 +26,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/value/int_u8.hh> #include <mln/make/dual_neighb.hh> diff --git a/milena/tests/morpho/tree/compute_attribute_image.cc b/milena/tests/morpho/tree/compute_attribute_image.cc index 41bee09..5d09f10 100644 --- a/milena/tests/morpho/tree/compute_attribute_image.cc +++ b/milena/tests/morpho/tree/compute_attribute_image.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -30,7 +31,6 @@ #include <mln/data/compare.hh> #include <mln/debug/println.hh> -#include <mln/core/var.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> diff --git a/milena/tests/morpho/tree/compute_parent.cc b/milena/tests/morpho/tree/compute_parent.cc index 4d9d6aa..0f87a95 100644 --- a/milena/tests/morpho/tree/compute_parent.cc +++ b/milena/tests/morpho/tree/compute_parent.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -23,7 +24,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/dmorph/image_if.hh> diff --git a/milena/tests/morpho/tree/filter/filter.cc b/milena/tests/morpho/tree/filter/filter.cc index 0054cd8..61a7200 100644 --- a/milena/tests/morpho/tree/filter/filter.cc +++ b/milena/tests/morpho/tree/filter/filter.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/var.hh> #include <mln/pw/all.hh> #include <mln/value/int_u8.hh> @@ -68,7 +67,9 @@ int main() A a = morpho::tree::compute_attribute_image(attribute_t (), tree); unsigned lambda = 5; - mln_VAR(predicate, pw::value(a) >= pw::cst(lambda)); + typedef fun::geq_v2b_expr_< pw::value_<image2d<unsigned> >, + pw::cst_<unsigned> > predicate_t; + predicate_t predicate = pw::value(a) >= pw::cst(lambda); I ref = morpho::closing::area(input, c4(), lambda); { diff --git a/milena/tests/pw/image.cc b/milena/tests/pw/image.cc index 52b08aa..063d55e 100644 --- a/milena/tests/pw/image.cc +++ b/milena/tests/pw/image.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -28,7 +29,6 @@ #include <mln/core/alias/box2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/pw/image.hh> -#include <mln/core/var.hh> int main() diff --git a/milena/tests/world/inter_pixel/compute.cc b/milena/tests/world/inter_pixel/compute.cc index bbf9b0c..9827d54 100644 --- a/milena/tests/world/inter_pixel/compute.cc +++ b/milena/tests/world/inter_pixel/compute.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,7 +25,6 @@ #include <cmath> -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> #include <mln/world/inter_pixel/immerse.hh> @@ -74,7 +73,8 @@ int main() mln_assertion(compute(imax, d) == (make::image2d(refs) | is_separator())); - mln_VAR(g, compute(imax, d)); + typedef image_if<image2d<int>, world::inter_pixel::is_separator> g_t; + g_t g = compute(imax, d); unsigned n_basins; debug::println(morpho::watershed::flooding(g, e2e(), n_basins)); diff --git a/milena/tests/world/inter_pixel/display_edge.cc b/milena/tests/world/inter_pixel/display_edge.cc index d9bdfe1..9452ba2 100644 --- a/milena/tests/world/inter_pixel/display_edge.cc +++ b/milena/tests/world/inter_pixel/display_edge.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> #include <mln/world/inter_pixel/immerse.hh> @@ -62,18 +61,18 @@ int main() typedef image_if<I, is_pixel> Ix; Ix imax = immerse(ima); - mln_VAR(g, compute(imax, d)); + image_if<I, is_separator> g = compute(imax, d); std::cout << g.unmorph_().bbox() << std::endl; - mln_VAR(out1, display_edge(g.unmorph_(), 0, 1)); + I out1 = display_edge(g.unmorph_(), 0, 1); debug::println(out1); - mln_VAR(out2, display_edge(g.unmorph_(), 0, 2)); + I out2 = display_edge(g.unmorph_(), 0, 2); debug::println(out2); - mln_VAR(out3, display_edge(g.unmorph_(), 0, 3)); + I out3 = display_edge(g.unmorph_(), 0, 3); debug::println(out3); - mln_VAR(out4, display_edge(g.unmorph_(), 0, 4)); + I out4 = display_edge(g.unmorph_(), 0, 4); debug::println(out4); - mln_VAR(out5, display_edge(g.unmorph_(), 0, 5)); + I out5 = display_edge(g.unmorph_(), 0, 5); debug::println(out5); } @@ -88,18 +87,18 @@ int main() typedef image_if<I, is_pixel> Ix; Ix imax = immerse(ima); - mln_VAR(g, compute(imax, d)); + image_if<I, is_separator> g = compute(imax, d); std::cout << g.unmorph_().bbox() << std::endl; - mln_VAR(out1, display_edge(g.unmorph_(), 0, 1)); + I out1 = display_edge(g.unmorph_(), 0, 1); debug::println(out1); - mln_VAR(out2, display_edge(g.unmorph_(), 0, 2)); + I out2 = display_edge(g.unmorph_(), 0, 2); debug::println(out2); - mln_VAR(out3, display_edge(g.unmorph_(), 0, 3)); + I out3 = display_edge(g.unmorph_(), 0, 3); debug::println(out3); - mln_VAR(out4, display_edge(g.unmorph_(), 0, 4)); + I out4 = display_edge(g.unmorph_(), 0, 4); debug::println(out4); - mln_VAR(out5, display_edge(g.unmorph_(), 0, 5)); + I out5 = display_edge(g.unmorph_(), 0, 5); debug::println(out5); } } diff --git a/milena/tests/world/inter_pixel/immerse.cc b/milena/tests/world/inter_pixel/immerse.cc index fdfe2f7..30be285 100644 --- a/milena/tests/world/inter_pixel/immerse.cc +++ b/milena/tests/world/inter_pixel/immerse.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> #include <mln/world/inter_pixel/immerse.hh> diff --git a/milena/tools/area_flooding.cc b/milena/tools/area_flooding.cc index 5efbcf9..06bfcb3 100644 --- a/milena/tools/area_flooding.cc +++ b/milena/tools/area_flooding.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Copyright (C) 2008, 2009, 2013, 2014 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -55,7 +55,6 @@ #include <mln/core/routine/duplicate.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/var.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing/area_on_vertices.hh> -- 1.7.10.4

1 0

olena: olena-2.0-865-g43a7295 Make src/primitive/group/group_from_rag.cc compile again.
by Roland Levillain 18 Jun '14

18 Jun '14

* src/primitive/group/group_from_rag.cc: Here. * src/primitive/group/Makefile.am (noinst_PROGRAMS): Add group_from_rag. --- scribo/ChangeLog | 8 +++++ scribo/src/primitive/group/Makefile.am | 9 +++--- scribo/src/primitive/group/group_from_rag.cc | 43 ++++++++++++++------------ 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bf44f14..22b10be 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2014-06-18 Roland Levillain <roland(a)lrde.epita.fr> + + Make src/primitive/group/group_from_rag.cc compile again. + + * src/primitive/group/group_from_rag.cc: Here. + * src/primitive/group/Makefile.am (noinst_PROGRAMS): + Add group_from_rag. + 2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> Update the list of Scribo-related publications. diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index d8bc10e..2ac96c1 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010, 2014 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -23,8 +23,9 @@ noinst_PROGRAMS = \ group_from_several_left_links \ group_from_single_link +noinst_PROGRAMS += group_from_rag ## FIXME: Does not compile. -## bin_PROGRAMS += group_from_rag \ -## group_from_graph \ -## group_from_several_graph +## noinst_PROGRAMS += \ +## group_from_graph \ +## group_from_several_graph diff --git a/scribo/src/primitive/group/group_from_rag.cc b/scribo/src/primitive/group/group_from_rag.cc index 23827a9..f6f159c 100644 --- a/scribo/src/primitive/group/group_from_rag.cc +++ b/scribo/src/primitive/group/group_from_rag.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -44,7 +44,7 @@ #include <mln/util/graph.hh> #include <mln/accu/center.hh> -#include <scribo/primitive/extract/objects.hh> +#include <scribo/primitive/extract/components.hh> #include <scribo/primitive/link/with_rag.hh> //#include <scribo/primitive/group/from_rag.hh> @@ -54,8 +54,8 @@ #include <scribo/fun/v2b/objects_small_filter.hh> -#include <scribo/debug/save_bboxes_image.hh> -#include <scribo/debug/save_linked_bboxes_image.hh> +#include <scribo/debug/bboxes_image.hh> +#include <scribo/debug/linked_bboxes_image.hh> #include <scribo/make/debug_filename.hh> int usage(const char *name) @@ -172,40 +172,45 @@ int main(int argc, char* argv[]) typedef image2d<value::label_16> L; value::label_16 nbboxes; - typedef object_image(L) objects_t; - objects_t objects = primitive::extract::objects(input, c8(), nbboxes); + typedef component_set<L> components_t; + components_t components = primitive::extract::components(input, c8(), nbboxes); /// First filtering. - objects_t filtered_objects - = scribo::filter::objects_small(objects, 6); + components_t filtered_components + = scribo::filter::components_small(components, 6); - filtered_objects - = scribo::filter::objects_thin(filtered_objects, 3); + filtered_components + = scribo::filter::components_thin(filtered_components, 3); - filtered_objects - = scribo::filter::objects_thick(filtered_objects, + filtered_components + = scribo::filter::objects_thick(filtered_components, math::min(input.ncols(), input.nrows()) / 6); - /// Getting objects links from a Region Adjacency graph. - mln_VAR(rag_data, primitive::link::with_rag(filtered_objects, c8())); + /// Getting components links from a Region Adjacency graph. + mln_VAR(rag_data, primitive::link::with_rag(filtered_components, c8())); mln_VAR(v_ima, scribo::graph::compute_vertex(accu::center<point2d>(), rag_data.first(), - filtered_objects, - filtered_objects.nlabels())); + filtered_components.labeled_image(), + filtered_components.nelements())); //FOR DEBUGGING PURPOSE { image2d<value::rgb8> before_grouping = data::convert(value::rgb8(), input); + // FIXME: Disabled, no longer compiles. +#if 0 scribo::draw::bounding_boxes(before_grouping, - filtered_objects.bboxes(), + filtered_components.bboxes(), literal::blue); +#endif - mln_VAR(pv, mln::make::p_vertices_with_mass_centers(filtered_objects, rag_data.first())); + mln_VAR(pv, + mln::make::p_vertices_with_mass_centers(filtered_components.labeled_image(), + rag_data.first())); mln::debug::draw_graph(before_grouping, pv, literal::green, literal::green); io::ppm::save(before_grouping, @@ -227,7 +232,7 @@ int main(int argc, char* argv[]) // scribo::draw::bounding_boxes(after_grouping, -// filtered_objects.bboxes(), +// filtered_components.bboxes(), // literal::blue); // mln::debug::draw_graph(after_grouping, v_ima.domain(), -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-864-gd7ef07c
by git＠lrde.epita.fr 17 Jun '14

17 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via d7ef07c626eb19db38a1f7aa74be6dc44575a965 (commit) via 8654505b53fd6f71b56629bd21c54f971d995633 (commit) from d03982de37343a3bf4f3541e1e8f1a50793185d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- d7ef07c Update the list of Scribo-related publications. 8654505 Update the list of Olena- and Milena-related publications. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ README | 41 +++++++++++++++++++++++------------------ scribo/ChangeLog | 6 ++++++ scribo/README | 17 +++++++++++++++-- 4 files changed, 50 insertions(+), 20 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-864-gd7ef07c Update the list of Scribo-related publications.
by Roland Levillain 17 Jun '14

17 Jun '14

* README (Bibliography): Here. --- scribo/ChangeLog | 6 ++++++ scribo/README | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 419cc9a..bf44f14 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Update the list of Scribo-related publications. + + * README (Bibliography): Here. + 2014-03-31 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Improve scribo-cli's `--version' option. diff --git a/scribo/README b/scribo/README index 00bc235..4397027 100644 --- a/scribo/README +++ b/scribo/README @@ -91,7 +91,20 @@ KNOWN ISSUES Bibliography ============ -Further information about SCRIBO can be found into the following paper. +Further information about SCRIBO and document image analysis can be +found in the following papers. + + * `Efficient Multiscale Sauvola's Binarization`. Guillaume + Lazzara, Thierry Géraud. In the International Journal of + Document Analysis and Recognition (IJDAR), volume 17, number 2, + pages 105-123, Springer Berlin Heidelberg, June 2014. + + * `Planting, Growing and Pruning Trees: Connected Filters Applied + to Document Image Analysis`. Guillaume Lazzara, Thierry Géraud, + Roland Levillain. In the proceedings of the 11th IAPR + International Workshop on Document Analysis Systems (DAS) + http://das2014.sciencesconf.org/ + Tours, France, April 7 - 10, 2014. * `The SCRIBO Module of the Olena Platform: a Free Software Framework for Document Image Analysis.` Guillaume Lazzara, @@ -100,7 +113,7 @@ Further information about SCRIBO can be found into the following paper. 11th International Conference on Document Analysis and Recognition (ICDAR) http://www.icdar2011.org/ - Beijing, China September 18 - 21, 2011. + Beijing, China, September 18 - 21, 2011. You can download this paper and related material from -- 1.7.10.4

1 0

olena: olena-2.0-863-g8654505 Update the list of Olena- and Milena-related publications.
by Roland Levillain 17 Jun '14

17 Jun '14

* README (Bibliography): Here. --- ChangeLog | 6 ++++++ README | 41 +++++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0a63b9..04ecd4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + Update the list of Olena- and Milena-related publications. + + * README (Bibliography): Here. + +2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + Update software version numbers. * README (Required Software, Configuration, Supported Platforms) diff --git a/README b/README index 7a58cbb..c675473 100644 --- a/README +++ b/README @@ -524,11 +524,19 @@ mail address follows. Bibliography ============ -Further information about Olena can be found into the following related -papers. +Further information about Olena and image processing can be found in +the following papers. About Image Processing Programming: + * `Writing Reusable Digital Topology Algorithms in a Generic Image + Processing Framework`. Roland Levillain, Thierry G�raud, Laurent + Najman. In Ullrich K�the, Annick Montanvert, Pierre Soille + (editors), WADGMM 2010 -- Proceedings of the Workshop on + Applications of Digital Geometry and Mathematical Morphology), + pages 140-153, Lecture Notes in Computer Science, volume 7346, + Springer-Verlag Berlin Heidelberg, 2012. + * `Une approche g�n�rique du logiciel pour le traitement d'images pr�servant les performances`. Roland Levillain, Thierry G�raud, Laurent Najman. In the proceedings of the 23rd Symposium on @@ -543,13 +551,6 @@ About Image Processing Programming: http://www.icip2010.org/ Hong Kong, September 26 - 29, 2010. - * `Writing Reusable Digital Geometry Algorithms in a Generic Image - Processing Framework`. Roland Levillain, Thierry G�raud, Laurent - Najman. In the proceedings of the Workshop on Applications of - Digital Geometry and Mathematical Morphology (WADGMM) - http://mdigest.jrc.ec.europa.eu/wadgmm2010/ - Istanbul, Turkey, August 22, 2010. - * `Milena: Write Generic Morphological Algorithms Once, Run on Many Kinds of Images`. Roland Levillain, Thierry G�raud, Laurent Najman. In the proceedings of the 9th International Symposium on @@ -562,13 +563,13 @@ About Image Processing Programming: of ECOOP PHD Oslo, Norway, June 2004. * `Generic Implementation of Morphological Image Operators`, J�r�me - Darbon, Thierry G�raud, and Alexandre Duret-Lutz, submitted to - International Symposium On Mathematical Morphology VI (ISMM - 2002), April 3-5, 2002, Sydney, Australia. + Darbon, Thierry G�raud, and Alexandre Duret-Lutz. In the + proceedings of the International Symposium On Mathematical + Morphology VI (ISMM 2002), April 3-5, 2002, Sydney, Australia. * `Applying Generic Programming to Image Processing`, Thierry G�raud, Yoann Fabre, and Alexandre Duret-Lutz. In the - Proceedings of the IASTED International Conference on Applied + proceedings of the IASTED International Conference on Applied Informatics (AI'2001) - Symposium Advances in Computer Applications, ACTA Press, pages 577-581, Innsbruck, Austria, February 2001. @@ -576,12 +577,16 @@ About Image Processing Programming: * `Obtaining Genericity for Image Processing and Pattern Recognition Algorithms`. Thierry G�raud, Yoann Fabre, Alexandre Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-Fran�ois - Mangin. In the Proceedings of the 15th International Conference + Mangin. In the proceedings of the 15th International Conference on Pattern Recognition (ICPR'2000), IEEE Computer Society, vol. 4, pages 816-819, Barcelona, Spain, September 2000. About Generic Programming Paradigm: + * `Towards a Software Architecture for Generic Image Processing`. + Roland Levillain. Ph.D. thesis, Universit\'e Paris-Est, + Marne-la-Vall�e, France, 2011. + * `Semantics-Driven Genericity: A Sequel to the Static C++ Object-Oriented Programming Paradigm (SCOOP 2)`. Thierry G�raud, Roland Levillain. In the proceedings of the 6th International @@ -592,18 +597,18 @@ About Generic Programming Paradigm: * `Static C++ Object-Oriented Programming (SCOOP)`, Nicolas Burrus, Alexandre Duret-Lutz, Thierry G�raud, David Lesage, and Rapha�l - Poss. In the Proceedings of the Workshop on Multiple Paradigm - with OO Languages (MPOOL'03) Anaheim, CA, October 2003. + Poss. In the proceedings of the Workshop on Multiple Paradigm + with OO Languages (MPOOL'03), Anaheim, CA, October 2003. * `Generic Design Patterns in C++`. Alexandre Duret-Lutz, Thierry - G�raud, and Akim Demaille. In the Proceedings of the 6th USENIX + G�raud, and Akim Demaille. In the proceedings of the 6th USENIX Conference on Object-Oriented Technologies and Systems (COOTS'2001), pages 189-202, San Antonio, Texas, USA, January-February 2001. * `Olena: a Component-Based Platform for Image Processing, mixing Generic, Generative and OO Programming`. Alexandre Duret-Lutz. - In the Proceedings of the 2nd International Symposium on + In the proceedings of the 2nd International Symposium on Generative and Component-Based Software Engineering (GCSE 2000), Young Researchers Workshop (published in "Net.ObjectDays2000"; ISBN 3-89683-932-2), pages 653-659, Erfurt, Germany, October -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-862-gd03982d
by git＠lrde.epita.fr 17 Jun '14

17 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via d03982de37343a3bf4f3541e1e8f1a50793185d1 (commit) via fc7d59183b9701bb0ab4f857175f7c17bc0878f7 (commit) from c2f9c9a9f7acd631d9c3c4fb6419ff825aabad6a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- d03982d Update software version numbers. fc7d591 Update instructions for releases. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 14 ++++++++++++++ HACKING | 27 +++++++++++++++------------ README | 18 +++++++++--------- 3 files changed, 38 insertions(+), 21 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-862-gd03982d Update software version numbers.
by Roland Levillain 17 Jun '14

17 Jun '14

* README (Required Software, Configuration, Supported Platforms) * HACKING (Required Software): Here. --- ChangeLog | 8 ++++++++ HACKING | 9 +++++---- README | 18 +++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43c190c..c0a63b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + Update software version numbers. + + * README (Required Software, Configuration, Supported Platforms) + * HACKING (Required Software): + Here. + +2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + Update instructions for releases. * HACKING (Releasing): Here. diff --git a/HACKING b/HACKING index 41af64a..8fd9b37 100644 --- a/HACKING +++ b/HACKING @@ -61,7 +61,7 @@ the following extra programs if you want to work on the Olena project. - GNU Autoconf 2.61, - - GNU Automake 1.10, + - GNU Automake 1.11, - GNU Libtool 1.5.22. @@ -69,7 +69,7 @@ the following extra programs if you want to work on the Olena project. - SWIG 1.3.35, - - Python 2.5. + - Python 2.4. * If you want to change and/or rebuild the documentation, the following tools are required: @@ -80,9 +80,10 @@ the following extra programs if you want to work on the Olena project. - the `listings' LaTeX package, - - the `convert' utility from ImageMagick (6.3.7), + - the `convert' utility from ImageMagick (6.3.7) or + GraphicsMagick (1.3.12), - - HeVeA 1.10 + - HeVeA 1.10, - LaTeX2HTML (or at minimum, its `html.sty' style file), diff --git a/README b/README index 9a3a821..7a58cbb 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development -Laboratory (LRDE) +Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 EPITA Research and +Development Laboratory (LRDE) This file is part of Olena. @@ -89,7 +89,7 @@ Optional: * to use various image types: - - Magick++ + - Magick++ (either provided by ImageMagick or GraphicsMagick) - libtiff @@ -148,9 +148,9 @@ In order to prepare the build process, you need to configure the source tree. Assuming your Olena distribution is uncompressed in directory -`olena-1.0', follow these steps: +`olena-2.0', follow these steps: - % cd olena-1.0 + % cd olena-2.0 % mkdir _build % cd _build % ../configure @@ -452,10 +452,10 @@ Olena has been tested on the following configurations: =========================== ============================================= System Compiler =========================== ============================================= -GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3 -GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0 -GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1 -Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1 +GNU/Linux on x86-64 g++ (GNU GCC) 4.7, 4.8 +GNU/Linux on x86-64 clang++ (LLVM) 3.5 +OS X (10.8) on Intel 64 g++ (GNU GCC) 4.8 +OS X (10.8) on Intel 64 clang++ (Apple LLVM) 5.0 =========================== ============================================= -- 1.7.10.4

1 0

olena: olena-2.0-861-gfc7d591 Update instructions for releases.
by Roland Levillain 17 Jun '14

17 Jun '14

* HACKING (Releasing): Here. --- ChangeLog | 6 ++++++ HACKING | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 444f0d3..43c190c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Update instructions for releases. + + * HACKING (Releasing): Here. + 2011-01-10 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac (APPS_CXXFLAGS_NODEBUG): New precious variable. diff --git a/HACKING b/HACKING index 992ec81..41af64a 100644 --- a/HACKING +++ b/HACKING @@ -1,4 +1,5 @@ -Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory (LRDE) +Copyright (C) 2009, 2010, 2013, 2014 EPITA Research and Development +Laboratory (LRDE) This file is part of Olena. @@ -108,7 +109,7 @@ Things to remember before releasing a new version of Olena, roughly in this order: * Olena is designed to be released as a whole package - (`olena-x.y.tar.{gz,bz2}') *and* as seperate components + (`olena-x.y.tar.{gz,bz2}') and later as separate components (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}', `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be checked. @@ -123,26 +124,26 @@ this order: * Update revision numbers in `configure.ac' in the top-level and subprojects directories (`milena/', `scribo/', etc.). - * Create all packages using `make distcheck' (not just + * Create (all) packages using `make distcheck' (not just `make dist'). - * Install the packages in `/lrde/dload/olena/x.y/', along with the + * Install the packages in `/lrde/dload/olena/x.y/', along with Olena's `NEWS' and `README' files, and Milena's documentation (in `/lrde/dload/olena/x.y./doc/') and ensure they are accessible from the Web. * Create a new page on the Olena Web site for the new release (e.g, - http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update + https://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update the Download page (http://olena.lrde.epita.fr/Download) and make an announcement on the main page (http://olena.lrde.epita.fr/) - Also update the link under the Download item of the left bar - (http://olena.lrde.epita.fr/WebContents) + Also update the link under the Download item of the right-hand + side menu (https://www.lrde.epita.fr/wiki/Template:OlenaMenu) * Likewise, announce the release on the Olena Trac (https://trac.lrde.org/olena/) * Make an announce on the LRDE Web site as well - (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News) + (https://www.lrde.epita.fr/wiki/Form:OlenaNews) * Finally, post an announce to annonce(a)lrde.epita.fr. See the files `ANNOUNCE-x.y' at the root of the repository for models. @@ -163,4 +164,5 @@ this order: .. Local Variables: .. mode: rst +.. ispell-local-dictionary: "american" .. End: -- 1.7.10.4

1 0