[Olena-patches] olena: olena-2.0-868-gf303e00 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. --- 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 &lt;roland(a)lrde.epita.fr&gt; + + 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 &lt;roland(a)lrde.epita.fr&gt; 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