Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: olena-2.0-627-gcc0d930 Merge branch 'exp/newdoc' into exp/TL

by Guillaume Lazzara

This is a merge commit message of the following branches: Merge: b3b4d49 804f0d0 Conflicts: milena/ChangeLog ChangeLog | 20 + NEWS | 3 + configure.ac | 2 - doc/doc.bib | 30 ++- milena/ChangeLog | 271 ++++++++++++++ milena/apps/morphers/iz.cc | 4 +- .../apps/papers/levillain.09.ismm/classif-graph.cc | 4 +- milena/demos/inter_pixel/inter_pixel.cc | 2 +- milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 10 +- milena/doc/examples/graph-data.cc | 4 +- milena/doc/examples/split/graph-data-4.cc.raw | 2 +- milena/doc/examples/trash/graph.cc | 15 +- milena/doc/examples/trash/mk_graph.cc | 8 +- milena/doc/examples/trash/tuto_bis.cc | 4 +- milena/doc/img/function_hierarchy.png | Bin 0 -> 8738 bytes milena/doc/img/src/function_hierarchy.dia | Bin 0 -> 1807 bytes milena/doc/mln/convert.dox | 14 +- milena/doc/mln/fun/fun.dox | 41 ++ milena/doc/mln/io/io.dox | 81 +++- milena/doc/mln/main.dox | 8 +- milena/doc/mln/topo/topo.dox | 6 + milena/doc/split-examples.mk | 3 +- milena/headers.mk | 14 +- milena/mln/accu/label_used.hh | 10 +- milena/mln/accu/stat/var.hh | 2 +- milena/mln/algebra/vec.hh | 2 +- milena/mln/core/concept/function.hh | 2 +- milena/mln/core/image/edge_image.hh | 46 ++-- milena/mln/core/image/image1d.hh | 2 +- milena/mln/core/image/image2d.hh | 2 +- milena/mln/core/image/image3d.hh | 2 +- milena/mln/core/image/vertex_image.hh | 40 +- milena/mln/core/internal/image_base.hh | 9 +- milena/mln/core/internal/labeled_image_base.hh | 12 +- milena/mln/core/routine/init.hxx | 10 +- milena/mln/core/site_set/p_array.hh | 2 +- milena/mln/core/window.hh | 2 +- milena/mln/data/convert.hh | 33 ++- milena/mln/data/transform.spe.hh | 12 +- milena/mln/debug/superpose.hh | 6 +- milena/mln/fun/all.hh | 4 - milena/mln/fun/essential.hh | 2 +- milena/mln/fun/i2v/all.hh | 56 --- milena/mln/fun/i2v/all_to.hh | 105 ------ milena/mln/fun/i2v/array.hh | 378 ------------------- milena/mln/fun/i2v/essential.hh | 36 -- milena/mln/fun/i2v/value_at_index.hh | 88 ----- milena/mln/fun/n2v/white_gaussian.hh | 6 +- milena/mln/fun/stat/all.hh | 52 --- milena/mln/fun/stat/mahalanobis.hh | 108 ------ milena/mln/fun/v2b/always_false.hh | 7 +- milena/mln/fun/v2b/always_true.hh | 7 +- milena/mln/fun/v2b/lnot.hh | 10 +- milena/mln/fun/v2b/threshold_ge.hh | 14 +- milena/mln/fun/v2b/threshold_le.hh | 14 +- milena/mln/fun/v2i/all.hh | 55 --- milena/mln/fun/v2i/index_of_value.hh | 99 ----- milena/mln/fun/v2v/abs.hh | 11 +- milena/mln/fun/v2v/all_to.hh | 111 ++++++ milena/mln/fun/v2v/array.hh | 387 ++++++++++++++++++++ milena/mln/fun/v2v/cast.hh | 20 +- milena/mln/fun/v2v/ch_function_value.hh | 10 +- milena/mln/fun/v2v/component.hh | 11 +- milena/mln/fun/v2v/convert.hh | 6 +- milena/mln/fun/v2v/dec.hh | 9 +- milena/mln/fun/v2v/enc.hh | 13 +- milena/mln/fun/v2v/hsl_to_rgb.hh | 16 +- milena/mln/fun/v2v/id.hh | 8 +- milena/mln/fun/v2v/inc.hh | 11 +- milena/mln/fun/v2v/index_of_value.hh | 105 ++++++ milena/mln/fun/v2v/linear.hh | 26 +- milena/mln/fun/v2v/mahalanobis.hh | 114 ++++++ milena/mln/fun/v2v/norm.hh | 39 ++- milena/mln/fun/v2v/projection.hh | 16 +- milena/mln/fun/v2v/qt_rgb_to_int_u.hh | 5 +- milena/mln/fun/v2v/rgb8_to_rgbn.hh | 8 +- milena/mln/fun/v2v/rgb_to_hsl.hh | 9 +- milena/mln/fun/v2v/rgb_to_int_u.hh | 5 +- milena/mln/fun/v2v/rgb_to_luma.hh | 5 +- milena/mln/fun/v2v/round.hh | 7 +- milena/mln/fun/v2v/round_sat.hh | 4 +- milena/mln/fun/v2v/saturate.hh | 23 +- milena/mln/fun/v2v/value_at_index.hh | 95 +++++ milena/mln/fun/v2v/wrap.hh | 9 +- milena/mln/fun/v2w2v/all.hh | 8 +- milena/mln/fun/v2w2v/cos.hh | 12 +- milena/mln/fun/v2w_w2v/all.hh | 8 +- milena/mln/fun/v2w_w2v/norm.hh | 40 ++- milena/mln/fun/vv2b/all.hh | 8 +- milena/mln/fun/vv2b/eq.hh | 10 +- milena/mln/fun/vv2b/ge.hh | 11 +- milena/mln/fun/vv2b/gt.hh | 10 +- milena/mln/fun/vv2b/implies.hh | 10 +- milena/mln/fun/vv2b/le.hh | 11 +- milena/mln/fun/vv2b/lt.hh | 10 +- milena/mln/fun/vv2v/diff_abs.hh | 10 +- milena/mln/fun/vv2v/land.hh | 10 +- milena/mln/fun/vv2v/land_not.hh | 10 +- milena/mln/fun/vv2v/lor.hh | 10 +- milena/mln/fun/vv2v/lxor.hh | 10 +- milena/mln/fun/vv2v/max.hh | 10 +- milena/mln/fun/vv2v/min.hh | 10 +- milena/mln/fun/vv2v/vec.hh | 10 +- milena/mln/fun/x2x/translation.hh | 2 +- milena/mln/histo/point_from_value.hh | 17 +- milena/mln/labeling/colorize.hh | 4 +- milena/mln/labeling/mean_values.hh | 2 +- milena/mln/labeling/pack.hh | 16 +- milena/mln/labeling/relabel.hh | 4 +- milena/mln/linear/log.hh | 4 +- milena/mln/make/edge_image.hh | 4 +- milena/mln/make/p_edges_with_mass_centers.hh | 8 +- milena/mln/make/p_vertices_with_mass_centers.hh | 8 +- milena/mln/make/relabelfun.hh | 36 +- milena/mln/make/voronoi.hh | 8 +- milena/mln/metal/vec.hh | 2 +- milena/mln/morpho/line_gradient.hh | 8 +- milena/mln/morpho/watershed/superpose.hh | 5 +- milena/mln/topo/skeleton/crest.hh | 91 +++--- milena/mln/trait/ch_function_value.hh | 6 +- milena/mln/util/array.hh | 18 +- milena/mln/value/lut_vec.hh | 12 +- milena/mln/win/ball.hh | 2 +- milena/mln/world/binary_2d/subsample.hh | 2 +- milena/tests/algebra/h_mat.cc | 2 +- milena/tests/algebra/mat.cc | 2 +- milena/tests/algebra/vec2.cc | 2 +- milena/tests/core/image/edge_image.cc | 6 +- milena/tests/core/image/graph_image.cc | 6 +- milena/tests/core/image/imorph/labeled_image.cc | 2 +- milena/tests/core/image/line_graph_image.cc | 6 +- milena/tests/core/image/vertex_and_edge_image.cc | 8 +- milena/tests/core/image/vertex_image.cc | 6 +- milena/tests/core/other/graph_elt_neighborhood.cc | 4 +- milena/tests/core/other/graph_elt_window.cc | 4 +- milena/tests/core/other/point_set_compatibility.cc | 4 +- milena/tests/core/site_set/p_vertices.cc | 4 +- milena/tests/data/compute_in_window.cc | 7 +- milena/tests/data/convert.cc | 29 ++- milena/tests/draw/graph.cc | 4 +- milena/tests/fun/Makefile.am | 2 - milena/tests/fun/i2v/Makefile.am | 26 -- milena/tests/fun/i2v/all_to.cc | 38 -- milena/tests/fun/i2v/array.cc | 42 --- milena/tests/fun/i2v/value_at_index.cc | 51 --- milena/tests/fun/stat/Makefile.am | 23 -- milena/tests/fun/stat/mahalanobis.cc | 67 ---- milena/tests/fun/v2i/Makefile.am | 23 -- milena/tests/fun/v2i/index_of_value.cc | 50 --- milena/tests/fun/v2v/Makefile.am | 5 + milena/tests/fun/v2v/all_to.cc | 38 ++ milena/tests/fun/v2v/array.cc | 42 +++ milena/tests/fun/v2v/index_of_value.cc | 50 +++ milena/tests/fun/v2v/mahalanobis.cc | 67 ++++ milena/tests/fun/v2v/value_at_index.cc | 51 +++ milena/tests/fun/x2x/composed.cc | 2 +- milena/tests/fun/x2x/translation.cc | 2 +- milena/tests/graph/labeling.cc | 4 +- milena/tests/make/p_edges_with_mass_centers.cc | 2 +- milena/tests/make/p_vertices_with_mass_centers.cc | 2 +- .../morpho/artificial_line_graph_image_wst.cc | 2 +- milena/tests/morpho/closing/area_on_vertices.cc | 4 +- milena/tests/morpho/graph_image_morpho.cc | 6 +- milena/tests/morpho/graph_image_wst.cc | 6 +- milena/tests/morpho/lena_line_graph_image_wst1.cc | 6 +- milena/tests/morpho/lena_line_graph_image_wst2.cc | 2 +- milena/tests/morpho/line_graph_image_morpho.cc | 6 +- milena/tests/morpho/line_graph_image_wst.cc | 6 +- milena/tests/morpho/opening/area_on_vertices.cc | 4 +- milena/tests/pw/image.cc | 6 +- milena/tests/unit_test/unit-tests.mk | 14 +- milena/tools/area_flooding.cc | 4 +- scribo/ChangeLog | 84 +++++ scribo/doc/Doxyfile.in | 2 +- scribo/scribo/core/line_set.hh | 2 +- scribo/scribo/core/paragraph_set.hh | 6 +- scribo/scribo/debug/alignment_decision_image.hh | 2 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/scribo/debug/bboxes_image.hh | 8 +- scribo/scribo/debug/char_space_image.hh | 6 +- scribo/scribo/debug/decision_image.hh | 4 +- scribo/scribo/debug/line_info_image.hh | 2 +- scribo/scribo/debug/linked_bboxes_image.hh | 6 +- scribo/scribo/debug/links_decision_image.hh | 2 +- scribo/scribo/debug/links_image.hh | 2 +- .../scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 6 +- scribo/scribo/debug/save_table_image.hh | 2 +- scribo/scribo/filter/object_groups_with_holes.hh | 6 +- scribo/scribo/filter/objects_with_holes.hh | 6 +- scribo/scribo/fun/v2b/label_to_bool.hh | 6 +- scribo/scribo/postprocessing/fill_object_holes.hh | 4 +- scribo/scribo/preprocessing/denoise_bg.hh | 8 +- scribo/scribo/preprocessing/denoise_fg.hh | 4 +- scribo/scribo/primitive/extract/alignments.hh | 4 +- scribo/scribo/primitive/extract/non_text_kmean.hh | 2 +- .../primitive/extract/separators_nonvisible.hh | 10 +- scribo/scribo/primitive/group/apply.hh | 6 +- scribo/scribo/primitive/group/from_graph.hh | 2 +- scribo/scribo/primitive/group/from_single_link.hh | 2 +- .../primitive/regroup/from_single_left_link.hh | 2 +- .../regroup/from_single_left_link_wrt_h_ratio.hh | 2 +- scribo/scribo/text/extract_paragraphs.hh | 6 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 4 +- .../internal/text_in_doc_preprocess_functor.hh | 4 +- .../toolchain/internal/text_in_picture_functor.hh | 13 +- scribo/src/debug/show_lines_boldness.cc | 6 +- .../show_links_left_right_links_validation.cc | 6 +- .../src/debug/show_links_several_right_overlap.cc | 4 +- scribo/src/debug/show_links_single_down.cc | 4 +- scribo/src/debug/show_links_single_left.cc | 4 +- .../src/debug/show_links_single_left_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_right.cc | 4 +- .../debug/show_links_single_right_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_up.cc | 4 +- scribo/src/debug/show_objects_large.cc | 6 +- scribo/src/debug/show_objects_small.cc | 6 +- scribo/src/debug/show_objects_thick.cc | 6 +- scribo/src/debug/show_objects_thin.cc | 6 +- scribo/src/debug/show_text_lines.cc | 5 +- scribo/src/debug/show_text_lines_wo_seps.cc | 5 +- scribo/src/filter/objects_large.cc | 6 +- scribo/src/filter/objects_small.cc | 6 +- scribo/src/filter/objects_thick.cc | 6 +- scribo/src/filter/objects_thin.cc | 6 +- scribo/src/filter/objects_with_holes.cc | 6 +- scribo/src/filter/objects_with_holes_pgm.cc | 6 +- scribo/src/non_text_components.cc | 2 +- scribo/src/preprocessing/preprocess.cc | 8 +- scribo/src/primitive/extract/alignments.cc | 5 +- .../src/primitive/extract/discontinued_hlines.cc | 6 +- scribo/src/primitive/extract/discontinued_lines.cc | 6 +- .../src/primitive/extract/discontinued_vlines.cc | 6 +- scribo/src/primitive/extract/thick_hlines.cc | 6 +- scribo/src/primitive/extract/thick_vlines.cc | 6 +- scribo/src/primitive/group/group_from_rag.cc | 7 +- scribo/src/table/rebuild_opening.cc | 5 +- scribo/src/table/rebuild_rank.cc | 7 +- scribo/src/text_in_picture.cc | 2 +- scribo/src/util/component_precise_outline.cc | 5 +- scribo/tests/primitive/extract/alignments.cc | 5 +- 242 files changed, 2527 insertions(+), 1980 deletions(-) diff --cc milena/ChangeLog index d36a848,375d2e4..d5bb9fd --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,40 -1,274 +1,311 @@@ +2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle 16 bits value types with io::magick. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Enable portions of code supporting 16bits + images if GraphicsMagick supports it. + +2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Relax conversion dispatch. + + * mln/convert/impl/from_value_to_value.hh: Disable dispatch and + rely on from_to(). + + * mln/value/rgb.hh: Add a from_to_() overload to handle conversion + from rgb<n> to rgb<m>. + +2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/io/magick/save.cc: Kill compilation warnings. + +2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add save options to magick::save. + + * mln/io/magick/save.hh: Add save_options structure. + +2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new routine to get image headers thanks to GraphicsMagick. + + * mln/io/magick/get_header.hh, + * mln/tests/io/magick/get_header.cc: New + + * mln/tests/io/magick/Makefile.am: New target. + + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/fun/Makefile.am: Remove duplicate subdir entry for v2v. + + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Swap arguments in data::convert. + + * mln/data/convert.hh: Here. + + * apps/morphers/iz.cc, + * demos/inter_pixel/inter_pixel.cc, + * doc/examples/trash/graph.cc, + * doc/mln/convert.dox, + * mln/debug/superpose.hh, + * mln/morpho/watershed/superpose.hh, + * mln/world/binary_2d/subsample.hh, + * tests/data/compute_in_window.cc, + * tests/data/convert.cc: Update calls to data::convert. + + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/io/io.dox: List the required dependencies for each I/O + type. + + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/internal/image_base.hh: Add more documentation for + destroy() method. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/topo/topo.dox: New. Introduce mathematical topology + module. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more "See also" statement in function documentation. + + * mln/fun/v2b/always_false.hh, + * mln/fun/v2b/always_true.hh, + * mln/fun/v2b/lnot.hh, + * mln/fun/v2b/threshold_ge.hh, + * mln/fun/v2b/threshold_le.hh, + * mln/fun/v2v/abs.hh, + * mln/fun/v2v/all_to.hh, + * mln/fun/v2v/array.hh, + * mln/fun/v2v/cast.hh, + * mln/fun/v2v/ch_function_value.hh, + * mln/fun/v2v/component.hh, + * mln/fun/v2v/convert.hh, + * mln/fun/v2v/dec.hh, + * mln/fun/v2v/enc.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/fun/v2v/id.hh, + * mln/fun/v2v/inc.hh, + * mln/fun/v2v/index_of_value.hh, + * mln/fun/v2v/linear.hh, + * mln/fun/v2v/mahalanobis.hh, + * mln/fun/v2v/norm.hh, + * mln/fun/v2v/projection.hh, + * mln/fun/v2v/qt_rgb_to_int_u.hh, + * mln/fun/v2v/rgb8_to_rgbn.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/fun/v2v/rgb_to_luma.hh, + * mln/fun/v2v/round.hh, + * mln/fun/v2v/round_sat.hh, + * mln/fun/v2v/saturate.hh, + * mln/fun/v2v/value_at_index.hh, + * mln/fun/v2v/wrap.hh, + * mln/fun/vv2b/eq.hh, + * mln/fun/vv2b/ge.hh, + * mln/fun/vv2b/gt.hh, + * mln/fun/vv2b/implies.hh, + * mln/fun/vv2b/le.hh, + * mln/fun/vv2b/lt.hh, + * mln/fun/vv2v/diff_abs.hh, + * mln/fun/vv2v/land.hh, + * mln/fun/vv2v/land_not.hh, + * mln/fun/vv2v/lor.hh, + * mln/fun/vv2v/lxor.hh, + * mln/fun/vv2v/max.hh, + * mln/fun/vv2v/min.hh, + * mln/fun/vv2v/vec.hh: Here. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/make/relabelfun.hh: Fix bad variable replacement. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/split-examples.mk: Regen. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/concept/function.hh: Make Function_vv2b inherit from + Function_vv2v. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add function module in Milena documentation. + + * doc/mln/fun/fun.dox: Add new documentation groups. + + * doc/mln/main.dox: Include a figure of the function hierarchy. + + * mln/fun/n2v/white_gaussian.hh, + * mln/fun/v2v/abs.hh, + * mln/fun/v2v/cast.hh, + * mln/fun/v2v/ch_function_value.hh, + * mln/fun/v2v/component.hh, + * mln/fun/v2v/convert.hh, + * mln/fun/v2v/dec.hh, + * mln/fun/v2v/enc.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/fun/v2v/id.hh, + * mln/fun/v2v/inc.hh, + * mln/fun/v2v/linear.hh, + * mln/fun/v2v/norm.hh, + * mln/fun/v2v/projection.hh, + * mln/fun/v2v/qt_rgb_to_int_u.hh, + * mln/fun/v2v/rgb8_to_rgbn.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/fun/v2v/rgb_to_luma.hh, + * mln/fun/v2v/round.hh, + * mln/fun/v2v/round_sat.hh, + * mln/fun/v2v/saturate.hh, + * mln/fun/v2v/wrap.hh, + * mln/fun/v2w2v/all.hh, + * mln/fun/v2w2v/cos.hh, + * mln/fun/v2w_w2v/all.hh, + * mln/fun/v2w_w2v/norm.hh, + * mln/fun/vv2b/all.hh, + * mln/fun/vv2b/eq.hh, + * mln/fun/vv2b/ge.hh, + * mln/fun/vv2b/gt.hh, + * mln/fun/vv2b/implies.hh, + * mln/fun/vv2b/le.hh, + * mln/fun/vv2b/lt.hh: Move to their respective function group. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/convert.dox: Fix a typo. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Do not regenerate non-generated images. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new figure in Milena documentation. + + * doc/img/function_hierarchy.png, + * doc/img/src/function_hierarchy.dia: New. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Move fun::i2v, fun::stat and fun::v2i in fun::v2v. + + * mln/fun/i2v/all_to.hh, + * mln/fun/i2v/array.hh, + * mln/fun/i2v/value_at_index.hh, + * mln/fun/stat/mahalanobis.hh, + * mln/fun/v2i/index_of_value.hh, + * tests/fun/i2v/all_to.cc, + * tests/fun/i2v/array.cc, + * tests/fun/i2v/value_at_index.cc, + * tests/fun/stat/mahalanobis.cc, + * tests/fun/v2i/index_of_value.cc: Move... + + * mln/fun/v2v/all_to.hh, + * mln/fun/v2v/array.hh, + * mln/fun/v2v/index_of_value.hh, + * mln/fun/v2v/mahalanobis.hh, + * mln/fun/v2v/value_at_index.hh, + * tests/fun/v2v/all_to.cc, + * tests/fun/v2v/array.cc, + * tests/fun/v2v/index_of_value.cc, + * tests/fun/v2v/mahalanobis.cc, + * tests/fun/v2v/value_at_index.cc, + * tests/fun/x2x/composed.cc, + * tests/fun/x2x/translation.cc: ... here. + + * mln/fun/stat/all.hh, + * mln/fun/i2v/essential.hh, + * mln/fun/i2v/all.hh, + * mln/fun/v2i/all.hh, + * tests/fun/i2v/Makefile.am, + * tests/fun/stat/Makefile.am, + * tests/fun/v2i/Makefile.am: Remove. + + * tests/fun/Makefile.am: Remove deprecated subdirs. + + * tests/fun/v2v/Makefile.am: Add new targets. + + * apps/papers/levillain.09.ismm/classif-graph.cc, + * doc/examples/graph-data.cc, + * doc/examples/split/graph-data-4.cc.raw, + * doc/examples/trash/graph.cc, + * doc/examples/trash/mk_graph.cc, + * doc/examples/trash/tuto_bis.cc, + * headers.mk, + * mln/accu/label_used.hh, + * mln/accu/stat/var.hh, + * mln/algebra/vec.hh, + * mln/core/image/edge_image.hh, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/image/vertex_image.hh, + * mln/core/internal/labeled_image_base.hh, + * mln/core/routine/init.hxx, + * mln/core/site_set/p_array.hh, + * mln/core/window.hh, + * mln/data/transform.spe.hh, + * mln/fun/all.hh, + * mln/fun/essential.hh, + * mln/fun/x2x/translation.hh, + * mln/histo/point_from_value.hh, + * mln/labeling/colorize.hh, + * mln/labeling/mean_values.hh, + * mln/labeling/pack.hh, + * mln/labeling/relabel.hh, + * mln/make/edge_image.hh, + * mln/make/p_edges_with_mass_centers.hh, + * mln/make/p_vertices_with_mass_centers.hh, + * mln/make/relabelfun.hh, + * mln/make/voronoi.hh, + * mln/metal/vec.hh, + * mln/morpho/line_gradient.hh, + * mln/trait/ch_function_value.hh, + * mln/util/array.hh, + * mln/value/lut_vec.hh, + * mln/win/ball.hh, + * tests/algebra/h_mat.cc, + * tests/algebra/mat.cc, + * tests/algebra/vec2.cc, + * tests/core/image/edge_image.cc, + * tests/core/image/graph_image.cc, + * tests/core/image/imorph/labeled_image.cc, + * tests/core/image/line_graph_image.cc, + * tests/core/image/vertex_and_edge_image.cc, + * tests/core/image/vertex_image.cc, + * tests/core/other/graph_elt_neighborhood.cc, + * tests/core/other/graph_elt_window.cc, + * tests/core/other/point_set_compatibility.cc, + * tests/core/site_set/p_vertices.cc, + * tests/draw/graph.cc, + * tests/graph/labeling.cc, + * tests/make/p_edges_with_mass_centers.cc, + * tests/make/p_vertices_with_mass_centers.cc, + * tests/morpho/artificial_line_graph_image_wst.cc, + * tests/morpho/closing/area_on_vertices.cc, + * tests/morpho/graph_image_morpho.cc, + * tests/morpho/graph_image_wst.cc, + * tests/morpho/lena_line_graph_image_wst1.cc, + * tests/morpho/lena_line_graph_image_wst2.cc, + * tests/morpho/line_graph_image_morpho.cc, + * tests/morpho/line_graph_image_wst.cc, + * tests/morpho/opening/area_on_vertices.cc, + * tests/pw/image.cc, + * tests/unit_test/unit-tests.mk, + * tools/area_flooding.cc: Rename fun::i2v, fun::stat and fun::v2i + namespaces to v2v. + 2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/concept/function.hh: Document function interface for hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: branch exp/newdoc updated: olena-2.0-583-g804f0d0

