* icdar/2009/hsc/first_attempts/boxes.cc, * icdar/2009/hsc/first_attempts/exec/iz_lines.cc, * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, * inim/2010/boxes/boxes.cc, * lazzara/igr/irm/grad_clo_and_wshd.cc, * lazzara/igr/irm/hsl_grad_and_wst.cc: use v2v::wrap instead of l2l::wrap. --- milena/sandbox/ChangeLog | 12 ++++++++++++ .../sandbox/icdar/2009/hsc/first_attempts/boxes.cc | 4 ++-- .../icdar/2009/hsc/first_attempts/exec/iz_lines.cc | 2 +- .../2009/hsc/first_attempts/exec/relabel_lines.cc | 4 ++-- milena/sandbox/inim/2010/boxes/boxes.cc | 4 ++-- .../sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc | 4 ++-- milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc | 4 ++-- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 715f01f..2f793e4 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,15 @@ +2009-04-30 Guillaume Lazzara <lazzara@lrde.epita.fr> + + Change references to l2l:: to v2v::. + + * icdar/2009/hsc/first_attempts/boxes.cc, + * icdar/2009/hsc/first_attempts/exec/iz_lines.cc, + * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, + * inim/2010/boxes/boxes.cc, + * lazzara/igr/irm/grad_clo_and_wshd.cc, + * lazzara/igr/irm/hsl_grad_and_wst.cc: use v2v::wrap instead of + l2l::wrap. + 2009-05-03 Edwin Carlinet <carlinet@lrde.epita.fr> Rewrite propagation using predicate. diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/boxes.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/boxes.cc index 84a379d..9742c1f 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/boxes.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/boxes.cc @@ -45,7 +45,7 @@ #include <mln/io/dump/save.hh> #include <mln/io/pgm/save.hh> -#include <mln/fun/l2l/wrap.hh> +#include <mln/fun/v2v/wrap.hh> int usage(const char *name) @@ -98,7 +98,7 @@ int main(int argc, char* argv[]) io::dump::save(grouped_text.label_image(), argv[2]); io::pgm::save(level::transform(grouped_text.label_image(), - fun::l2l::wrap<value::int_u8>()), + fun::v2v::wrap<value::int_u8>()), "tmp.pgm"); scribo::debug::save_textbboxes_image(input, grouped_text.bboxes(), diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc index 291c6e6..471657d 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc @@ -14,7 +14,7 @@ #include <mln/transform/influence_zone_geodesic.hh> // #include <mln/level/transform.hh> -// #include <mln/fun/l2l/wrap.hh> +// #include <mln/fun/v2v/wrap.hh> using mln::value::int_u8; diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc index 797f864..f7c9008 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc @@ -17,7 +17,7 @@ #include <mln/transform/influence_zone_geodesic.hh> #include <mln/level/transform.hh> -#include <mln/fun/l2l/wrap.hh> +#include <mln/fun/v2v/wrap.hh> namespace mln @@ -191,7 +191,7 @@ namespace mln { io::pgm::save(level::transform(line_lab, - fun::l2l::wrap<value::int_u8>()), + fun::v2v::wrap<value::int_u8>()), "tmp_lines.pgm"); } diff --git a/milena/sandbox/inim/2010/boxes/boxes.cc b/milena/sandbox/inim/2010/boxes/boxes.cc index 2b0ddee..8944974 100644 --- a/milena/sandbox/inim/2010/boxes/boxes.cc +++ b/milena/sandbox/inim/2010/boxes/boxes.cc @@ -46,7 +46,7 @@ #include <mln/io/dump/save.hh> #include <mln/io/pgm/save.hh> -#include <mln/fun/l2l/wrap.hh> +#include <mln/fun/v2v/wrap.hh> #include <mln/math/abs.hh> @@ -138,7 +138,7 @@ int main(int argc, char* argv[]) io::dump::save(grouped_text.label_image(), argv[2]); io::pgm::save(level::transform(grouped_text.label_image(), - fun::l2l::wrap<value::int_u8>()), + fun::v2v::wrap<value::int_u8>()), "tmp.pgm"); std::cout << "Debug 8" << std::endl; diff --git a/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc index 960d03f..49fdb1a 100644 --- a/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc +++ b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc @@ -25,7 +25,7 @@ #include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/fun/l2l/wrap.hh> +#include <mln/fun/v2v/wrap.hh> #include <mln/core/var.hh> #include <mln/morpho/elementary/dilation.hh> @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), + io::pgm::save(level::transform(wshed, fun::v2v::wrap<int_u8>()), "tmp_wshed.pgm"); diff --git a/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc b/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc index ac29dd6..3fb657d 100644 --- a/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc +++ b/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc @@ -16,7 +16,7 @@ #include <mln/labeling/mean_values.hh> -#include <mln/fun/l2l/wrap.hh> +#include <mln/fun/v2v/wrap.hh> namespace mln @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) io::dump::save(wshed, "hsl2rgb_wshed.dump"); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), + io::pgm::save(level::transform(wshed, fun::v2v::wrap<int_u8>()), "hsl2rgb_wshed.pgm"); io::ppm::save(labeling::mean_values(level::transform(input, hsl2rgb()), wshed, nbasins), "hsl2rgb_wshed_mean_colors.ppm"); -- 1.5.6.5