https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Fix missing updates about debug colorize. * scribo/debug/save_label_image.hh, * scribo/src/extract_text_single_link.cc, * scribo/src/extract_text_graph.cc, * scribo/src/morpho.cc, * scribo/src/table_rebuild_rank.cc, * scribo/src/extract_text_several_left_links.cc, * scribo/src/table_rebuild_opening.cc, * scribo/src/extract_text_several_graph.cc, * scribo/src/dmap.cc, * scribo/src/table_extract.cc, * scribo/src/extract_text_double_link.cc, * scribo/src/extract_text_double_several_links.cc, * scribo/src/photo_basic.cc, * scribo/table/internal/repair_lines.hh, * scribo/demat.hh, * icdar/2009/dibco/quasi.cc, * icdar/2009/dibco/svg.1.binarization.cc, * icdar/2009/dibco/svg.2.binarization.cc, * icdar/2009/dibco/svg.3.binarization.cc, * icdar/2009/dibco/binarization.cc, * icdar/2009/hsc/icdar2ppm.hh, * icdar/2009/hsc/input_to_words_dat.cc, * icdar/2009/hsc/dummy_input_to_words_dat.cc, * icdar/2009/hsc/input_to_lines_dat.cc, * icdar/2009/hsc/input_to_ws.hh, * 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, * icdar/2009/hsc/first_attempts/main.cc, * icdar/2009/hsc/input_to_wsl.cc, * icdar/2009/hsc/old_input_to_lines.cc, * icdar/2009/hsc/ws_to_wsl.hh, * fabien/igr/seg_fixed.cc, * fabien/igr/graph.cc, * fabien/igr/nbasins_finder.cc, * fabien/bin/dumpl32_to_colorize.cc, * inim/2010/boxes/boxes.cc, * theo/color/filter_blen_rgb_edges.cc, * lazzara/igr/igr-biggest-comp.cc, * lazzara/igr/igr.cc, * lazzara/igr/igr-cloud.cc, * edwin/inim/inim.cc: Fix missing updates about debug colorize. edwin/inim/inim.cc | 4 ++-- fabien/bin/dumpl32_to_colorize.cc | 6 +++--- fabien/igr/graph.cc | 6 +++--- fabien/igr/nbasins_finder.cc | 4 ++-- fabien/igr/seg_fixed.cc | 4 ++-- icdar/2009/dibco/binarization.cc | 8 ++++---- icdar/2009/dibco/quasi.cc | 2 +- icdar/2009/dibco/svg.1.binarization.cc | 4 ++-- icdar/2009/dibco/svg.2.binarization.cc | 8 ++++---- icdar/2009/dibco/svg.3.binarization.cc | 8 ++++---- icdar/2009/hsc/dummy_input_to_words_dat.cc | 4 ++-- icdar/2009/hsc/first_attempts/boxes.cc | 2 +- icdar/2009/hsc/first_attempts/exec/iz_lines.cc | 4 ++-- icdar/2009/hsc/first_attempts/exec/relabel_lines.cc | 4 ++-- icdar/2009/hsc/first_attempts/main.cc | 6 +++--- icdar/2009/hsc/icdar2ppm.hh | 4 ++-- icdar/2009/hsc/input_to_lines_dat.cc | 4 ++-- icdar/2009/hsc/input_to_words_dat.cc | 4 ++-- icdar/2009/hsc/input_to_ws.hh | 4 ++-- icdar/2009/hsc/input_to_wsl.cc | 4 ++-- icdar/2009/hsc/old_input_to_lines.cc | 4 ++-- icdar/2009/hsc/ws_to_wsl.hh | 4 ++-- inim/2010/boxes/boxes.cc | 2 +- lazzara/igr/igr-biggest-comp.cc | 2 +- lazzara/igr/igr-cloud.cc | 2 +- lazzara/igr/igr.cc | 2 +- scribo/debug/save_label_image.hh | 2 +- scribo/demat.hh | 8 ++++---- scribo/src/dmap.cc | 2 +- scribo/src/extract_text_double_link.cc | 6 +++--- scribo/src/extract_text_double_several_links.cc | 4 ++-- scribo/src/extract_text_graph.cc | 4 ++-- scribo/src/extract_text_several_graph.cc | 2 +- scribo/src/extract_text_several_left_links.cc | 2 +- scribo/src/extract_text_single_link.cc | 8 ++++---- scribo/src/morpho.cc | 2 +- scribo/src/photo_basic.cc | 4 ++-- scribo/src/table_extract.cc | 2 +- scribo/src/table_rebuild_opening.cc | 2 +- scribo/src/table_rebuild_rank.cc | 2 +- scribo/table/internal/repair_lines.hh | 2 +- theo/color/filter_blen_rgb_edges.cc | 6 +++--- 42 files changed, 84 insertions(+), 84 deletions(-) Index: scribo/debug/save_label_image.hh --- scribo/debug/save_label_image.hh (revision 3777) +++ scribo/debug/save_label_image.hh (working copy) @@ -59,7 +59,7 @@ mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(lbl).is_valid()); - io::ppm::save(debug::colorize(rgb8(), lbl, nlabels), filename); + io::ppm::save(labeling::colorize(rgb8(), lbl, nlabels), filename); trace::exiting("scribo::debug::save_label_image"); } Index: scribo/src/extract_text_single_link.cc --- scribo/src/extract_text_single_link.cc (revision 3777) +++ scribo/src/extract_text_single_link.cc (working copy) @@ -71,7 +71,7 @@ text, left_link, literal::red, literal::cyan, scribo::make::debug_filename("left_links.ppm")); -// io::ppm::save(mln::debug::colorize(value::rgb8(), +// io::ppm::save(mln::labeling::colorize(value::rgb8(), // text.label_image(), // text.nbboxes()), // scribo::make::debug_filename("lbl_before.ppm")); @@ -80,7 +80,7 @@ = text::grouping::group_from_single_link(text, left_link); std::cout << "AFTER - nbboxes = " << grouped_text.bboxes().nelements() << std::endl; - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("left_label_color.ppm")); @@ -99,7 +99,7 @@ text, right_link, literal::red, literal::cyan, scribo::make::debug_filename("right_links.ppm")); -// io::ppm::save(mln::debug::colorize(value::rgb8(), +// io::ppm::save(mln::labeling::colorize(value::rgb8(), // text.label_image(), // text.nbboxes()), // scribo::make::debug_filename("lbl_before.ppm")); @@ -107,7 +107,7 @@ scribo::util::text<image2d<value::label_16> > grouped_text = text::grouping::group_from_single_link(text, right_link); - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("right_label_color.ppm")); Index: scribo/src/extract_text_graph.cc --- scribo/src/extract_text_graph.cc (revision 3777) +++ scribo/src/extract_text_graph.cc (working copy) @@ -67,7 +67,7 @@ text, g, literal::red, literal::cyan, scribo::make::debug_filename("left_linked.ppm")); -// io::ppm::save(mln::debug::colorize(value::rgb8(), +// io::ppm::save(mln::labeling::colorize(value::rgb8(), // text.label_image(), // text.nbboxes()), // scribo::make::debug_filename("lbl_before.ppm")); @@ -80,7 +80,7 @@ scribo::debug::save_textbboxes_image(input, grouped_text.bboxes(), literal::red, scribo::make::debug_filename("grouped_text.ppm")); - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("label_color.ppm")); Index: scribo/src/morpho.cc --- scribo/src/morpho.cc (revision 3777) +++ scribo/src/morpho.cc (working copy) @@ -28,7 +28,7 @@ mln_VAR(res, transform::distance_and_influence_zone_geodesic(lbl, c8(), mln_max(unsigned))); io::pgm::save(level::transform(res.first(), fun::l2l::wrap<label_8>()), "dmap.pgm"); - io::ppm::save(debug::colorize(rgb8(), res.second(), nlabels), "iz.ppm"); + io::ppm::save(labeling::colorize(rgb8(), res.second(), nlabels), "iz.ppm"); image2d<unsigned>& dmap = res.first(); { Index: scribo/src/table_rebuild_rank.cc --- scribo/src/table_rebuild_rank.cc (revision 3777) +++ scribo/src/table_rebuild_rank.cc (working copy) @@ -73,7 +73,7 @@ std::cout << "ncells (including background) = " << ncells << std::endl; - image2d<value::rgb8> table_color = mln::debug::colorize(value::rgb8(), tables, ncells); + image2d<value::rgb8> table_color = mln::labeling::colorize(value::rgb8(), tables, ncells); value::label_8 bg = level::compute(accu::maj_h<value::label_8>(), tables); Index: scribo/src/extract_text_several_left_links.cc --- scribo/src/extract_text_several_left_links.cc (revision 3777) +++ scribo/src/extract_text_several_left_links.cc (working copy) @@ -75,7 +75,7 @@ = text::grouping::group_from_single_link(text, left_link); std::cout << "AFTER - nbboxes = " << grouped_text.bboxes().nelements() << std::endl; - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("left_label_color.ppm")); Index: scribo/src/table_rebuild_opening.cc --- scribo/src/table_rebuild_opening.cc (revision 3777) +++ scribo/src/table_rebuild_opening.cc (working copy) @@ -71,7 +71,7 @@ std::cout << "ncells (including background) = " << ncells << std::endl; - io::ppm::save(mln::debug::colorize(value::rgb8(), tables, ncells), + io::ppm::save(mln::labeling::colorize(value::rgb8(), tables, ncells), scribo::make::debug_filename("table_cells.ppm")); io::pgm::save(tables, scribo::make::debug_filename("table_cells.pgm")); Index: scribo/src/extract_text_several_graph.cc --- scribo/src/extract_text_several_graph.cc (revision 3777) +++ scribo/src/extract_text_several_graph.cc (working copy) @@ -76,7 +76,7 @@ scribo::debug::save_textbboxes_image(input, grouped_text.bboxes(), literal::red, scribo::make::debug_filename("grouped_text.ppm")); - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("label_color.ppm")); Index: scribo/src/dmap.cc --- scribo/src/dmap.cc (revision 3777) +++ scribo/src/dmap.cc (working copy) @@ -21,6 +21,6 @@ mln_VAR(res, transform::distance_and_influence_zone_geodesic(lbl, c8(), mln_max(unsigned))); io::pgm::save(level::transform(res.first(), fun::l2l::wrap<label_8>()), "dmap.pgm"); - io::ppm::save(debug::colorize(value::rgb8(), res.second(), nlabels), "iz.ppm"); + io::ppm::save(labeling::colorize(value::rgb8(), res.second(), nlabels), "iz.ppm"); } Index: scribo/src/table_extract.cc --- scribo/src/table_extract.cc (revision 3777) +++ scribo/src/table_extract.cc (working copy) @@ -60,7 +60,7 @@ image2d<value::label_16> tables = scribo::table::extract(input, ncells).first(); std::cout << "ncells (including background) = " << ncells << std::endl; - io::ppm::save(mln::debug::colorize(value::rgb8(), tables, ncells), + io::ppm::save(mln::labeling::colorize(value::rgb8(), tables, ncells), scribo::make::debug_filename("table_cells.ppm")); io::dump::save(tables, scribo::make::debug_filename("table_cells.dump")); Index: scribo/src/extract_text_double_link.cc --- scribo/src/extract_text_double_link.cc (revision 3777) +++ scribo/src/extract_text_double_link.cc (working copy) @@ -28,7 +28,7 @@ #include <iostream> #include <mln/essential/2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> #include <scribo/text/extract_bboxes.hh> @@ -89,7 +89,7 @@ literal::green, scribo::make::debug_filename("links.ppm")); -// io::ppm::save(mln::debug::colorize(value::rgb8(), +// io::ppm::save(mln::labeling::colorize(value::rgb8(), // text.label_image(), // text.nbboxes()), // scribo::make::debug_filename("lbl_before.ppm")); @@ -98,7 +98,7 @@ scribo::util::text<image2d<value::label_16> > grouped_text = text::grouping::group_from_double_link(text, left_link, right_link); - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("label_color.ppm")); Index: scribo/src/extract_text_double_several_links.cc --- scribo/src/extract_text_double_several_links.cc (revision 3777) +++ scribo/src/extract_text_double_several_links.cc (working copy) @@ -28,7 +28,7 @@ #include <iostream> #include <mln/essential/2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/util/timer.hh> #include <scribo/text/extract_bboxes.hh> @@ -110,7 +110,7 @@ std::cout << "Full process: " << t2 << std::endl; std::cout << "Cleanup and grouping process: " << t3 << std::endl; - io::ppm::save(mln::debug::colorize(value::rgb8(), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_text.label_image(), grouped_text.nbboxes()), scribo::make::debug_filename("label_color.ppm")); Index: scribo/src/photo_basic.cc --- scribo/src/photo_basic.cc (revision 3777) +++ scribo/src/photo_basic.cc (working copy) @@ -28,7 +28,7 @@ #include <iostream> #include <mln/essential/2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <scribo/text/extract_bboxes.hh> #include <scribo/text/grouping/group_with_single_left_link.hh> @@ -101,7 +101,7 @@ literal::red, scribo::make::debug_filename("test_graph_grouped_text.ppm")); - io::ppm::save(mln::debug::colorize(value::rgb8(), grouped_textbboxes.label_image(), grouped_textbboxes.nbboxes()), + io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_textbboxes.label_image(), grouped_textbboxes.nbboxes()), scribo::make::debug_filename("grouped_text_comps.ppm")); } Index: scribo/table/internal/repair_lines.hh --- scribo/table/internal/repair_lines.hh (revision 3777) +++ scribo/table/internal/repair_lines.hh (working copy) @@ -45,7 +45,7 @@ # include <mln/win/line.hh> # include <mln/pw/all.hh> -# include <mln/debug/colorize.hh> +# include <mln/labeling/colorize.hh> # include <mln/value/rgb8.hh> # include <mln/value/label_16.hh> # include <scribo/make/debug_filename.hh> Index: scribo/demat.hh --- scribo/demat.hh (revision 3777) +++ scribo/demat.hh (working copy) @@ -182,7 +182,7 @@ void save_lbl_image(const image2d<V>& lbl, unsigned nlabels, const char *filename) { - image2d<rgb8> output = debug::colorize(rgb8(), lbl, nlabels); + image2d<rgb8> output = labeling::colorize(rgb8(), lbl, nlabels); io::ppm::save(output, output_file(filename)); } @@ -1375,7 +1375,7 @@ std::cout << "map text to cells" << std::endl; label_16 nlabels; image2d<label_16> tblelbl = labeling::background(table, c8(), nlabels); - image2d<rgb8> color = debug::colorize(rgb8(), tblelbl, nlabels); + image2d<rgb8> color = labeling::colorize(rgb8(), tblelbl, nlabels); # ifndef NOUT io::ppm::save(color, output_file("cells-labels.ppm")); @@ -1395,7 +1395,7 @@ { std::cout << "Merging aligned text boxes" << std::endl; - io::ppm::save(debug::colorize(rgb8(), lbl, nlabels), + io::ppm::save(labeling::colorize(rgb8(), lbl, nlabels), output_file("tboxes-lbl.ppm")); typedef util::couple<image2d<unsigned>, image2d<label_16> > cpl_t; @@ -1406,7 +1406,7 @@ #ifndef NOUT io::pgm::save(level::transform(diz.first(), fun::l2l::wrap<label_8>()), output_file("tboxes-dmap.pgm")); - io::ppm::save(debug::colorize(rgb8(), diz.second(), nlabels), + io::ppm::save(labeling::colorize(rgb8(), diz.second(), nlabels), output_file("tboxes-iz.ppm")); #endif Index: icdar/2009/dibco/quasi.cc --- icdar/2009/dibco/quasi.cc (revision 3777) +++ icdar/2009/dibco/quasi.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pbm/save.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/fun/i2v/array.hh> #include <mln/labeling/regional_minima.hh> Index: icdar/2009/dibco/svg.1.binarization.cc --- icdar/2009/dibco/svg.1.binarization.cc (revision 3777) +++ icdar/2009/dibco/svg.1.binarization.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/make/rag_and_labeled_wsl.hh> #include <mln/util/graph.hh> #include <mln/util/couple.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/fun/i2v/array.hh> #include <mln/labeling/compute.hh> @@ -335,7 +335,7 @@ label_16 nbasins; image2d<label_16> wst = morpho::watershed::flooding(clo_vol, c4(), nbasins); -// io::ppm::save(debug::colorize(rgb8(), wst, nbasins), "binarization_wst.ppm"); +// io::ppm::save(labeling::colorize(rgb8(), wst, nbasins), "binarization_wst.ppm"); util::couple<util::graph, image2d<label_16> > Index: icdar/2009/dibco/svg.2.binarization.cc --- icdar/2009/dibco/svg.2.binarization.cc (revision 3777) +++ icdar/2009/dibco/svg.2.binarization.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/make/rag_and_labeled_wsl.hh> #include <mln/util/graph.hh> #include <mln/util/couple.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/fun/i2v/array.hh> #include <mln/labeling/compute.hh> @@ -554,7 +554,7 @@ if (echo) { - io::ppm::save(display_edge(debug::colorize(rgb8(), + io::ppm::save(display_edge(labeling::colorize(rgb8(), wst, nbasins).unmorph_(), literal::black, @@ -580,7 +580,7 @@ if (echo) { - io::ppm::save(debug::colorize(rgb8(), ws, nbasins), + io::ppm::save(labeling::colorize(rgb8(), ws, nbasins), "temp_ws.ppm"); } @@ -607,7 +607,7 @@ if (echo) - io::ppm::save(debug::colorize(rgb8(), w_all, nbasins), + io::ppm::save(labeling::colorize(rgb8(), w_all, nbasins), "temp_w_all.ppm"); Index: icdar/2009/dibco/svg.3.binarization.cc --- icdar/2009/dibco/svg.3.binarization.cc (revision 3777) +++ icdar/2009/dibco/svg.3.binarization.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/make/rag_and_labeled_wsl.hh> #include <mln/util/graph.hh> #include <mln/util/couple.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/fun/i2v/array.hh> #include <mln/labeling/compute.hh> @@ -657,7 +657,7 @@ if (echo) { - io::ppm::save(display_edge(debug::colorize(rgb8(), + io::ppm::save(display_edge(labeling::colorize(rgb8(), wst, nbasins).unmorph_(), literal::black, @@ -683,7 +683,7 @@ if (echo) { - io::ppm::save(debug::colorize(rgb8(), ws, nbasins), + io::ppm::save(labeling::colorize(rgb8(), ws, nbasins), "temp_ws.ppm"); } @@ -710,7 +710,7 @@ if (echo) - io::ppm::save(debug::colorize(rgb8(), w_all, nbasins), + io::ppm::save(labeling::colorize(rgb8(), w_all, nbasins), "temp_w_all.ppm"); Index: icdar/2009/dibco/binarization.cc --- icdar/2009/dibco/binarization.cc (revision 3777) +++ icdar/2009/dibco/binarization.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/make/rag_and_labeled_wsl.hh> #include <mln/util/graph.hh> #include <mln/util/couple.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/fun/i2v/array.hh> #include <mln/labeling/compute.hh> @@ -636,7 +636,7 @@ if (echo) { - io::ppm::save(display_edge(debug::colorize(rgb8(), + io::ppm::save(display_edge(labeling::colorize(rgb8(), wst, nbasins).unmorph_(), literal::black, @@ -662,7 +662,7 @@ if (echo) { - io::ppm::save(debug::colorize(rgb8(), ws, nbasins), + io::ppm::save(labeling::colorize(rgb8(), ws, nbasins), "temp_ws.ppm"); } @@ -689,7 +689,7 @@ if (echo) - io::ppm::save(debug::colorize(rgb8(), w_all, nbasins), + io::ppm::save(labeling::colorize(rgb8(), w_all, nbasins), "temp_w_all.ppm"); Index: icdar/2009/hsc/icdar2ppm.hh --- icdar/2009/hsc/icdar2ppm.hh (revision 3777) +++ icdar/2009/hsc/icdar2ppm.hh (working copy) @@ -6,7 +6,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/compute.hh> # include <mln/accu/count_labels.hh> -# include <mln/debug/colorize.hh> +# include <mln/labeling/colorize.hh> # include <mln/io/ppm/save.hh> # include <mln/io/pbm/load.hh> @@ -27,7 +27,7 @@ value::label_8 nlines = level::compute(accu::meta::count_labels(), ima); - io::ppm::save(debug::colorize(value::rgb8(), ima, nlines), ppmfile); + io::ppm::save(labeling::colorize(value::rgb8(), ima, nlines), ppmfile); } } Index: icdar/2009/hsc/input_to_words_dat.cc --- icdar/2009/hsc/input_to_words_dat.cc (revision 3777) +++ icdar/2009/hsc/input_to_words_dat.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/estim/min_max.hh> #include <sandbox/icdar/2009/hsc/input_to_lines.hh> @@ -101,7 +101,7 @@ if (argc == 4) { - io::ppm::save(debug::colorize(value::rgb8(), + io::ppm::save(labeling::colorize(value::rgb8(), output, n_words), argv[3]); Index: icdar/2009/hsc/dummy_input_to_words_dat.cc --- icdar/2009/hsc/dummy_input_to_words_dat.cc (revision 3777) +++ icdar/2009/hsc/dummy_input_to_words_dat.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <sandbox/icdar/2009/hsc/clean_input.hh> #include <sandbox/icdar/2009/hsc/line_to_words.hh> @@ -49,7 +49,7 @@ if (argc == 4) { - io::ppm::save(debug::colorize(value::rgb8(), + io::ppm::save(labeling::colorize(value::rgb8(), output, n_words), argv[3]); Index: icdar/2009/hsc/input_to_lines_dat.cc --- icdar/2009/hsc/input_to_lines_dat.cc (revision 3777) +++ icdar/2009/hsc/input_to_lines_dat.cc (working copy) @@ -2,7 +2,7 @@ #include <sandbox/icdar/2009/hsc/io/icdar/save.hh> #include <mln/value/rgb8.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> @@ -43,7 +43,7 @@ if (argc == 4) { - io::ppm::save(debug::colorize(value::rgb8(), + io::ppm::save(labeling::colorize(value::rgb8(), output, n_lines), argv[3]); Index: icdar/2009/hsc/input_to_ws.hh --- icdar/2009/hsc/input_to_ws.hh (revision 3777) +++ icdar/2009/hsc/input_to_ws.hh (working copy) @@ -16,7 +16,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> #include <mln/literal/colors.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/level/convert.hh> #include <mln/labeling/wrap.hh> #include <mln/pw/all.hh> @@ -92,7 +92,7 @@ } { // Watershed basins colorize the small image. - image2d<value::rgb8> cool = debug::colorize(value::rgb8(), ws, n_lines); + image2d<value::rgb8> cool = labeling::colorize(value::rgb8(), ws, n_lines); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::white); mln_piter(box2d) p(small.domain()); Index: icdar/2009/hsc/first_attempts/boxes.cc --- icdar/2009/hsc/first_attempts/boxes.cc (revision 3777) +++ icdar/2009/hsc/first_attempts/boxes.cc (working copy) @@ -28,7 +28,7 @@ #include <iostream> #include <mln/essential/2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> #include <scribo/text/extract_bboxes.hh> Index: icdar/2009/hsc/first_attempts/exec/iz_lines.cc --- icdar/2009/hsc/first_attempts/exec/iz_lines.cc (revision 3777) +++ icdar/2009/hsc/first_attempts/exec/iz_lines.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/data/paste.hh> #include <mln/pw/all.hh> -// #include <mln/debug/colorize.hh> +// #include <mln/labeling/colorize.hh> #include <mln/transform/influence_zone_geodesic.hh> @@ -99,7 +99,7 @@ io::pgm::save(out, argv[3]); -// io::ppm::save(debug::colorize(value::rgb8(), out, 254), +// io::ppm::save(labeling::colorize(value::rgb8(), out, 254), // argv[3]); trace::exiting("main"); Index: icdar/2009/hsc/first_attempts/exec/relabel_lines.cc --- icdar/2009/hsc/first_attempts/exec/relabel_lines.cc (revision 3777) +++ icdar/2009/hsc/first_attempts/exec/relabel_lines.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/accu/maj_h.hh> #include <mln/morpho/elementary/dilation.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/transform/influence_zone_geodesic.hh> #include <mln/level/transform.hh> @@ -289,7 +289,7 @@ image2d<L> out = doit_cut(ws_txt, ws_spc); - io::ppm::save(debug::colorize(value::rgb8(), out, 254), + io::ppm::save(labeling::colorize(value::rgb8(), out, 254), argv[3]); trace::exiting("main"); Index: icdar/2009/hsc/first_attempts/main.cc --- icdar/2009/hsc/first_attempts/main.cc (revision 3777) +++ icdar/2009/hsc/first_attempts/main.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> #include <mln/literal/colors.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> @@ -345,7 +345,7 @@ # ifdef LOG { - io::ppm::save(debug::colorize(rgb8(), spc, n_basins), + io::ppm::save(labeling::colorize(rgb8(), spc, n_basins), "tmp_spc.ppm"); io::pgm::save(ws, "tmp_ws.pgm"); @@ -363,7 +363,7 @@ image2d<int_u8> output(input.domain()); image2d<rgb8> - cool = debug::colorize(rgb8(), spc, n_basins), + cool = labeling::colorize(rgb8(), spc, n_basins), lab(input.domain()); mln_piter_(box2d) p(input.domain()); Index: icdar/2009/hsc/input_to_wsl.cc --- icdar/2009/hsc/input_to_wsl.cc (revision 3777) +++ icdar/2009/hsc/input_to_wsl.cc (working copy) @@ -5,7 +5,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> @@ -57,7 +57,7 @@ if (argc == 4) { - io::ppm::save(debug::colorize(value::rgb8(), + io::ppm::save(labeling::colorize(value::rgb8(), wsl, n_lines), argv[3]); Index: icdar/2009/hsc/old_input_to_lines.cc --- icdar/2009/hsc/old_input_to_lines.cc (revision 3777) +++ icdar/2009/hsc/old_input_to_lines.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> #include <mln/literal/colors.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> @@ -348,7 +348,7 @@ # ifdef LOG { - io::ppm::save(debug::colorize(rgb8(), spc, n_basins), + io::ppm::save(labeling::colorize(rgb8(), spc, n_basins), "tmp_spc.ppm"); io::pgm::save(ws, "tmp_ws.pgm"); Index: icdar/2009/hsc/ws_to_wsl.hh --- icdar/2009/hsc/ws_to_wsl.hh (revision 3777) +++ icdar/2009/hsc/ws_to_wsl.hh (working copy) @@ -37,7 +37,7 @@ #include <mln/fun/i2v/array.hh> #include <mln/level/transform.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> @@ -407,7 +407,7 @@ f_relab(l) = parent[l]; image2d<L> ws_ = level::transform(ws, f_relab); - image2d<rgb8> cool = debug::colorize(rgb8(), ws_, n_basins); + image2d<rgb8> cool = labeling::colorize(rgb8(), ws_, n_basins); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::white); mln_piter(box2d) p(small.domain()); Index: fabien/igr/seg_fixed.cc --- fabien/igr/seg_fixed.cc (revision 3777) +++ fabien/igr/seg_fixed.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/world/inter_pixel/neighb2d.hh> #include <mln/world/inter_pixel/is_pixel.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> @@ -284,7 +284,7 @@ mln_VAR(w, wst.unmorph_()); data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); - io::ppm::save(debug::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); Index: fabien/igr/graph.cc --- fabien/igr/graph.cc (revision 3777) +++ fabien/igr/graph.cc (working copy) @@ -55,7 +55,7 @@ #include <mln/extract/all.hh> #include <mln/make/region_adjacency_graph.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> @@ -324,8 +324,8 @@ mln_VAR(mean, level::stretch(int_u8(), labeling::mean_values(dcm, wsd2, nbasins2))); io::pgm::save(original, "wsd_original.pgm"); io::pgm::save(mean, "wsd_mean_colors.pgm"); - io::ppm::save(debug::colorize(rgb8(), wshed, nbasins), "wsd_colorize_01.ppm"); - io::ppm::save(debug::colorize(rgb8(), wsd2, nbasins2), "wsd_colorize_02.ppm"); + io::ppm::save(labeling::colorize(rgb8(), wshed, nbasins), "wsd_colorize_01.ppm"); + io::ppm::save(labeling::colorize(rgb8(), wsd2, nbasins2), "wsd_colorize_02.ppm"); } else { Index: fabien/igr/nbasins_finder.cc --- fabien/igr/nbasins_finder.cc (revision 3777) +++ fabien/igr/nbasins_finder.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/fun/l2l/wrap.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> @@ -74,7 +74,7 @@ std::cout << " nbasins = " << nbasins << std::endl; //io::dump::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "result_nbasins.dump"); //io::dump::save(level::stretch(int_u8(), wshed), "result_nbasins.dump"); - io::dump::save(debug::colorize(rgb8(), wshed, nbasins), "result_nbasins.dump"); + io::dump::save(labeling::colorize(rgb8(), wshed, nbasins), "result_nbasins.dump"); return 0; } Index: fabien/bin/dumpl32_to_colorize.cc --- fabien/bin/dumpl32_to_colorize.cc (revision 3777) +++ fabien/bin/dumpl32_to_colorize.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image/image2d.hh> #include <mln/make/image3d.hh> #include <mln/debug/slices_2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u12.hh> @@ -44,14 +44,14 @@ { image2d<label_32> ima2d; io::dump::load(ima2d, argv[1]); - image2d<rgb8> ima_rgb = debug::colorize(rgb8(), ima2d, nbasins); + image2d<rgb8> ima_rgb = labeling::colorize(rgb8(), ima2d, nbasins); io::ppm::save(ima_rgb, argv[4]); } else { image3d<label_32> ima3d; io::dump::load(ima3d, argv[1]); - image3d<rgb8> ima_rgb = debug::colorize(rgb8(), ima3d, nbasins); + image3d<rgb8> ima_rgb = labeling::colorize(rgb8(), ima3d, nbasins); image2d<rgb8> ima_result = debug::slices_2d(ima_rgb, 1.f, literal::black); io::ppm::save(ima_result, argv[4]); Index: inim/2010/boxes/boxes.cc --- inim/2010/boxes/boxes.cc (revision 3777) +++ inim/2010/boxes/boxes.cc (working copy) @@ -28,7 +28,7 @@ #include <iostream> #include <mln/essential/2d.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> #include <scribo/text/extract_bboxes.hh> Index: theo/color/filter_blen_rgb_edges.cc --- theo/color/filter_blen_rgb_edges.cc (revision 3777) +++ theo/color/filter_blen_rgb_edges.cc (working copy) @@ -18,7 +18,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/morpho/dilation.hh> #include <mln/morpho/erosion.hh> @@ -333,7 +333,7 @@ w_all); - io::ppm::save(debug::colorize(rgb8(), + io::ppm::save(labeling::colorize(rgb8(), w_all, nbasins), "temp_w_all.ppm"); @@ -344,7 +344,7 @@ image2d<L> out_w = full2image(w_all); -// io::ppm::save(debug::colorize(rgb8(), +// io::ppm::save(labeling::colorize(rgb8(), // out_w, // nbasins), // argv[4]); Index: lazzara/igr/igr-biggest-comp.cc --- lazzara/igr/igr-biggest-comp.cc (revision 3777) +++ lazzara/igr/igr-biggest-comp.cc (working copy) @@ -5,7 +5,7 @@ #include <mln/labeling/flat_zones.hh> #include <mln/labeling/background.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include <mln/essential/3d.hh> Index: lazzara/igr/igr.cc --- lazzara/igr/igr.cc (revision 3777) +++ lazzara/igr/igr.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/binarization/binarization.hh> #include <mln/labeling/background.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> //#include <mln/registration/registration.hh> //#include <mln/registration/multiscale.hh> Index: lazzara/igr/igr-cloud.cc --- lazzara/igr/igr-cloud.cc (revision 3777) +++ lazzara/igr/igr-cloud.cc (working copy) @@ -20,7 +20,7 @@ # include <mln/io/ppm/save.hh> # include <mln/io/pbm/save.hh> -# include <mln/debug/colorize.hh> +# include <mln/labeling/colorize.hh> # include <mln/literal/black.hh> # include <mln/literal/white.hh> Index: edwin/inim/inim.cc --- edwin/inim/inim.cc (revision 3777) +++ edwin/inim/inim.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/level/stretch.hh> #include <mln/value/label_8.hh> #include <mln/labeling/blobs.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> /* Draw debug */ #include <mln/draw/box.hh> @@ -241,7 +241,7 @@ typedef mln_ch_value_(I, value::rgb<8>) O; value::label_8 nlabel; L label = labeling::blobs(mask, c4(), nlabel); - O output = debug::colorize(value::rgb8(), label, nlabel); + O output = labeling::colorize(value::rgb8(), label, nlabel); io::ppm::save(output, "label.pgm"); /* Now store output image image */