by git＠lrde.epita.fr

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 exp/newdoc has been updated via 804f0d0496af97354e4d48c9d758f9f7f3f26622 (commit) via b4af135d41910e14ea6af728f0459e74054b5e98 (commit) via 80685203c9a97579cd020858558d265beeaebba2 (commit) via ca15e4749296c9aaa192faa266276d61dbb3e1c3 (commit) via 3e418dc659cb7c9822f087850f5f6162f56478e2 (commit) from 82992465d511fd52f532c291fbe39eabe042ca2b (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 ----------------------------------------------------------------- 804f0d0 tests/fun/Makefile.am: Remove duplicate subdir entry for v2v. b4af135 NEWS: Notify changes in data::convert prototype. 8068520 Swap arguments of data::convert in Scribo. ca15e47 Swap arguments in data::convert. 3e418dc doc/mln/io/io.dox: List the required dependencies for each I/O type. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + NEWS | 3 + milena/ChangeLog | 25 ++++++ milena/apps/morphers/iz.cc | 4 +- milena/demos/inter_pixel/inter_pixel.cc | 2 +- milena/doc/examples/trash/graph.cc | 9 +- milena/doc/mln/convert.dox | 12 ++-- milena/doc/mln/io/io.dox | 81 +++++++++++++++----- milena/mln/data/convert.hh | 33 ++++++-- milena/mln/debug/superpose.hh | 6 +- milena/mln/morpho/watershed/superpose.hh | 5 +- milena/mln/world/binary_2d/subsample.hh | 2 +- milena/tests/data/compute_in_window.cc | 7 +- milena/tests/data/convert.cc | 29 ++++++- milena/tests/fun/Makefile.am | 1 - scribo/ChangeLog | 57 ++++++++++++++ scribo/scribo/debug/alignment_decision_image.hh | 2 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/scribo/debug/bboxes_image.hh | 8 +- scribo/scribo/debug/char_space_image.hh | 6 +- scribo/scribo/debug/decision_image.hh | 4 +- scribo/scribo/debug/line_info_image.hh | 2 +- scribo/scribo/debug/linked_bboxes_image.hh | 6 +- scribo/scribo/debug/links_decision_image.hh | 2 +- scribo/scribo/debug/links_image.hh | 2 +- .../scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 6 +- scribo/scribo/debug/save_table_image.hh | 2 +- scribo/scribo/primitive/extract/alignments.hh | 4 +- .../primitive/extract/separators_nonvisible.hh | 10 +- scribo/scribo/text/extract_paragraphs.hh | 6 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 4 +- .../internal/text_in_doc_preprocess_functor.hh | 4 +- .../toolchain/internal/text_in_picture_functor.hh | 13 ++-- scribo/src/debug/show_lines_boldness.cc | 6 +- .../show_links_left_right_links_validation.cc | 6 +- .../src/debug/show_links_several_right_overlap.cc | 4 +- scribo/src/debug/show_links_single_down.cc | 4 +- scribo/src/debug/show_links_single_left.cc | 4 +- .../src/debug/show_links_single_left_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_right.cc | 4 +- .../debug/show_links_single_right_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_up.cc | 4 +- scribo/src/debug/show_objects_large.cc | 6 +- scribo/src/debug/show_objects_small.cc | 6 +- scribo/src/debug/show_objects_thick.cc | 6 +- scribo/src/debug/show_objects_thin.cc | 6 +- scribo/src/debug/show_text_lines.cc | 5 +- scribo/src/debug/show_text_lines_wo_seps.cc | 5 +- scribo/src/filter/objects_large.cc | 6 +- scribo/src/filter/objects_small.cc | 6 +- scribo/src/filter/objects_thick.cc | 6 +- scribo/src/filter/objects_thin.cc | 6 +- scribo/src/filter/objects_with_holes.cc | 6 +- scribo/src/filter/objects_with_holes_pgm.cc | 6 +- scribo/src/non_text_components.cc | 2 +- scribo/src/preprocessing/preprocess.cc | 8 +- scribo/src/primitive/extract/alignments.cc | 5 +- .../src/primitive/extract/discontinued_hlines.cc | 6 +- scribo/src/primitive/extract/discontinued_lines.cc | 6 +- .../src/primitive/extract/discontinued_vlines.cc | 6 +- scribo/src/primitive/extract/thick_hlines.cc | 6 +- scribo/src/primitive/extract/thick_vlines.cc | 6 +- scribo/src/primitive/group/group_from_rag.cc | 7 +- scribo/src/table/rebuild_opening.cc | 5 +- scribo/src/table/rebuild_rank.cc | 7 +- scribo/src/util/component_precise_outline.cc | 5 +- scribo/tests/primitive/extract/alignments.cc | 5 +- 68 files changed, 364 insertions(+), 185 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: olena-2.0-583-g804f0d0 tests/fun/Makefile.am: Remove duplicate subdir entry for v2v.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/tests/fun/Makefile.am | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 951de6f..375d2e4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/fun/Makefile.am: Remove duplicate subdir entry for v2v. + +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Swap arguments in data::convert. * mln/data/convert.hh: Here. diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index fab2efb..4854e06 100644 --- a/milena/tests/fun/Makefile.am +++ b/milena/tests/fun/Makefile.am @@ -18,7 +18,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ - v2v \ p2b \ p2p \ p2v \ -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-582-gb4af135 NEWS: Notify changes in data::convert prototype.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ NEWS | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15e019f..cfd20e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Notify changes in data::convert prototype. + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> Cite papers in documentation. diff --git a/NEWS b/NEWS index 26ce3c0..2120259 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,9 @@ * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Make prototype of data::convert() more consistent with the + rest of the library. + * Scribo * New logger class. -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-581-g8068520 Swap arguments of data::convert in Scribo.

by Guillaume Lazzara

* scribo/debug/alignment_decision_image.hh, * scribo/debug/bboxes_enlarged_image.hh, * scribo/debug/bboxes_image.hh, * scribo/debug/char_space_image.hh, * scribo/debug/decision_image.hh, * scribo/debug/line_info_image.hh, * scribo/debug/linked_bboxes_image.hh, * scribo/debug/links_decision_image.hh, * scribo/debug/links_image.hh, * scribo/debug/looks_like_a_text_line_image.hh, * scribo/debug/mean_and_base_lines_image.hh, * scribo/debug/save_table_image.hh, * scribo/primitive/extract/alignments.hh, * scribo/primitive/extract/separators_nonvisible.hh, * scribo/text/extract_paragraphs.hh, * scribo/text/extract_paragraphs_hdoc.hh, * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, * scribo/toolchain/internal/text_in_picture_functor.hh, * src/debug/show_lines_boldness.cc, * src/debug/show_links_left_right_links_validation.cc, * src/debug/show_links_several_right_overlap.cc, * src/debug/show_links_single_down.cc, * src/debug/show_links_single_left.cc, * src/debug/show_links_single_left_dmax_ratio.cc, * src/debug/show_links_single_right.cc, * src/debug/show_links_single_right_dmax_ratio.cc, * src/debug/show_links_single_up.cc, * src/debug/show_objects_large.cc, * src/debug/show_objects_small.cc, * src/debug/show_objects_thick.cc, * src/debug/show_objects_thin.cc, * src/debug/show_text_lines.cc, * src/debug/show_text_lines_wo_seps.cc, * src/filter/objects_large.cc, * src/filter/objects_small.cc, * src/filter/objects_thick.cc, * src/filter/objects_thin.cc, * src/filter/objects_with_holes.cc, * src/filter/objects_with_holes_pgm.cc, * src/non_text_components.cc, * src/preprocessing/preprocess.cc, * src/primitive/extract/alignments.cc, * src/primitive/extract/discontinued_hlines.cc, * src/primitive/extract/discontinued_lines.cc, * src/primitive/extract/discontinued_vlines.cc, * src/primitive/extract/thick_hlines.cc, * src/primitive/extract/thick_vlines.cc, * src/primitive/group/group_from_rag.cc, * src/table/rebuild_opening.cc, * src/table/rebuild_rank.cc, * src/util/component_precise_outline.cc, * tests/primitive/extract/alignments.cc: Here. --- scribo/ChangeLog | 57 ++++++++++++++++++++ scribo/scribo/debug/alignment_decision_image.hh | 2 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/scribo/debug/bboxes_image.hh | 8 ++-- scribo/scribo/debug/char_space_image.hh | 6 +- scribo/scribo/debug/decision_image.hh | 4 +- scribo/scribo/debug/line_info_image.hh | 2 +- scribo/scribo/debug/linked_bboxes_image.hh | 6 +- scribo/scribo/debug/links_decision_image.hh | 2 +- scribo/scribo/debug/links_image.hh | 2 +- .../scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 6 +- scribo/scribo/debug/save_table_image.hh | 2 +- scribo/scribo/primitive/extract/alignments.hh | 4 +- .../primitive/extract/separators_nonvisible.hh | 10 ++-- scribo/scribo/text/extract_paragraphs.hh | 6 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 4 +- .../internal/text_in_doc_preprocess_functor.hh | 4 +- .../toolchain/internal/text_in_picture_functor.hh | 13 +++-- scribo/src/debug/show_lines_boldness.cc | 6 +- .../show_links_left_right_links_validation.cc | 6 +- .../src/debug/show_links_several_right_overlap.cc | 4 +- scribo/src/debug/show_links_single_down.cc | 4 +- scribo/src/debug/show_links_single_left.cc | 4 +- .../src/debug/show_links_single_left_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_right.cc | 4 +- .../debug/show_links_single_right_dmax_ratio.cc | 4 +- scribo/src/debug/show_links_single_up.cc | 4 +- scribo/src/debug/show_objects_large.cc | 6 +- scribo/src/debug/show_objects_small.cc | 6 +- scribo/src/debug/show_objects_thick.cc | 6 +- scribo/src/debug/show_objects_thin.cc | 6 +- scribo/src/debug/show_text_lines.cc | 5 +- scribo/src/debug/show_text_lines_wo_seps.cc | 5 +- scribo/src/filter/objects_large.cc | 6 +- scribo/src/filter/objects_small.cc | 6 +- scribo/src/filter/objects_thick.cc | 6 +- scribo/src/filter/objects_thin.cc | 6 +- scribo/src/filter/objects_with_holes.cc | 6 +- scribo/src/filter/objects_with_holes_pgm.cc | 6 +- scribo/src/non_text_components.cc | 2 +- scribo/src/preprocessing/preprocess.cc | 8 ++-- scribo/src/primitive/extract/alignments.cc | 5 +- .../src/primitive/extract/discontinued_hlines.cc | 6 +- scribo/src/primitive/extract/discontinued_lines.cc | 6 +- .../src/primitive/extract/discontinued_vlines.cc | 6 +- scribo/src/primitive/extract/thick_hlines.cc | 6 +- scribo/src/primitive/extract/thick_vlines.cc | 6 +- scribo/src/primitive/group/group_from_rag.cc | 7 ++- scribo/src/table/rebuild_opening.cc | 5 +- scribo/src/table/rebuild_rank.cc | 7 ++- scribo/src/util/component_precise_outline.cc | 5 +- scribo/tests/primitive/extract/alignments.cc | 5 +- 53 files changed, 196 insertions(+), 130 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 86b7802..0cf0bda 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,60 @@ +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Swap arguments of data::convert in Scribo. + + * scribo/debug/alignment_decision_image.hh, + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/bboxes_image.hh, + * scribo/debug/char_space_image.hh, + * scribo/debug/decision_image.hh, + * scribo/debug/line_info_image.hh, + * scribo/debug/linked_bboxes_image.hh, + * scribo/debug/links_decision_image.hh, + * scribo/debug/links_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_table_image.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/text/extract_paragraphs.hh, + * scribo/text/extract_paragraphs_hdoc.hh, + * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, + * scribo/toolchain/internal/text_in_picture_functor.hh, + * src/debug/show_lines_boldness.cc, + * src/debug/show_links_left_right_links_validation.cc, + * src/debug/show_links_several_right_overlap.cc, + * src/debug/show_links_single_down.cc, + * src/debug/show_links_single_left.cc, + * src/debug/show_links_single_left_dmax_ratio.cc, + * src/debug/show_links_single_right.cc, + * src/debug/show_links_single_right_dmax_ratio.cc, + * src/debug/show_links_single_up.cc, + * src/debug/show_objects_large.cc, + * src/debug/show_objects_small.cc, + * src/debug/show_objects_thick.cc, + * src/debug/show_objects_thin.cc, + * src/debug/show_text_lines.cc, + * src/debug/show_text_lines_wo_seps.cc, + * src/filter/objects_large.cc, + * src/filter/objects_small.cc, + * src/filter/objects_thick.cc, + * src/filter/objects_thin.cc, + * src/filter/objects_with_holes.cc, + * src/filter/objects_with_holes_pgm.cc, + * src/non_text_components.cc, + * src/preprocessing/preprocess.cc, + * src/primitive/extract/alignments.cc, + * src/primitive/extract/discontinued_hlines.cc, + * src/primitive/extract/discontinued_lines.cc, + * src/primitive/extract/discontinued_vlines.cc, + * src/primitive/extract/thick_hlines.cc, + * src/primitive/extract/thick_vlines.cc, + * src/primitive/group/group_from_rag.cc, + * src/table/rebuild_opening.cc, + * src/table/rebuild_rank.cc, + * src/util/component_precise_outline.cc, + * tests/primitive/extract/alignments.cc: Here. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Doxyfile.in: Disable QHP generation. diff --git a/scribo/scribo/debug/alignment_decision_image.hh b/scribo/scribo/debug/alignment_decision_image.hh index 00ad931..aae37bb 100644 --- a/scribo/scribo/debug/alignment_decision_image.hh +++ b/scribo/scribo/debug/alignment_decision_image.hh @@ -95,7 +95,7 @@ namespace scribo /// FIXME: Check that components has been computed from input. mln_ch_value(I,value::rgb8) - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); for_all_comps(i, components) mln::draw::box(decision_image, components(i).bbox(), literal::blue); diff --git a/scribo/scribo/debug/bboxes_enlarged_image.hh b/scribo/scribo/debug/bboxes_enlarged_image.hh index 65f77fb..89d6f3c 100644 --- a/scribo/scribo/debug/bboxes_enlarged_image.hh +++ b/scribo/scribo/debug/bboxes_enlarged_image.hh @@ -106,7 +106,7 @@ namespace scribo mln_trace("scribo::debug::bboxes_enlarged_image"); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); for_all_lines(l, lines) if (! lines(l).is_hidden()) diff --git a/scribo/scribo/debug/bboxes_image.hh b/scribo/scribo/debug/bboxes_image.hh index d18f471..a80e705 100644 --- a/scribo/scribo/debug/bboxes_image.hh +++ b/scribo/scribo/debug/bboxes_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -105,7 +105,7 @@ namespace scribo mln_trace("scribo::debug::bboxes_image"); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) tmp = data::convert(input, value::rgb8()); draw::bounding_boxes(tmp, bboxes, value); return tmp; @@ -123,7 +123,7 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) - output = data::convert(value::rgb8(), input); + output = data::convert(input, value::rgb8()); for_all_lines(l, lines) if (! lines(l).is_hidden()) @@ -154,7 +154,7 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) - output = data::convert(value::rgb8(), input); + output = data::convert(input, value::rgb8()); for_all_comps(c, comps) if (comps(c).is_valid()) diff --git a/scribo/scribo/debug/char_space_image.hh b/scribo/scribo/debug/char_space_image.hh index b08942c..24db867 100644 --- a/scribo/scribo/debug/char_space_image.hh +++ b/scribo/scribo/debug/char_space_image.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -73,7 +73,7 @@ namespace scribo { mln_trace("scribo::debug::char_space_image"); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); const component_set<L>& comps = line.components(); for_all_lines(l, line) diff --git a/scribo/scribo/debug/decision_image.hh b/scribo/scribo/debug/decision_image.hh index c2310a3..497a7d7 100644 --- a/scribo/scribo/debug/decision_image.hh +++ b/scribo/scribo/debug/decision_image.hh @@ -118,7 +118,7 @@ namespace scribo /// FIXME: Check that components has been computed from input. mln_ch_value(I,value::rgb8) - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); for (unsigned i = 1; i < groups.size(); ++i) if (groups(i) != filtered_groups(i)) @@ -150,7 +150,7 @@ namespace scribo /// FIXME: Check that components has been computed from input. mln_ch_value(I,value::rgb8) - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); for_all_comps(i, comps) mln::draw::box(decision_image, comps(i).bbox(), literal::blue); diff --git a/scribo/scribo/debug/line_info_image.hh b/scribo/scribo/debug/line_info_image.hh index fb54cc8..9cd311f 100644 --- a/scribo/scribo/debug/line_info_image.hh +++ b/scribo/scribo/debug/line_info_image.hh @@ -71,7 +71,7 @@ namespace scribo { mln_trace("scribo::debug::line_info_image"); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); for_all_lines(l, line) { diff --git a/scribo/scribo/debug/linked_bboxes_image.hh b/scribo/scribo/debug/linked_bboxes_image.hh index 8a28ae1..570a52e 100644 --- a/scribo/scribo/debug/linked_bboxes_image.hh +++ b/scribo/scribo/debug/linked_bboxes_image.hh @@ -167,7 +167,7 @@ namespace scribo mln_trace("scribo::debug::linked_bboxes_image"); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) tmp = data::convert(input, value::rgb8()); draw::bounding_boxes(tmp, links.components(), box_value); draw::bounding_box_links(tmp, links, link_value, anchor); @@ -225,7 +225,7 @@ namespace scribo mln_trace("scribo::debug::linked_bboxes_image"); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) tmp = data::convert(input, value::rgb8()); draw::bounding_boxes(tmp, left_link.components(), box_value); draw::bounding_box_links(tmp, @@ -252,7 +252,7 @@ namespace scribo mln_precondition(exact(g).is_valid()); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) tmp = data::convert(input, value::rgb8()); draw::bounding_boxes(tmp, exact(g).components(), box_value); draw::bounding_box_links(tmp, exact(g).components(), g, link_value, diff --git a/scribo/scribo/debug/links_decision_image.hh b/scribo/scribo/debug/links_decision_image.hh index b6528b2..e7b31d4 100644 --- a/scribo/scribo/debug/links_decision_image.hh +++ b/scribo/scribo/debug/links_decision_image.hh @@ -81,7 +81,7 @@ namespace scribo /// FIXME: Check that objects has been computed from input. mln_ch_value(I,value::rgb8) - links_decision_image = data::convert(value::rgb8(), input); + links_decision_image = data::convert(input, value::rgb8()); for_all_comps(i, comps) mln::draw::box(links_decision_image, comps(i).bbox(), literal::blue); diff --git a/scribo/scribo/debug/links_image.hh b/scribo/scribo/debug/links_image.hh index 30fb071..bb78602 100644 --- a/scribo/scribo/debug/links_image.hh +++ b/scribo/scribo/debug/links_image.hh @@ -82,7 +82,7 @@ namespace scribo const component_set<L>& comps = links.components(); mln_ch_value(I,value::rgb8) - links_image = data::convert(value::rgb8(), input); + links_image = data::convert(input, value::rgb8()); if (draw_bboxes) scribo::draw::bounding_boxes(links_image, comps, literal::blue); diff --git a/scribo/scribo/debug/looks_like_a_text_line_image.hh b/scribo/scribo/debug/looks_like_a_text_line_image.hh index de1aad1..457608f 100644 --- a/scribo/scribo/debug/looks_like_a_text_line_image.hh +++ b/scribo/scribo/debug/looks_like_a_text_line_image.hh @@ -100,7 +100,7 @@ namespace scribo mln_trace("scribo::debug::looks_like_a_text_line_image"); mln_precondition(exact(input).is_valid()); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); for_all_lines(l, lines) if (! lines(l).is_hidden()) diff --git a/scribo/scribo/debug/mean_and_base_lines_image.hh b/scribo/scribo/debug/mean_and_base_lines_image.hh index d84668e..8f997c5 100644 --- a/scribo/scribo/debug/mean_and_base_lines_image.hh +++ b/scribo/scribo/debug/mean_and_base_lines_image.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -104,7 +104,7 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) - output = data::convert(value::rgb8(), input); + output = data::convert(input, value::rgb8()); for_all_lines(l, lines) { diff --git a/scribo/scribo/debug/save_table_image.hh b/scribo/scribo/debug/save_table_image.hh index 420b7c7..2479b7a 100644 --- a/scribo/scribo/debug/save_table_image.hh +++ b/scribo/scribo/debug/save_table_image.hh @@ -97,7 +97,7 @@ namespace scribo const I& input = exact(input_); mln_precondition(input.is_valid()); - mln_ch_value(I, value::rgb8) out2 = data::convert(value::rgb8(), input); + mln_ch_value(I, value::rgb8) out2 = data::convert(input, value::rgb8()); draw::bounding_boxes(out2, tableboxes.first(), bbox_color); draw::bounding_boxes(out2, tableboxes.second(), bbox_color); io::ppm::save(out2, filename); diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 7bd9b94..fe2086c 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -255,7 +255,7 @@ namespace scribo bbox_ima_(bbox_ima), delta_ws_lookup_(delta_ws_lookup) { # ifndef SCRIBO_NDEBUG - debug_ = data::convert(value::rgb8(), data::convert(bool(), bbox_ima)); + debug_ = data::convert(data::convert(bbox_ima, bool()), value::rgb8()); # endif // ! SCRIBO_NDEBUG } @@ -357,7 +357,7 @@ namespace scribo bbox_ima_(bbox_ima), delta_ws_lookup_(delta_ws_lookup) { # ifndef SCRIBO_NDEBUG - debug_ = data::convert(value::rgb8(), data::convert(bool(), bbox_ima)); + debug_ = data::convert(data::convert(bbox_ima, bool()), value::rgb8()); # endif // ! SCRIBO_NDEBUG } diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 85fc191..9781cad 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -165,8 +165,8 @@ namespace scribo // Debug logger().log_image(AuxiliaryResults, - data::convert(value::int_u8(), - components.labeled_image()), + data::convert(components.labeled_image(), + value::int_u8()), "lbl"); unsigned dmax = 5; @@ -330,7 +330,7 @@ namespace scribo mln_concrete(I) input = scribo::preprocessing::rotate_90(in, false); mln_ch_value(I, value::rgb8) - wo_filtering = data::convert(value::rgb8(), input); + wo_filtering = data::convert(input, value::rgb8()); for_all_groups(d, top_groups) if (top_groups(d).is_valid()) @@ -461,7 +461,7 @@ namespace scribo // t_ = t; // std::cout << "* relabel_inplace - " << t_ << std::endl; - mln_concrete(I) output = data::convert(bool(), sep_lbl); + mln_concrete(I) output = data::convert(sep_lbl, bool()); if (_debug_) { diff --git a/scribo/scribo/text/extract_paragraphs.hh b/scribo/scribo/text/extract_paragraphs.hh index 5ea1b43..01a22f0 100644 --- a/scribo/scribo/text/extract_paragraphs.hh +++ b/scribo/scribo/text/extract_paragraphs.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -191,7 +191,7 @@ namespace scribo // const unsigned nlines = lines.nelements(); - // image2d<value::rgb8> links = data::convert(value::rgb8(), input); + // image2d<value::rgb8> links = data::convert(input, value::rgb8()); // for (unsigned l = 0; l < nlines; ++l) // { // mln::draw::line(links, lines(l).bbox().pcenter(), lines(left(l)).bbox().pcenter(), literal::red); @@ -646,7 +646,7 @@ namespace scribo // Only debug // { - // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); + // image2d<value::rgb8> debug = data::convert(input, value::rgb8()); // for (unsigned i = 0; i < output.nelements(); ++i) // output(i) = scribo::make::internal::find_root(output, i); diff --git a/scribo/scribo/text/extract_paragraphs_hdoc.hh b/scribo/scribo/text/extract_paragraphs_hdoc.hh index cc379cb..e51a231 100644 --- a/scribo/scribo/text/extract_paragraphs_hdoc.hh +++ b/scribo/scribo/text/extract_paragraphs_hdoc.hh @@ -192,7 +192,7 @@ namespace scribo // const unsigned nlines = lines.nelements(); - // image2d<value::rgb8> links = data::convert(value::rgb8(), input); + // image2d<value::rgb8> links = data::convert(input, value::rgb8()); // for (unsigned l = 0; l < nlines; ++l) // { // mln::draw::line(links, lines(l).bbox().pcenter(), lines(left(l)).bbox().pcenter(), literal::red); @@ -784,7 +784,7 @@ namespace scribo // Only debug // { - // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); + // image2d<value::rgb8> debug = data::convert(input, value::rgb8()); // mln::util::array<accu::shape::bbox<point2d> > nbbox(output.nelements()); // for_all_lines(l, lines) diff --git a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh index beac5c4..9ce4e78 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -278,7 +278,7 @@ namespace scribo else // binarization_algo == Convert { on_new_progress_label("Binarization (Binary conversion)"); - output = mln::data::convert(bool(), intensity_ima); + output = mln::data::convert(intensity_ima, bool()); } on_progress(); diff --git a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh index 8d12612..77b6581 100644 --- a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -427,7 +428,7 @@ namespace scribo raw_group_image = group::apply(groups); mln_ch_value(I,value::rgb8) - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(decision_image, filtered_components, literal::green); @@ -438,7 +439,7 @@ namespace scribo decision_image, "group_and_object_image.ppm"); - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(decision_image, raw_group_image, literal::blue); @@ -459,7 +460,7 @@ namespace scribo mln_ch_value(I,value::rgb8) decision_image; if (scribo::debug::logger().is_enabled()) { - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); scribo::draw::groups_bboxes(decision_image, groups, literal::red); scribo::draw::groups_bboxes(decision_image, filtered_small_groups, @@ -484,7 +485,7 @@ namespace scribo # ifndef SCRIBO_NDEBUG if (scribo::debug::logger().is_enabled()) { - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); scribo::draw::groups_bboxes(decision_image, filtered_small_groups, literal::red); @@ -521,7 +522,7 @@ namespace scribo # ifndef SCRIBO_NDEBUG if (scribo::debug::logger().is_enabled()) { - decision_image = data::convert(value::rgb8(), input); + decision_image = data::convert(input, value::rgb8()); scribo::draw::groups_bboxes(decision_image, filtered_thin_groups, literal::red); diff --git a/scribo/src/debug/show_lines_boldness.cc b/scribo/src/debug/show_lines_boldness.cc index 3e6a644..babcb61 100644 --- a/scribo/src/debug/show_lines_boldness.cc +++ b/scribo/src/debug/show_lines_boldness.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -79,7 +79,7 @@ int main(int argc, char* argv[]) // Extract lines line_set<L> lines = text::extract_lines_with_features( - data::convert(value::rgb8(), input), input, c8()); + data::convert(input, value::rgb8()), input, c8()); const component_set<L>& comp_set = lines.components(); // Min boldness / line diff --git a/scribo/src/debug/show_links_left_right_links_validation.cc b/scribo/src/debug/show_links_left_right_links_validation.cc index 450232a..7b9e0df 100644 --- a/scribo/src/debug/show_links_left_right_links_validation.cc +++ b/scribo/src/debug/show_links_left_right_links_validation.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) // Saving result. - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); scribo::draw::bounding_box_links(output, links, diff --git a/scribo/src/debug/show_links_several_right_overlap.cc b/scribo/src/debug/show_links_several_right_overlap.cc index 5559fec..7ecbd36 100644 --- a/scribo/src/debug/show_links_several_right_overlap.cc +++ b/scribo/src/debug/show_links_several_right_overlap.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -74,7 +74,7 @@ namespace scribo this->anchors_.append(anchor::Bottom); this->anchors_.append(anchor::Center); - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, comps, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_down.cc b/scribo/src/debug/show_links_single_down.cc index 8ea3d6a..a96cce6 100644 --- a/scribo/src/debug/show_links_single_down.cc +++ b/scribo/src/debug/show_links_single_down.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -69,7 +69,7 @@ namespace scribo unsigned dmax) : super_(comps, dmax, anchor::Vertical) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, comps, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_left.cc b/scribo/src/debug/show_links_single_left.cc index dfcb07b..bb63575 100644 --- a/scribo/src/debug/show_links_single_left.cc +++ b/scribo/src/debug/show_links_single_left.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -70,7 +70,7 @@ namespace scribo unsigned dmax) : super_(components, dmax, anchor::Horizontal) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, components, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_left_dmax_ratio.cc b/scribo/src/debug/show_links_single_left_dmax_ratio.cc index c1d6b01..7d9f304 100644 --- a/scribo/src/debug/show_links_single_left_dmax_ratio.cc +++ b/scribo/src/debug/show_links_single_left_dmax_ratio.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -74,7 +74,7 @@ namespace scribo float dmax_ratio) : super_(components, anchor::Horizontal, dmax_fun_t(dmax_ratio)) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, components, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_right.cc b/scribo/src/debug/show_links_single_right.cc index 9b37c44..6ad02da 100644 --- a/scribo/src/debug/show_links_single_right.cc +++ b/scribo/src/debug/show_links_single_right.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -70,7 +70,7 @@ namespace scribo unsigned dmax) : super_(components, dmax, anchor::Horizontal) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, components, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_right_dmax_ratio.cc b/scribo/src/debug/show_links_single_right_dmax_ratio.cc index 133fe82..e6fa8c8 100644 --- a/scribo/src/debug/show_links_single_right_dmax_ratio.cc +++ b/scribo/src/debug/show_links_single_right_dmax_ratio.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -72,7 +72,7 @@ namespace scribo float dmax_ratio) : super_(components, anchor::Horizontal, dmax_fun_t(dmax_ratio)) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, components, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_links_single_up.cc b/scribo/src/debug/show_links_single_up.cc index 1933af1..83e4d55 100644 --- a/scribo/src/debug/show_links_single_up.cc +++ b/scribo/src/debug/show_links_single_up.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -69,7 +69,7 @@ namespace scribo unsigned dmax) : super_(components, dmax, anchor::Vertical) { - output_ = data::convert(value::rgb8(), input); + output_ = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output_, components, literal::blue); mln_postcondition(output_.is_valid()); } diff --git a/scribo/src/debug/show_objects_large.cc b/scribo/src/debug/show_objects_large.cc index 3ccf5df..f10aef3 100644 --- a/scribo/src/debug/show_objects_large.cc +++ b/scribo/src/debug/show_objects_large.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output, comps, literal::red); component_set<L> filtered_comps diff --git a/scribo/src/debug/show_objects_small.cc b/scribo/src/debug/show_objects_small.cc index 1e9ae1f..da9f788 100644 --- a/scribo/src/debug/show_objects_small.cc +++ b/scribo/src/debug/show_objects_small.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output, comps, literal::red); component_set<L> filtered_comps diff --git a/scribo/src/debug/show_objects_thick.cc b/scribo/src/debug/show_objects_thick.cc index 1424708..8e27e0d 100644 --- a/scribo/src/debug/show_objects_thick.cc +++ b/scribo/src/debug/show_objects_thick.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output, comps, literal::red); component_set<L> filtered_comps diff --git a/scribo/src/debug/show_objects_thin.cc b/scribo/src/debug/show_objects_thin.cc index 9e02520..bc054cb 100644 --- a/scribo/src/debug/show_objects_thin.cc +++ b/scribo/src/debug/show_objects_thin.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(output, comps, literal::red); component_set<L> filtered_comps diff --git a/scribo/src/debug/show_text_lines.cc b/scribo/src/debug/show_text_lines.cc index d4e1cad..736138d 100644 --- a/scribo/src/debug/show_text_lines.cc +++ b/scribo/src/debug/show_text_lines.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -83,7 +84,7 @@ int main(int argc, char* argv[]) // Color image with line bboxes. { - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); for_all_lines(l, lines) if (lines(l).is_textline()) mln::draw::box(output, lines(l).bbox(), literal::red); diff --git a/scribo/src/debug/show_text_lines_wo_seps.cc b/scribo/src/debug/show_text_lines_wo_seps.cc index 0d8d488..a60b507 100644 --- a/scribo/src/debug/show_text_lines_wo_seps.cc +++ b/scribo/src/debug/show_text_lines_wo_seps.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -74,7 +75,7 @@ int main(int argc, char* argv[]) // Color image with line bboxes. { - image2d<value::rgb8> output = data::convert(value::rgb8(), input); + image2d<value::rgb8> output = data::convert(input, value::rgb8()); for_all_lines(l, lines) if (lines(l).is_textline()) mln::draw::box(output, lines(l).bbox(), literal::red); diff --git a/scribo/src/filter/objects_large.cc b/scribo/src/filter/objects_large.cc index af4c84da..9f8c2a4 100644 --- a/scribo/src/filter/objects_large.cc +++ b/scribo/src/filter/objects_large.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::components_large(comps, atoi(argv[2])); - io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); + io::pbm::save(data::convert(filtered.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/filter/objects_small.cc b/scribo/src/filter/objects_small.cc index e240256..8384675 100644 --- a/scribo/src/filter/objects_small.cc +++ b/scribo/src/filter/objects_small.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::components_small(comps, atoi(argv[2])); - io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); + io::pbm::save(data::convert(filtered.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/filter/objects_thick.cc b/scribo/src/filter/objects_thick.cc index 8f0080b..176d619 100644 --- a/scribo/src/filter/objects_thick.cc +++ b/scribo/src/filter/objects_thick.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::objects_thick(comps, atoi(argv[2])); - io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); + io::pbm::save(data::convert(filtered.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/filter/objects_thin.cc b/scribo/src/filter/objects_thin.cc index 0edfc85..fe2d4e3 100644 --- a/scribo/src/filter/objects_thin.cc +++ b/scribo/src/filter/objects_thin.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::components_thin(comps, atoi(argv[2])); - io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); + io::pbm::save(data::convert(filtered.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/filter/objects_with_holes.cc b/scribo/src/filter/objects_with_holes.cc index f339a5b..ae66162 100644 --- a/scribo/src/filter/objects_with_holes.cc +++ b/scribo/src/filter/objects_with_holes.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::objects_with_holes(comps, atoi(argv[2]), 0); - io::pbm::save(data::convert(bool(), filtered.valid_comps_image_()), argv[3]); + io::pbm::save(data::convert(filtered.valid_comps_image_(), bool()), argv[3]); } diff --git a/scribo/src/filter/objects_with_holes_pgm.cc b/scribo/src/filter/objects_with_holes_pgm.cc index 5cbb9d0..11817e6 100644 --- a/scribo/src/filter/objects_with_holes_pgm.cc +++ b/scribo/src/filter/objects_with_holes_pgm.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) component_set<L> filtered = scribo::filter::objects_with_holes(comps, atoi(argv[2]), 0); - io::pbm::save(data::convert(bool(), filtered.valid_comps_image_()), argv[3]); + io::pbm::save(data::convert(filtered.valid_comps_image_(), bool()), argv[3]); } diff --git a/scribo/src/non_text_components.cc b/scribo/src/non_text_components.cc index 16251e6..7cbfcf3 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/non_text_components.cc @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) t.stop(); std::cout << t << std::endl; - mln::io::pbm::save(data::convert(bool(), doc.elements().labeled_image()), argv[2]); + mln::io::pbm::save(data::convert(doc.elements().labeled_image(), bool()), argv[2]); scribo::io::img::save(doc, out_img + "_debug_wo_image.png", scribo::io::img::DebugWoImage); scribo::io::img::save(doc, out_img + "_debug_with_image.png", scribo::io::img::DebugWithImage); diff --git a/scribo/src/preprocessing/preprocess.cc b/scribo/src/preprocessing/preprocess.cc index 96e6613..f46a5ab 100644 --- a/scribo/src/preprocessing/preprocess.cc +++ b/scribo/src/preprocessing/preprocess.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -73,9 +73,9 @@ int main(int argc, char *argv[]) nlabels, 1); image2d<value::int_u8> - input_gl = data::convert(value::int_u8(), input_bw); + input_gl = data::convert(input_bw, value::int_u8()); input_gl = scribo::preprocessing::deskew(input_gl); - input_bw = data::convert(bool(), input_gl); + input_bw = data::convert(input_gl, bool()); io::pbm::save(input_bw, argv[2]); diff --git a/scribo/src/primitive/extract/alignments.cc b/scribo/src/primitive/extract/alignments.cc index 24e2259..19d2864 100644 --- a/scribo/src/primitive/extract/alignments.cc +++ b/scribo/src/primitive/extract/alignments.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -67,7 +68,7 @@ int main(int argc, char *argv[]) doc.open(); // Vertical and horizontal separators - image2d<bool> input = data::convert(bool(), doc.image()); + image2d<bool> input = data::convert(doc.image(), bool()); image2d<bool> separators = primitive::extract::separators(input, 81); input = primitive::remove::separators(input, separators); input = preprocessing::denoise_fg(input, c8(), 3); diff --git a/scribo/src/primitive/extract/discontinued_hlines.cc b/scribo/src/primitive/extract/discontinued_hlines.cc index ab8d0b0..deaaba7 100644 --- a/scribo/src/primitive/extract/discontinued_hlines.cc +++ b/scribo/src/primitive/extract/discontinued_hlines.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013s EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -67,6 +67,6 @@ int main(int argc, char *argv[]) nlines, atoi(argv[2]), atoi(argv[3])); - io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[4]); + io::pbm::save(data::convert(lines.labeled_image(), bool()), argv[4]); } diff --git a/scribo/src/primitive/extract/discontinued_lines.cc b/scribo/src/primitive/extract/discontinued_lines.cc index 9a14799..5438bc6 100644 --- a/scribo/src/primitive/extract/discontinued_lines.cc +++ b/scribo/src/primitive/extract/discontinued_lines.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) atoi(argv[3])); L& hlines_ima = hlines.labeled_image_(); - image2d<bool> output = data::convert(bool(), hlines_ima); + image2d<bool> output = data::convert(hlines_ima, bool()); data::fill((output | (pw::value(vlines.labeled_image()) != 0u)).rw(), true); io::pbm::save(output, argv[4]); diff --git a/scribo/src/primitive/extract/discontinued_vlines.cc b/scribo/src/primitive/extract/discontinued_vlines.cc index e911752..2c8b720 100644 --- a/scribo/src/primitive/extract/discontinued_vlines.cc +++ b/scribo/src/primitive/extract/discontinued_vlines.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,6 +68,6 @@ int main(int argc, char *argv[]) nlines, atoi(argv[2]), atoi(argv[3])); - io::pbm::save(data::convert(bool(), vlines.labeled_image()), argv[4]); + io::pbm::save(data::convert(vlines.labeled_image(), bool()), argv[4]); } diff --git a/scribo/src/primitive/extract/thick_hlines.cc b/scribo/src/primitive/extract/thick_hlines.cc index 439ae5a..dd695f6 100644 --- a/scribo/src/primitive/extract/thick_hlines.cc +++ b/scribo/src/primitive/extract/thick_hlines.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -66,6 +66,6 @@ int main(int argc, char *argv[]) c8(), nlines, atoi(argv[2])); - io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[3]); + io::pbm::save(data::convert(lines.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/primitive/extract/thick_vlines.cc b/scribo/src/primitive/extract/thick_vlines.cc index b58eff3..f310606 100644 --- a/scribo/src/primitive/extract/thick_vlines.cc +++ b/scribo/src/primitive/extract/thick_vlines.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -66,6 +66,6 @@ int main(int argc, char *argv[]) c8(), nlines, atoi(argv[2])); - io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[3]); + io::pbm::save(data::convert(lines.labeled_image(), bool()), argv[3]); } diff --git a/scribo/src/primitive/group/group_from_rag.cc b/scribo/src/primitive/group/group_from_rag.cc index 23827a9..fb7bd5b 100644 --- a/scribo/src/primitive/group/group_from_rag.cc +++ b/scribo/src/primitive/group/group_from_rag.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -199,7 +200,7 @@ int main(int argc, char* argv[]) //FOR DEBUGGING PURPOSE { image2d<value::rgb8> - before_grouping = data::convert(value::rgb8(), input); + before_grouping = data::convert(input, value::rgb8()); scribo::draw::bounding_boxes(before_grouping, filtered_objects.bboxes(), @@ -223,7 +224,7 @@ int main(int argc, char* argv[]) //FOR DEBUGGING PURPOSE // { // image2d<value::rgb8> -// after_grouping = data::convert(value::rgb8(), input); +// after_grouping = data::convert(input, value::rgb8()); // scribo::draw::bounding_boxes(after_grouping, diff --git a/scribo/src/table/rebuild_opening.cc b/scribo/src/table/rebuild_opening.cc index 60d43e0..567fc0a 100644 --- a/scribo/src/table/rebuild_opening.cc +++ b/scribo/src/table/rebuild_opening.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -87,7 +88,7 @@ int main(int argc, char* argv[]) scribo::make::debug_filename("table_cells.ppm")); io::pgm::save(tables, scribo::make::debug_filename("table_cells.pgm")); - image2d<value::rgb8> input_rgb = data::convert(value::rgb8(), input); + image2d<value::rgb8> input_rgb = data::convert(input, value::rgb8()); data::fill((input_rgb | (pw::value(tables) == pw::cst(0u))).rw(), literal::red); io::ppm::save(input_rgb, scribo::make::debug_filename("table_superposed.ppm")); diff --git a/scribo/src/table/rebuild_rank.cc b/scribo/src/table/rebuild_rank.cc index b04dac9..de97dd3 100644 --- a/scribo/src/table/rebuild_rank.cc +++ b/scribo/src/table/rebuild_rank.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -91,7 +92,7 @@ int main(int argc, char* argv[]) value::label_8 bg = data::compute(accu::maj_h<value::label_8>(), tables); - image2d<value::rgb8> sup = data::convert(value::rgb8(), input); + image2d<value::rgb8> sup = data::convert(input, value::rgb8()); data::paste((table_color | (pw::value(tables) != pw::cst(bg))) | (pw::value(sup) == pw::cst(literal::black)), sup); io::ppm::save(sup, scribo::make::debug_filename("table_color_sup.ppm")); @@ -100,7 +101,7 @@ int main(int argc, char* argv[]) scribo::make::debug_filename("table_cells.ppm")); io::pgm::save(tables, scribo::make::debug_filename("table_cells.pgm")); - image2d<value::rgb8> input_rgb = data::convert(value::rgb8(), input); + image2d<value::rgb8> input_rgb = data::convert(input, value::rgb8()); data::fill((input_rgb | (pw::value(tables) == pw::cst(0u))).rw(), literal::red); io::ppm::save(input_rgb, scribo::make::debug_filename("table_superposed.ppm")); diff --git a/scribo/src/util/component_precise_outline.cc b/scribo/src/util/component_precise_outline.cc index 13e6058..fbb35c4 100644 --- a/scribo/src/util/component_precise_outline.cc +++ b/scribo/src/util/component_precise_outline.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -75,7 +76,7 @@ int main(int argc, char *argv[]) `mln::unproxy_rec' here. */ std::cout << t.read() << std::endl; - image2d<value::rgb8> input_rgb = data::convert(value::rgb8(), input); + image2d<value::rgb8> input_rgb = data::convert(input, value::rgb8()); point2d last_point = par[0]; mln_piter_(par_t) p(par); diff --git a/scribo/tests/primitive/extract/alignments.cc b/scribo/tests/primitive/extract/alignments.cc index a069149..f767a8e 100644 --- a/scribo/tests/primitive/extract/alignments.cc +++ b/scribo/tests/primitive/extract/alignments.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -51,7 +52,7 @@ int main() document<L> doc(os.str().c_str()); doc.open(); - doc.set_binary_image(data::convert(bool(), doc.image())); + doc.set_binary_image(data::convert(doc.image(), bool())); // Extract lines line_set<L> -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-580-gca15e47 Swap arguments in data::convert.

by Guillaume Lazzara

* mln/data/convert.hh: Here. * apps/morphers/iz.cc, * demos/inter_pixel/inter_pixel.cc, * doc/examples/trash/graph.cc, * doc/mln/convert.dox, * mln/debug/superpose.hh, * mln/morpho/watershed/superpose.hh, * mln/world/binary_2d/subsample.hh, * tests/data/compute_in_window.cc, * tests/data/convert.cc: Update calls to data::convert. --- milena/ChangeLog | 16 ++++++++++++++ milena/apps/morphers/iz.cc | 4 +- milena/demos/inter_pixel/inter_pixel.cc | 2 +- milena/doc/examples/trash/graph.cc | 9 ++++--- milena/doc/mln/convert.dox | 12 +++++----- milena/mln/data/convert.hh | 33 +++++++++++++++++++++-------- milena/mln/debug/superpose.hh | 6 ++-- milena/mln/morpho/watershed/superpose.hh | 5 ++- milena/mln/world/binary_2d/subsample.hh | 2 +- milena/tests/data/compute_in_window.cc | 7 +++-- milena/tests/data/convert.cc | 29 +++++++++++++++++++++++-- 11 files changed, 91 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 796405c..951de6f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Swap arguments in data::convert. + + * mln/data/convert.hh: Here. + + * apps/morphers/iz.cc, + * demos/inter_pixel/inter_pixel.cc, + * doc/examples/trash/graph.cc, + * doc/mln/convert.dox, + * mln/debug/superpose.hh, + * mln/morpho/watershed/superpose.hh, + * mln/world/binary_2d/subsample.hh, + * tests/data/compute_in_window.cc, + * tests/data/convert.cc: Update calls to data::convert. + +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/io/io.dox: List the required dependencies for each I/O type. diff --git a/milena/apps/morphers/iz.cc b/milena/apps/morphers/iz.cc index 4216dc5..ae0d6d3 100644 --- a/milena/apps/morphers/iz.cc +++ b/milena/apps/morphers/iz.cc @@ -107,7 +107,7 @@ int main(int argc, char* argv[]) c4(), make::w_window2d(ww), mln_max(int_u8)); dmap = morpho::closing::area(dmap, c4(), 500); - + io::pgm::save(dmap, "tmp_dmap.pgm"); @@ -119,7 +119,7 @@ int main(int argc, char* argv[]) io::ppm::save(labeling::colorize(value::rgb8(), ws), "tmp_ws.ppm"); { - image2d<value::rgb8> ws_ = data::convert(value::rgb8(), input); + image2d<value::rgb8> ws_ = data::convert(input, value::rgb8()); data::fill((ws_ | (pw::value(ws) == pw::cst(0))).rw(), literal::red); io::ppm::save(ws_, "tmp_ws_superpose.ppm"); diff --git a/milena/demos/inter_pixel/inter_pixel.cc b/milena/demos/inter_pixel/inter_pixel.cc index 61ba33f..32012db 100644 --- a/milena/demos/inter_pixel/inter_pixel.cc +++ b/milena/demos/inter_pixel/inter_pixel.cc @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) io::pgm::save(world::inter_pixel::display_edge(edges.unmorph_(), 0, 3), "edge_dist.pgm"); // Color on edge image. - image2d<rgb8> edge_color = data::convert(rgb8(), edges.unmorph_()); + image2d<rgb8> edge_color = data::convert(edges.unmorph_(), rgb8()); mln_piter_(image2d<int_u8>) p(input.domain()); for_all(p) convert::from_to(input(p), opt::at(edge_color, p.row() * 2, p.col() * 2)); diff --git a/milena/doc/examples/trash/graph.cc b/milena/doc/examples/trash/graph.cc index 294a215..4271e6d 100644 --- a/milena/doc/examples/trash/graph.cc +++ b/milena/doc/examples/trash/graph.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -98,7 +99,7 @@ int main(int argc, char *argv[]) p_vertices<G, fv2p_t> pv(g, fv2p); #ifndef NOUT - image2d<rgb8> gima = data::convert(rgb8(), ima); + image2d<rgb8> gima = data::convert(ima, rgb8()); debug::draw_graph(gima, pv, pw::cst(literal::cyan), @@ -121,7 +122,7 @@ int main(int argc, char *argv[]) pvlg_t pvlg(lg, convert::to<i2e_t>(lines)); #ifndef NOUT - image2d<rgb8> lgima = data::convert(rgb8(), ima); + image2d<rgb8> lgima = data::convert(ima, rgb8()); debug::draw_graph(lgima, pvlg, pw::cst(literal::cyan), @@ -152,7 +153,7 @@ int main(int argc, char *argv[]) #ifndef NOUT - image2d<rgb8> lgima2 = data::convert(rgb8(), ima); + image2d<rgb8> lgima2 = data::convert(ima, rgb8()); debug::draw_graph(lgima2, pvlg, pw::cst(literal::cyan), ecolor); io::ppm::save(lgima2, "05-line-graph-cleanup.ppm"); #endif diff --git a/milena/doc/mln/convert.dox b/milena/doc/mln/convert.dox index a2f30a1..087c5f9 100644 --- a/milena/doc/mln/convert.dox +++ b/milena/doc/mln/convert.dox @@ -14,14 +14,14 @@ image2d<value::int_u8> ima_gl; // Initialization of ima_gl. // ... - image2d<value::rgb8> ima_color = mln::data::convert(value::rgb8(), ima_gl); + image2d<value::rgb8> ima_color = mln::data::convert(ima_gl, value::rgb8()); \endcode \code image2d<value::int_u8> ima_gl; // Initialization of ima_gl. // ... - image2d<bool> ima_b = mln::data::convert(bool(), ima_gl); + image2d<bool> ima_b = mln::data::convert(ima_gl, bool()); \endcode @@ -41,7 +41,7 @@ image2d<value::rgb8> ima_color; // Initialization of ima_color // ... - image2d<value::int_u8> ima_gl = data::convert(value::int_u8(), ima_color); + image2d<value::int_u8> ima_gl = data::convert(ima_color, value::int_u8()); } \endcode \code @@ -72,7 +72,7 @@ image2d<value::rgb8> ima_color; // Initialization of ima_color // ... - image2d<value::int_u8> ima_gl = data::convert(fun::v2v::rgb_to_luma<value::int_u8>(), ima_color); + image2d<value::int_u8> ima_gl = data::convert(ima_color, value::int_u8(), fun::v2v::rgb_to_luma<value::int_u8>()); } \endcode @@ -109,7 +109,7 @@ image2d<value::rgb8> ima_color; // Initialization of ima_color // ... - image2d<value::int_u8> ima_red_gl = data::convert(only_red_component(), ima_color); + image2d<value::int_u8> ima_red_gl = data::convert(ima_color, value::int_u8(), only_red_component()); } \endcode @@ -144,7 +144,7 @@ image2d<value::rgb8> ima_color; // Initialization of ima_color // ... - image2d<value::int_u8> ima_red_gl = data::convert(value::int_u8(), ima_color); + image2d<value::int_u8> ima_red_gl = data::convert(ima_color, value::int_u8()); } \endcode diff --git a/milena/mln/data/convert.hh b/milena/mln/data/convert.hh index 1f7fce3..e186423 100644 --- a/milena/mln/data/convert.hh +++ b/milena/mln/data/convert.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Copyright (C) 2008, 2009, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -36,6 +36,12 @@ # include <mln/core/routine/duplicate.hh> # include <mln/fun/v2v/convert.hh> # include <mln/data/transform.hh> +# include <mln/core/concept/function.hh> +# include <mln/core/concept/value.hh> + +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/fun/v2v/rgb_to_luma.hh> namespace mln @@ -44,6 +50,11 @@ namespace mln namespace data { + // template <typename V, typename I> + // mln_ch_value(I, V) + // convert(const V& v, const I& input); + + /*! \brief Convert the image \p input by changing the value type. \param[in] v A value of the destination type. Its type is used @@ -55,9 +66,9 @@ namespace mln \ingroup mlndata convert */ - template <typename V, typename I> + template <typename I, typename V> mln_ch_value(I, V) - convert(const V& v, const Image& input); + convert(const Image& input, const V& v); /*! \overload \brief Convert the image \p input by changing the value type. @@ -68,9 +79,11 @@ namespace mln \ingroup mlndata convert */ - template <typename F, typename I> + template <typename I, typename F> mln_ch_value(I, mln_result(F)) - convert(const Function_v2v<F>& convert_function, const Image& input); + convert(const Image& input, const mln_result(F)& v, + const Function_v2v<F>& convert_function); + # ifndef MLN_INCLUDE_ONLY @@ -165,10 +178,10 @@ namespace mln // Facade. - template <typename V, typename I> + template <typename I, typename V> inline mln_ch_value(I, V) - convert(const V& v, const Image& input) + convert(const Image& input, const V& v) { mln_trace("data::convert"); @@ -179,13 +192,15 @@ namespace mln return output; } - template <typename F, typename I> + template <typename I, typename F> mln_ch_value(I, mln_result(F)) - convert(const Function_v2v<F>& convert_function, const Image& input) + convert(const Image& input, const mln_result(F)& v, + const Function_v2v<F>& convert_function) { mln_trace("data::convert"); typedef mln_result(F) V; internal::convert_tests(V(), input); + (void) v; mln_ch_value(I, V) output = data::transform(input, convert_function); diff --git a/milena/mln/debug/superpose.hh b/milena/mln/debug/superpose.hh index 736e4a9..b71b6d8 100644 --- a/milena/mln/debug/superpose.hh +++ b/milena/mln/debug/superpose.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -98,7 +98,7 @@ namespace mln mln_precondition(object.is_valid()); mln_precondition(input.domain() == object.domain()); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); data::fill((output | (pw::value(object) != pw::cst(literal::zero))).rw(), object_color); diff --git a/milena/mln/morpho/watershed/superpose.hh b/milena/mln/morpho/watershed/superpose.hh index d1ceb09..8f589e0 100644 --- a/milena/mln/morpho/watershed/superpose.hh +++ b/milena/mln/morpho/watershed/superpose.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -93,7 +94,7 @@ namespace mln mln_precondition(input.is_valid()); mln_precondition(ws_ima.is_valid()); - mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(input, value::rgb8()); data::fill((output | (pw::value(ws_ima) == pw::cst(literal::zero))).rw(), wsl_color); diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index d8d1aa3..5e94016 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -75,7 +75,7 @@ namespace mln if (n == 0) { image2d<value::int_u8> - output = data::convert(int_u8(), input); + output = data::convert(input, int_u8()); return output; } diff --git a/milena/tests/data/compute_in_window.cc b/milena/tests/data/compute_in_window.cc index 8df7f7a..ac359be 100644 --- a/milena/tests/data/compute_in_window.cc +++ b/milena/tests/data/compute_in_window.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -51,7 +52,7 @@ int main() accu::stat::mean<int> m; image2d<float> res = data::impl::generic::compute_in_window(m, ima, win_c8p()); - image2d<int> res_i = data::convert(int(), res); + image2d<int> res_i = data::convert(res, int()); image2d<int> ref = make::image2d(data); @@ -69,7 +70,7 @@ int main() accu::stat::mean<int> m; image2d<float> res = data::compute_in_window(m, ima, win_c8p()); - image2d<int> res_i = data::convert(int(), res); + image2d<int> res_i = data::convert(res, int()); image2d<int> ref = make::image2d(data); diff --git a/milena/tests/data/convert.cc b/milena/tests/data/convert.cc index c0caeb5..6bcafba 100644 --- a/milena/tests/data/convert.cc +++ b/milena/tests/data/convert.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ int main() image2d<bool> ima(1, 2); opt::at(ima, 0, 0) = false; opt::at(ima, 0, 1) = true; - image2d<rgb8> out = data::convert(rgb8(), ima); + image2d<rgb8> out = data::convert(ima, rgb8()); mln_assertion(opt::at(out, 0, 0) == literal::black); mln_assertion(opt::at(out, 0, 1) == literal::white); } @@ -51,9 +52,31 @@ int main() image2d<bool> ima(1, 2); data::fill(ima, true); opt::at(ima, 0, 0) = false; - image2d<bool> out = data::convert(bool(), ima); + image2d<bool> out = data::convert(ima, bool()); mln_assertion(out == ima); mln_assertion(out.buffer() != ima.buffer()); } + // bool -> rgb8 + { + image2d<bool> ima(1, 2); + opt::at(ima, 0, 0) = false; + opt::at(ima, 0, 1) = true; + fun::v2v::convert<value::rgb8> f; + image2d<rgb8> out = data::convert(ima, rgb8(), f); + mln_assertion(opt::at(out, 0, 0) == literal::black); + mln_assertion(opt::at(out, 0, 1) == literal::white); + } + // bool -> bool + { + image2d<bool> ima(1, 2); + data::fill(ima, true); + opt::at(ima, 0, 0) = false; + fun::v2v::convert<bool> f; + image2d<bool> out = data::convert(ima, bool(), f); + mln_assertion(out == ima); + mln_assertion(out.buffer() != ima.buffer()); + } + + } -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-603-gb3b4d49 Merge branch 'exp/tmms' into exp/TL

