- Olena-patches

olena: branch exp/TL updated: olena-2.0-632-g8b00304
by git＠lrde.epita.fr 30 Apr '13

30 Apr '13

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/TL has been updated via 8b003049116ad7ea9e544118feb81b82b576b029 (commit) via 493bf1043c722889528e9c85147681f7cd86e9ad (commit) via 1935bc36690804e3ee07a7c2344538c9d80287c8 (commit) via 51571df5ecf647d4f8d258bba3714ac78d9cf19d (commit) via 806244e44b676343c967c44ca3563492e0d817ad (commit) from cc0d9305c735008f7c3bde3ffcc170931452f0d6 (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 ----------------------------------------------------------------- 8b00304 Merge branch 'exp/fill_without_localization' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 9 + ...ocalization.hh => fill_without_localization.hh} | 173 ++++++++++---------- milena/tests/data/Makefile.am | 3 +- ...ocalization.cc => fill_without_localization.cc} | 14 +- scribo/ChangeLog | 14 ++ scribo/scribo/binarization/sauvola_ms_split.hh | 4 + .../toolchain/internal/text_in_picture_functor.hh | 22 ++-- scribo/src/text_in_picture.cc | 22 ++- 8 files changed, 146 insertions(+), 115 deletions(-) copy milena/mln/data/{paste_without_localization.hh => fill_without_localization.hh} (54%) copy milena/tests/data/{paste_without_localization.cc => fill_without_localization.cc} (81%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-632-g8b00304 Merge branch 'exp/fill_without_localization' into exp/TL
by Guillaume Lazzara 30 Apr '13

30 Apr '13

This is a merge commit message of the following branches: Merge: cc0d930 493bf10 Conflicts: scribo/ChangeLog milena/ChangeLog | 9 + milena/mln/data/fill_without_localization.hh | 364 ++++++++++++++++++++ milena/tests/data/Makefile.am | 3 +- milena/tests/data/fill_without_localization.cc | 81 +++++ scribo/ChangeLog | 14 + scribo/scribo/binarization/sauvola_ms_split.hh | 4 + .../toolchain/internal/text_in_picture_functor.hh | 22 +- scribo/src/text_in_picture.cc | 22 +- 8 files changed, 498 insertions(+), 21 deletions(-) diff --cc milena/ChangeLog index d5bb9fd,ec9e11e..8a0bc09 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,511 -1,14 +1,520 @@@ +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 + each concept. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: Fix compilation issues. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: Enable fastest access. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: New image type for ffmpeg frames. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add support for graylevel images in labeling::blobs. + + * mln/canvas/labeling/blobs.hh: Add a fastest version and make it + support graylevel images. + + * mln/labeling/blobs.hh, + * mln/labeling/blobs_and_compute.hh: Add support for graylevel images. + + * tests/labeling/blobs.cc, + * tests/labeling/blobs_and_compute.cc: Add a test for graylevel images. + + * tests/labeling/Makefile.am: Remove all_blobs target. + + * mln/labeling/all_blobs.hh, + * tests/labeling/all_blobs.cc: Remove. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/internal/pixel_impl.hh: Add change_offset(). + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a labeling routine working on grayscale images. + + * mln/canvas/labeling/blobs.hh, + * mln/labeling/blobs.hh, + * mln/labeling/blobs_and_compute.hh: Introduce a new functor + method handles(). + + * tests/labeling/Makefile.am: Add target. + + * mln/labeling/all_blobs.hh, + * tests/labeling/all_blobs.cc: New. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Kill Doxygen warnings. + + * mln/data/convert.hh: Add a missing \overload. + + * mln/value/qt/rgb32.hh: Do not force autolink. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Specify conversion formulas for rgb to integer conversion + functions. + + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/fun/v2v/rgb_to_luma.hh: Here. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Create sub-modules in image geometry module. + + * doc/mln/geom/geom.dox: Add cropping sub-module. + + * doc/mln/transformation.dox: Add new sub-modules. + + * mln/binarization/threshold.hh: Move to conversion module. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh, + * mln/geom/horizontal_symmetry.hh, + * mln/geom/rotate.hh, + * mln/geom/translate.hh, + * mln/geom/vertical_symmetry.hh, + * mln/registration/icp.hh, + * mln/subsampling/antialiased.hh, + * mln/upscaling/art/scale2x.hh, + * mln/upscaling/art/scale3x.hh: Move to newly created sub-modules. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/convert.dox: Fix typos. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add documentation about image conversions. + + * doc/mln/convert.dox: Add examples and explanations. + + * mln/convert/from_to.hh, + * mln/convert/to.hh, + * mln/convert/to_image.hh, + * mln/convert/to_p_array.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_qimage.hh, + * mln/convert/to_qimage_nocopy.hh, + * mln/convert/to_upper_window.hh, + * mln/convert/to_window.hh, + * mln/data/convert.hh, + * mln/fun/v2v/convert.hh, + * mln/fun/v2v/hsl_to_rgb.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: Add to conversion module. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/data/convert.hh: Introduce a new overload taking a + conversion function as parameter. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add references to from_to_ overloads in documentation. + + * mln/algebra/h_mat.hh, + * mln/algebra/quat.hh, + * mln/algebra/vec.hh, + * mln/convert/from_to.hh, + * mln/convert/impl/from_double_to_value.hh, + * mln/convert/impl/from_float_to_value.hh, + * mln/convert/impl/from_unsigned_to_value.hh, + * mln/core/alias/neighb2d.hh, + * mln/core/alias/neighb3d.hh, + * mln/core/alias/window1d.hh, + * mln/core/alias/window2d.hh, + * mln/core/alias/window3d.hh, + * mln/core/concept/gpoint.hh, + * mln/core/image/#image2d#, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/mixed_neighb.hh, + * mln/core/neighb.hh, + * mln/core/w_window.hh, + * mln/fun/i2v/array.hh, + * mln/histo/array.hh, + * mln/util/array.hh, + * mln/util/object_id.hh, + * mln/value/hsl.hh, + * mln/value/int_u.hh, + * mln/value/label.hh, + * mln/value/qt/rgb32.hh, + * mln/value/rgb.hh: Add to from_to_ group. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Explain how to iterate over an image in tutorial. + + * doc/examples/split/tuto3_rw_image-3.cc.raw, + * doc/examples/split/tuto3_rw_image-4.cc.raw, + * doc/examples/split/tuto3_rw_image-5.cc.raw, + * doc/examples/split/tuto3_rw_image-6.cc.raw, + * doc/examples/split/tuto3_rw_image-7.cc.raw, + * doc/examples/split/tuto3_rw_image-8.cc.raw: Regen. + + * doc/examples/tuto3_rw_image.cc: Add an example with iterators. + + * doc/tutorial.tex: Add more explanations on iterators. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce image transformation module in documentation. + + * doc/mln/main.dox: Create new group. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh, + * mln/geom/horizontal_symmetry.hh, + * mln/geom/rotate.hh, + * mln/geom/translate.hh, + * mln/geom/vertical_symmetry.hh, + * mln/registration/icp.hh, + * mln/subsampling/antialiased.hh, + * mln/upscaling/art/scale2x.hh, + * mln/upscaling/art/scale3x.hh: move to this new group. + +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make template parameter name more consistant with naming + conventions. + + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh: Here. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add data::fill_without_localization. + + * mln/data/fill_without_localization.hh, + * tests/data/fill_without_localization.cc: New. + + * tests/data/Makefile.am: Add a new target. + + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/convert.dox: Fix from_to_ module name. 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --cc scribo/ChangeLog index 0cf0bda,90de65c..a68399f --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@@ -1,87 -1,17 +1,101 @@@ + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/src/text_in_picture.cc: Add more debug options fix return + value in main(). + + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/toolchain/internal/text_in_picture_functor.hh: Rename + debug outputs. + +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. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * src/text_in_picture.cc: Add more descriptions in usage. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rename fun::i2v, fun::stat and fun::v2i to fun::v2v. + + * scribo/postprocessing/fill_object_holes.hh, + * scribo/preprocessing/denoise_bg.hh, + * scribo/preprocessing/denoise_fg.hh, + * scribo/primitive/extract/non_text_kmean.hh, + * scribo/primitive/group/apply.hh, + * scribo/primitive/group/from_graph.hh, + * scribo/primitive/group/from_single_link.hh, + * scribo/primitive/regroup/from_single_left_link.hh, + * scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, + * scribo/core/line_set.hh, + * scribo/core/paragraph_set.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/fun/v2b/label_to_bool.hh: Here. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> * src/primitive/extract/lines_pattern.cc: Fix description. diff --cc scribo/scribo/toolchain/internal/text_in_picture_functor.hh index 77b6581,cc7921f..211422b --- a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh @@@ -437,9 -436,9 +437,9 @@@ namespace scrib scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, decision_image, - "group_and_object_image.ppm"); + "group_and_object_image"); - 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); hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/fill_without_localization created: olena-2.0-553-g493bf10
by git＠lrde.epita.fr 30 Apr '13

30 Apr '13

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/fill_without_localization has been created at 493bf1043c722889528e9c85147681f7cd86e9ad (commit) - Log ----------------------------------------------------------------- 493bf10 Add data::fill_without_localization. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-553-g493bf10 Add data::fill_without_localization.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

* mln/data/fill_without_localization.hh, * tests/data/fill_without_localization.cc: New. * tests/data/Makefile.am: Add a new target. --- milena/ChangeLog | 9 + ...ocalization.hh => fill_without_localization.hh} | 173 ++++++++++---------- milena/tests/data/Makefile.am | 3 +- ...ocalization.cc => fill_without_localization.cc} | 14 +- 4 files changed, 104 insertions(+), 95 deletions(-) copy milena/mln/data/{paste_without_localization.hh => fill_without_localization.hh} (54%) copy milena/tests/data/{paste_without_localization.cc => fill_without_localization.cc} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..ec9e11e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add data::fill_without_localization. + + * mln/data/fill_without_localization.hh, + * tests/data/fill_without_localization.cc: New. + + * tests/data/Makefile.am: Add a new target. + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/convert.dox: Fix from_to_ module name. 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/data/paste_without_localization.hh b/milena/mln/data/fill_without_localization.hh similarity index 54% copy from milena/mln/data/paste_without_localization.hh copy to milena/mln/data/fill_without_localization.hh index c2f48f1..c5eef2e 100644 --- a/milena/mln/data/paste_without_localization.hh +++ b/milena/mln/data/fill_without_localization.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,12 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DATA_PASTE_WITHOUT_LOCALIZATION_HH -# define MLN_DATA_PASTE_WITHOUT_LOCALIZATION_HH +#ifndef MLN_DATA_FILL_WITHOUT_LOCALIZATION_HH +# define MLN_DATA_FILL_WITHOUT_LOCALIZATION_HH /// \file /// -/// Paste the contents of an image into another one without taking +/// Fill the contents of an image with another one without taking /// into account the localization of sites. # include <mln/core/concept/image.hh> @@ -43,17 +42,17 @@ namespace mln namespace data { - /*!\brief Paste the contents of image \p input into the image \p - * output without taking into account the localization of sites. + /*!\brief Fill the contents of image \p ima with the image \p + * data without taking into account the localization of sites. * - * \param[in] input The input image providing pixels values. - * \param[in,out] output The image in which values are + * \param[in] ima data The image in which values are * assigned. + * \param[in,out] The image providing pixels values. * * \ingroup mlndata */ template <typename I, typename J> - void paste_without_localization(const Image& input, Image<J>& output); + void fill_without_localization(Image& ima, const Image<J>& data); @@ -68,13 +67,13 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_tests(const Image& input, - Image<J>& output) + void fill_without_localization_tests(Image& ima, + const Image<J>& data) { mlc_converts_to(mln_value(I), mln_value(J))::check(); - (void) input; - (void) output; + (void) ima; + (void) data; } } // end of namespace mln::data::internal @@ -92,23 +91,23 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization(const Image& input_, - Image<J>& output_) + void fill_without_localization(Image& ima_, + const Image<J>& data_) { - mln_trace("data::impl::generic::paste_without_localization"); + mln_trace("data::impl::generic::fill_without_localization"); - internal::paste_without_localization_tests(input_, output_); + internal::fill_without_localization_tests(ima_, data_); - const I& input = exact(input_); - J& output = exact(output_); + I& ima = exact(ima_); + const J& data = exact(data_); - mln_fwd_piter(I) pi(input.domain()); + mln_fwd_piter(I) pi(ima.domain()); pi.start(); - mln_fwd_piter(J) po(output.domain()); + mln_fwd_piter(J) po(data.domain()); po.start(); while (pi.is_valid() && po.is_valid()) { - output(po) = input(pi); + ima(pi) = data(po); pi.next(); po.next(); } @@ -120,10 +119,10 @@ namespace mln - /*! \brief Paste data to an image without using localization. + /*! \brief Fill data to an image without using localization. Performs a one-block memory copy. - \p input and \p output must have both the following properties: + \p ima and \p data must have both the following properties: - mln::trait::image::value_alignment::with_grid - mln::trait::image::value_storage::one_block @@ -140,27 +139,27 @@ namespace mln */ template <typename I, typename J> inline - void paste_without_localization_fastest(const Image& input_, - Image<J>& output_) + void fill_without_localization_fastest(Image& ima_, + const Image<J>& data_) { - mln_trace("data::impl::paste_without_localization_fastest"); + mln_trace("data::impl::fill_without_localization_fastest"); - internal::paste_without_localization_tests(input_, output_); + internal::fill_without_localization_tests(ima_, data_); - const I& input = exact(input_); - J& output = exact(output_); + I& ima = exact(ima_); + const J& data = exact(data_); typedef mln_value(I) V; - memcpy(output.buffer(), input.buffer(), input.nelements() * sizeof(V)); + memcpy(ima.buffer(), data.buffer(), ima.nelements() * sizeof(V)); } - /*! \brief Paste data to an image without using localization. + /*! \brief Fill data to an image without using localization. Performs a line-per-line memory copy. - \p input and \p output must have both the following properties: + \p ima and \p data must have both the following properties: - mln::trait::image::value_alignment::with_grid - mln::trait::image::value_storage::one_block @@ -176,32 +175,32 @@ namespace mln */ template <typename I, typename J> inline - void paste_without_localization_lines(const Image& input_, - Image<J>& output_) + void fill_without_localization_lines(Image& ima_, + const Image<J>& data_) { - mln_trace("data::impl::paste_without_localization_fastest"); + mln_trace("data::impl::fill_without_localization_fastest"); - internal::paste_without_localization_tests(input_, output_); + internal::fill_without_localization_tests(ima_, data_); - const I& input = exact(input_); - J& output = exact(output_); + I& ima = exact(ima_); + const J& data = exact(data_); - box_runstart_piter<mln_site(I)> pi(input.domain()); - box_runstart_piter<mln_site(J)> po(output.domain()); + box_runstart_piter<mln_site(I)> pi(ima.domain()); + box_runstart_piter<mln_site(J)> po(data.domain()); typedef mln_value(I) V; for_all_2(pi, po) - memcpy(&output(po), &input(pi), input.ncols() * sizeof(V)); + memcpy(&ima(pi), &data(po), ima.ncols() * sizeof(V)); } - /*! \brief Paste data to an image without using localization. + /*! \brief Fill data to an image without using localization. Performs a point-wise copy. - \p input and \p output must have both the following properties: + \p ima and \p data must have both the following properties: - mln::trait::image::value_alignment::with_grid - mln::trait::image::value_storage::one_block @@ -216,21 +215,21 @@ namespace mln */ template <typename I, typename J> inline - void paste_without_localization_fast(const Image& input_, - Image<J>& output_) + void fill_without_localization_fast(Image& ima_, + const Image<J>& data_) { - mln_trace("data::impl::paste_without_localization_fast"); + mln_trace("data::impl::fill_without_localization_fast"); - internal::paste_without_localization_tests(input_, output_); + internal::fill_without_localization_tests(ima_, data_); - const I& input = exact(input_); - J& output = exact(output_); + I& ima = exact(ima_); + const J& data = exact(data_); - mln_pixter(const I) pi(input); - mln_pixter(J) po(output); + mln_pixter(I) pi(ima); + mln_pixter(const J) po(data); for_all_2(pi, po) - po.val() = pi.val(); + pi.val() = po.val(); } @@ -247,64 +246,64 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_dispatch( + void fill_without_localization_dispatch( mln::trait::image::value_access::direct, mln::trait::image::value_access::direct, mln::trait::image::ext_domain::some, mln::trait::image::ext_domain::some, - const I& input, - J& output) + I& ima, + const J& data) { if (sizeof(mln_value(I)) == sizeof(mln_value(J))) { - if (border::get(input) == border::get(output) - && input.domain() == output.domain()) - impl::paste_without_localization_fastest(input, output); + if (border::get(ima) == border::get(data) + && ima.domain() == data.domain()) + impl::fill_without_localization_fastest(ima, data); else - impl::paste_without_localization_lines(input, output); + impl::fill_without_localization_lines(ima, data); } else - impl::paste_without_localization_fast(input, output); + impl::fill_without_localization_fast(ima, data); } template <typename I, typename J> inline - void paste_without_localization_dispatch( + void fill_without_localization_dispatch( mln::trait::image::value_access::any, mln::trait::image::value_access::any, mln::trait::image::ext_domain::any, mln::trait::image::ext_domain::any, - const I& input, - J& output) + I& ima, + const J& data) { - impl::generic::paste_without_localization(input, output); + impl::generic::fill_without_localization(ima, data); } template <typename I, typename J> inline - void paste_without_localization_dispatch( + void fill_without_localization_dispatch( mln::trait::image::value_storage::any, mln::trait::image::value_storage::any, - const Image& input, - Image<J>& output) + Image& ima, + const Image<J>& data) { - impl::generic::paste_without_localization(input, output); + impl::generic::fill_without_localization(ima, data); } template <typename I, typename J> inline - void paste_without_localization_dispatch( + void fill_without_localization_dispatch( mln::trait::image::value_storage::one_block, mln::trait::image::value_storage::one_block, - const Image& input_, - Image<J>& output_) + Image& ima_, + const Image<J>& data_) { - const I& input = exact(input_); - J& output = exact(output_); + I& ima = exact(ima_); + const J& data = exact(data_); /// Check basic properties @@ -313,26 +312,26 @@ namespace mln mlc_is(mln_trait_image_value_alignment(J), trait::image::value_alignment::with_grid)::value) { - paste_without_localization_dispatch( + fill_without_localization_dispatch( mln_trait_image_value_access(I)(), mln_trait_image_value_access(J)(), mln_trait_image_ext_domain(I)(), mln_trait_image_ext_domain(J)(), - input, output); + ima, data); } else - impl::generic::paste_without_localization(input, output); + impl::generic::fill_without_localization(ima, data); } template <typename I, typename J> inline - void paste_without_localization_dispatch(const Image& input, - Image<J>& output) + void fill_without_localization_dispatch(Image& ima, + const Image<J>& data) { - paste_without_localization_dispatch(mln_trait_image_value_storage(I)(), + fill_without_localization_dispatch(mln_trait_image_value_storage(I)(), mln_trait_image_value_storage(J)(), - input, output); + ima, data); } } // end of namespace mln::data::internal @@ -344,13 +343,13 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization(const Image& input, Image<J>& output) + void fill_without_localization(Image& ima, const Image<J>& data) { - mln_trace("data::paste_without_localization"); + mln_trace("data::fill_without_localization"); - internal::paste_without_localization_tests(input, output); + internal::fill_without_localization_tests(ima, data); - internal::paste_without_localization_dispatch(input, output); + internal::fill_without_localization_dispatch(ima, data); } @@ -362,4 +361,4 @@ namespace mln -#endif // ! MLN_DATA_PASTE_WITHOUT_LOCALIZATION_HH +#endif // ! MLN_DATA_FILL_WITHOUT_LOCALIZATION_HH diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index b733718..52c9368 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -29,6 +29,7 @@ check_PROGRAMS = \ fill \ fill_with_image \ fill_with_value \ + fill_without_localization \ median \ median_fast \ memcpy_ \ diff --git a/milena/tests/data/paste_without_localization.cc b/milena/tests/data/fill_without_localization.cc similarity index 81% copy from milena/tests/data/paste_without_localization.cc copy to milena/tests/data/fill_without_localization.cc index dd0f479..c96f6d3 100644 --- a/milena/tests/data/paste_without_localization.cc +++ b/milena/tests/data/fill_without_localization.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -25,7 +25,7 @@ #include <mln/core/image/image2d.hh> -#include <mln/data/paste_without_localization.hh> +#include <mln/data/fill_without_localization.hh> #include <mln/data/compare.hh> #include <mln/debug/iota.hh> @@ -47,33 +47,33 @@ int main() // Lines { - data::impl::paste_without_localization_lines(ima, tmp); + data::impl::fill_without_localization_lines(tmp, ima); mln_assertion(tmp == ref); } // Fastest { - data::impl::paste_without_localization_fastest(ima, tmp); + data::impl::fill_without_localization_fastest(tmp, ima); mln_assertion(tmp == ref); } // Fast { - data::impl::paste_without_localization_fast(ima, tmp); + data::impl::fill_without_localization_fast(tmp, ima); mln_assertion(tmp == ref); } // Generic { - data::impl::generic::paste_without_localization(ima, tmp); + data::impl::generic::fill_without_localization(tmp, ima); mln_assertion(tmp == ref); } // Dispatch { - data::paste_without_localization(ima, tmp); + data::fill_without_localization(tmp, ima); mln_assertion(tmp == ref); } -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-588-gbe2c37d
by git＠lrde.epita.fr 30 Apr '13

30 Apr '13

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 be2c37d176bae11f4bbaaaa8b83b9abab7fc4c6e (commit) via 2072dc281d75e057b0673649f6d2ecde34552256 (commit) via e9a8db214da0520749aab56910d856cb817c7b2d (commit) from 2c6bbd3c7ac77360750bab1e62de967793474043 (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 ----------------------------------------------------------------- be2c37d mln/core/concept/image.hh: Document Image concept. 2072dc2 mln/fun/p2b/has.hh: Fix invalid super type. e9a8db2 doc/mln/value/value/dox: Specify that built-in types can be used. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 13 ++++++++ milena/doc/mln/value/value.dox | 22 +++++++++++-- milena/mln/core/concept/image.hh | 63 ++++++++++++++++++++++++++----------- milena/mln/fun/p2b/has.hh | 2 +- 4 files changed, 76 insertions(+), 24 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-588-gbe2c37d mln/core/concept/image.hh: Document Image concept.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

--- milena/ChangeLog | 4 ++ milena/mln/core/concept/image.hh | 63 ++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 231ee28..29c9d5e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/concept/image.hh: Document Image concept. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/fun/p2b/has.hh: Fix invalid super type. 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/concept/image.hh b/milena/mln/core/concept/image.hh index f302425..3a10dea 100644 --- a/milena/mln/core/concept/image.hh +++ b/milena/mln/core/concept/image.hh @@ -69,20 +69,31 @@ namespace mln /*! + \headerfile <> \brief Base class for implementation of image classes. - \ingroup modconcepts - */ - template <typename E> - struct Image : public Object<E> - { - typedef Image<void> category; - - template <typename J> - Image<E>& operator=(const J& rhs); - - /* - // provided by internal::image_base: + In Milena, every image is considered as a composition of both: + \li A function \f$F\f$ + \f$ + ima : \left\{ + \begin{array}{lll} + Site &\rightarrow & Value \\ + p & \mapsto & ima(p) + \end{array} + \right. + \f$ + \li A domain of definition \f$D\f$. + + A domain \f$D\f$ is represented as a mln::Site_Set which provides + the set of sites (localization information) on which the image is + defined. + The function \f$F\f$ returns a value for a given site. + + mln::Image is a concept class. It is not meant to be instantiated + directly. All image classes in Milena inherit from it and + provide the following methods and typedefs: + + \code typedef domain_t; typedef site; typedef psite; @@ -92,7 +103,6 @@ namespace mln typedef bkd_piter; bool has(const psite& p) const; - unsigned nsites() const; // If relevant. bool is_valid() const; @@ -104,11 +114,6 @@ namespace mln typedef value; - // to be provided in concrete image classes: - - typedef vset; - const vset& values() const; - typedef rvalue; typedef lvalue; rvalue operator()(const psite& p) const; @@ -117,7 +122,27 @@ namespace mln const domain_t& domain() const; typedef skeleton; - */ + \endcode + + More explanations and documentation of each typedefs/methods are + provided in the inherited classes. A list of images is available + in module \ref modimage. Image types are divided into two main + categories: \ref modimageconcrete and \ref modimagemorpher. + + A list of features provided in image classes is detailed in module + \ref modimage. + + \ingroup modconcepts + */ + template <typename E> + struct Image : public Object<E> + { + typedef Image<void> category; + + template <typename J> + Image<E>& operator=(const J& rhs); + + // Required interface is provided by internal::image_base: protected: Image(); -- 1.7.2.5

1 0

olena: olena-2.0-587-gb5e4385 mln/core/concept/image.hh: Document Image concept.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

--- milena/ChangeLog | 4 ++ milena/mln/core/concept/image.hh | 63 ++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d975112..6a1d0ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/concept/image.hh: Document Image concept. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/value/value/dox: Specify that built-in types can be used. diff --git a/milena/mln/core/concept/image.hh b/milena/mln/core/concept/image.hh index f302425..3a10dea 100644 --- a/milena/mln/core/concept/image.hh +++ b/milena/mln/core/concept/image.hh @@ -69,20 +69,31 @@ namespace mln /*! + \headerfile <> \brief Base class for implementation of image classes. - \ingroup modconcepts - */ - template <typename E> - struct Image : public Object<E> - { - typedef Image<void> category; - - template <typename J> - Image<E>& operator=(const J& rhs); - - /* - // provided by internal::image_base: + In Milena, every image is considered as a composition of both: + \li A function \f$F\f$ + \f$ + ima : \left\{ + \begin{array}{lll} + Site &\rightarrow & Value \\ + p & \mapsto & ima(p) + \end{array} + \right. + \f$ + \li A domain of definition \f$D\f$. + + A domain \f$D\f$ is represented as a mln::Site_Set which provides + the set of sites (localization information) on which the image is + defined. + The function \f$F\f$ returns a value for a given site. + + mln::Image is a concept class. It is not meant to be instantiated + directly. All image classes in Milena inherit from it and + provide the following methods and typedefs: + + \code typedef domain_t; typedef site; typedef psite; @@ -92,7 +103,6 @@ namespace mln typedef bkd_piter; bool has(const psite& p) const; - unsigned nsites() const; // If relevant. bool is_valid() const; @@ -104,11 +114,6 @@ namespace mln typedef value; - // to be provided in concrete image classes: - - typedef vset; - const vset& values() const; - typedef rvalue; typedef lvalue; rvalue operator()(const psite& p) const; @@ -117,7 +122,27 @@ namespace mln const domain_t& domain() const; typedef skeleton; - */ + \endcode + + More explanations and documentation of each typedefs/methods are + provided in the inherited classes. A list of images is available + in module \ref modimage. Image types are divided into two main + categories: \ref modimageconcrete and \ref modimagemorpher. + + A list of features provided in image classes is detailed in module + \ref modimage. + + \ingroup modconcepts + */ + template <typename E> + struct Image : public Object<E> + { + typedef Image<void> category; + + template <typename J> + Image<E>& operator=(const J& rhs); + + // Required interface is provided by internal::image_base: protected: Image(); -- 1.7.2.5

1 0

olena: olena-2.0-587-g2072dc2 mln/fun/p2b/has.hh: Fix invalid super type.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

--- milena/ChangeLog | 4 ++++ milena/mln/fun/p2b/has.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d975112..231ee28 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/fun/p2b/has.hh: Fix invalid super type. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/value/value/dox: Specify that built-in types can be used. diff --git a/milena/mln/fun/p2b/has.hh b/milena/mln/fun/p2b/has.hh index 79d061d..b52aef4 100644 --- a/milena/mln/fun/p2b/has.hh +++ b/milena/mln/fun/p2b/has.hh @@ -82,7 +82,7 @@ namespace mln private: mlc_const(I) ima_; - typedef Function_p2b< has > super_; + typedef Function_v2b< has > super_; }; -- 1.7.2.5

1 0

olena: olena-2.0-586-ge9a8db2 doc/mln/value/value/dox: Specify that built-in types can be used.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

--- milena/ChangeLog | 5 +++++ milena/doc/mln/value/value.dox | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 063eede..d975112 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/value/value/dox: Specify that built-in types can be + used. + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> Introduce a new module for useful macros. diff --git a/milena/doc/mln/value/value.dox b/milena/doc/mln/value/value.dox index 9a97f24..da9e9ae 100644 --- a/milena/doc/mln/value/value.dox +++ b/milena/doc/mln/value/value.dox @@ -1,8 +1,22 @@ /*! \defgroup valuegroup Values - * - * \brief All supported value types. - * - * \ingroup modtypes + + \brief All supported value types. + + Milena provides several kinds of value types detailled in this + section. Built-in types can also be used which includes: + + \li bool + \li char + \li short int + \li int + \li long + \li unsigned short + \li unsigned int + \li unsigned long + \li float + \li double + + \ingroup modtypes */ -- 1.7.2.5

1 0

olena: olena-2.0-586-g03eb6db doc/mln/value/value/dox: Specify that built-in types can be used.
by Guillaume Lazzara 30 Apr '13

30 Apr '13

--- milena/ChangeLog | 5 +++++ milena/doc/mln/value/value.dox | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 063eede..d975112 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/value/value/dox: Specify that built-in types can be + used. + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> Introduce a new module for useful macros. diff --git a/milena/doc/mln/value/value.dox b/milena/doc/mln/value/value.dox index 9a97f24..da9e9ae 100644 --- a/milena/doc/mln/value/value.dox +++ b/milena/doc/mln/value/value.dox @@ -1,8 +1,22 @@ /*! \defgroup valuegroup Values - * - * \brief All supported value types. - * - * \ingroup modtypes + + \brief All supported value types. + + Milena provides several kinds of value types detailled in this + section. Built-in types can also be used which includes: + + \li bool + \li char + \li short int + \li int + \li long + \li unsigned short + \li unsigned int + \li unsigned long + \li float + \li double + + \ingroup modtypes */ -- 1.7.2.5

1 0