by Jonathan Fabrizio

This is a merge commit message of the following branches: Merge: dbe0051 137ae1e milena/mln/binarization/tmms_hysteresis.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: branch exp/TL updated: olena-2.0-603-gb3b4d49

by git＠lrde.epita.fr

11 years, 8 months

olena: olena-2.0-496-g137ae1e mln/binarization/tmms_hysiteresis.hh: change call to labeling::all_blobs to labeling::blobs.

by Jonathan Fabrizio

--- milena/mln/binarization/tmms_hysteresis.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 58ec6fa..64b5dbf 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -134,7 +134,7 @@ namespace mln mln_ch_value(I, unsigned int) labels_high_images; //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::all_blobs(high_image, mln::c4(), nlabels); + labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); V *values = new V[nlabels]; for(unsigned int i=0;i<nlabels;i++) { @@ -232,7 +232,7 @@ namespace mln mln_ch_value(I, unsigned int) labels_high_images; //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::all_blobs(high_image, mln::c4(), nlabels); + labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); V *values = new V[nlabels]; for(unsigned int i=0;i<nlabels;i++) { -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-579-g3e418dc doc/mln/io/io.dox: List the required dependencies for each I/O type.

by Guillaume Lazzara

--- milena/ChangeLog | 5 +++ milena/doc/mln/io/io.dox | 81 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 364f90b..796405c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/io/io.dox: List the required dependencies for each I/O + type. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/internal/image_base.hh: Add more documentation for diff --git a/milena/doc/mln/io/io.dox b/milena/doc/mln/io/io.dox index 97c199e..720eac7 100644 --- a/milena/doc/mln/io/io.dox +++ b/milena/doc/mln/io/io.dox @@ -12,10 +12,15 @@ */ /*! \defgroup iodicom DICOM - * - * \brief DICOM I/O routines. - * - * \ingroup iogroup + + \brief DICOM I/O routines. + + These routines require the following packages: + + \li libgdcm2.0 + \li libgdcm2-dev + + \ingroup iogroup */ /*! \defgroup iodump Dump @@ -26,10 +31,15 @@ */ /*! \defgroup iofits FITS - * - * \brief FITS I/O routines. - * - * \ingroup iogroup + + \brief FITS I/O routines. + + These routines require the following packages: + + \li libcfitsio3 + \li libcfitsio3-dev + + \ingroup iogroup */ /*! \defgroup iofld FLD @@ -40,10 +50,29 @@ */ /*! \defgroup iomagick ImageMagick - * - * \brief ImageMagick I/O routines. - * - * \ingroup iogroup + + \brief ImageMagick I/O routines. + + These routines require ImageMagick or GraphicsMagick to be installed. + + GraphicsMagick requires the following packages: + + \li libgraphismagick++-3 + \li graphicsmagick + \li graphicsmagick-imagemagick-compat + \li libgraphicsmagick++3 + \li libgraphicsmagick3 + \li libgraphicsmagick++1-dev + \li libgraphicsmagick1-dev + \li graphicsmagick-libmagick-dev-compat + + ImageMagick requires the following packages: + + \li libmagick++5 + \li libmagick++-dev + \li imagemagick + + \ingroup iogroup */ /*! \defgroup iooff OFF @@ -96,10 +125,15 @@ */ /*! \defgroup iotiff TIFF - * - * \brief TIFF I/O routines. - * - * \ingroup iogroup + + \brief TIFF I/O routines. + + These routines require the following packages: + + \li libtiff5 + \li libtiff5-dev + + \ingroup iogroup */ /*! \defgroup iotxt TXT @@ -110,8 +144,15 @@ */ /*! \defgroup iopdf PDF - * - * \brief PDF I/O routines. - * - * \ingroup iogroup + + \brief PDF I/O routines. + + These routines require the following packages: + + \li libpoppler5 + \li libpoppler-dev + \li libpoppler-cpp-dev + \li libpoppler-qt-dev + + \ingroup iogroup */ -- 1.7.2.5

11 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches