March 2013 - Olena-patches

branch unstable/scribo updated: olena-2.0-417-g66cb484
by git＠lrde.epita.fr 21 Mar '13

21 Mar '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 unstable/scribo has been updated via 66cb484adc91ca65c034f198baae67fe20e83262 (commit) via eef02666ee55a78e5c4fe8510149b26718f43f65 (commit) via 1750bc523cdc01e1717bc168644a16524b77fa1e (commit) via 961ef463d342b373a63c1c570568e44e564012b9 (commit) via ae155c6e37215fcd722f44a82573729e89647108 (commit) from 92262d2499f2eb25a2aa6919ac58c240d66a10d4 (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 ----------------------------------------------------------------- 66cb484 headers.mk: Regen. eef0266 doc/doc.bib: Fix a reference name. 1750bc5 doc/Doxyfile.in: Generate namespace page. 961ef46 Fix documentation in registration namespace. ae155c6 Fix invalid example output in the documentation. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + doc/doc.bib | 2 +- milena/ChangeLog | 51 ++++++++++++ milena/doc/Doxyfile.in | 2 +- .../examples/split/tuto3_first_routine-1.cc.raw | 2 +- .../examples/split/tuto3_first_routine-3.cc.raw | 2 +- milena/doc/mainpage.dox | 1 - milena/doc/outputs/accu-right-instantiation.txt | 2 - milena/doc/outputs/borderthickness.txt | 2 - milena/doc/outputs/estim-sites.txt | 2 - milena/doc/outputs/extend.txt | 31 ------- milena/doc/outputs/fill-call-1.txt | 8 -- milena/doc/outputs/fill-imageif-cfun.txt | 10 --- milena/doc/outputs/fill-part-image.txt | 18 ---- milena/doc/outputs/fill-subdomain-shorter.txt | 20 ----- milena/doc/outputs/fill-subdomain.txt | 41 ---------- milena/doc/outputs/fill.txt | 4 - milena/doc/outputs/ima-load.txt | 1 - milena/doc/outputs/ima-save.txt | 1 - milena/doc/outputs/ima2d-6-clone.txt | 7 -- milena/doc/outputs/ima2d-7.txt | 6 -- milena/doc/outputs/ima2d-rot.txt | 32 -------- milena/doc/outputs/labeling-compute.txt | 19 ----- milena/doc/outputs/logical-not.txt | 10 --- milena/doc/outputs/paste-call-1.txt | 15 ---- milena/doc/outputs/split/tuto3_println-1.txt | 11 --- milena/doc/outputs/split/tuto3_println-2.txt | 7 -- milena/doc/outputs/tuto2_first_image.txt | 7 -- milena/doc/outputs/tuto3_colorize.txt | 7 -- milena/doc/outputs/tuto3_first_routine.txt | 48 ----------- milena/doc/outputs/tuto3_println.txt | 18 ---- milena/doc/outputs/tuto3_rw_image.txt | 24 ------ .../outputs/tuto4_genericity_and_algorithms.txt | 83 -------------------- milena/headers.mk | 18 +++-- milena/mln/{opt => registration}/all.hh | 22 +++--- milena/mln/registration/icp.hh | 9 +-- 36 files changed, 82 insertions(+), 465 deletions(-) copy milena/mln/{opt => registration}/all.hh (74%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-417-g66cb484 headers.mk: Regen.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a26bd5c..dda3ba2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Generate namespace page. 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/headers.mk b/milena/headers.mk index ef017f8..75f3a48 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -432,6 +432,7 @@ mln/data/approx/essential.hh \ mln/data/approx/median.hh \ mln/data/compare.hh \ mln/data/compute.hh \ +mln/data/compute_in_window.hh \ mln/data/convert.hh \ mln/data/essential.hh \ mln/data/fast_median.hh \ @@ -478,6 +479,7 @@ mln/debug/put_word.hh \ mln/debug/quiet.hh \ mln/debug/slices_2d.hh \ mln/debug/superpose.hh \ +mln/debug/trace.hh \ mln/debug/z_order.hh \ mln/display/all.hh \ mln/display/essential.hh \ @@ -575,6 +577,8 @@ 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 \ @@ -616,6 +620,7 @@ mln/fun/x2x/rotation.hh \ mln/fun/x2x/translation.hh \ mln/geom/all.hh \ mln/geom/bbox.hh \ +mln/geom/bottom_left.hh \ mln/geom/chamfer.hh \ mln/geom/complex_geometry.hh \ mln/geom/crop.hh \ @@ -643,6 +648,7 @@ mln/geom/seeds2tiling_roundness.hh \ mln/geom/size1d.hh \ mln/geom/size2d.hh \ mln/geom/size3d.hh \ +mln/geom/top_right.hh \ mln/geom/translate.hh \ mln/geom/vertical_symmetry.hh \ mln/graph/all.hh \ @@ -683,6 +689,7 @@ mln/io/fld/max_components.hh \ mln/io/fld/save.hh \ mln/io/fld/write_header.hh \ mln/io/magick/all.hh \ +mln/io/magick/internal/init_magick.hh \ mln/io/magick/load.hh \ mln/io/magick/save.hh \ mln/io/off/all.hh \ @@ -693,6 +700,8 @@ mln/io/pbm/load.hh \ mln/io/pbm/save.hh \ mln/io/pbms/all.hh \ mln/io/pbms/load.hh \ +mln/io/pdf/get_header.hh \ +mln/io/pdf/load.hh \ mln/io/pfm/all.hh \ mln/io/pfm/load.hh \ mln/io/pfm/save.hh \ @@ -1004,6 +1013,7 @@ mln/pw/image.hh \ mln/pw/internal/image_base.hh \ mln/pw/value.hh \ mln/pw/var.hh \ +mln/registration/icp.hh \ mln/set/all.hh \ mln/set/card.hh \ mln/set/compute.hh \ @@ -1059,14 +1069,6 @@ mln/topo/skeleton/breadth_first_thinning.hh \ mln/topo/skeleton/crest.hh \ mln/topo/skeleton/is_simple_point.hh \ mln/topo/static_n_face_iter.hh \ -mln/trace/all.hh \ -mln/trace/entering.hh \ -mln/trace/essential.hh \ -mln/trace/exiting.hh \ -mln/trace/quiet.hh \ -mln/trace/resume.hh \ -mln/trace/stop.hh \ -mln/trace/warning.hh \ mln/trait/accumulator/print.hh \ mln/trait/accumulator/props.hh \ mln/trait/accumulators.hh \ -- 1.7.2.5

1 0

olena-2.0-416-geef0266 doc/doc.bib: Fix a reference name.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

--- ChangeLog | 4 ++++ doc/doc.bib | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f765d56..465c20f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/doc.bib: Fix a reference name. + 2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> Improve common documentation. diff --git a/doc/doc.bib b/doc/doc.bib index 46280bd..637cf12 100644 --- a/doc/doc.bib +++ b/doc/doc.bib @@ -7,7 +7,7 @@ pages = {225--236} } -(a)Article{besl.1992.pami, +@Article{besl1992pami, author = "P.J. Besl and N.D. McKay", title = "A Method for Registration of 3-D Shapes", journal = "IEEE Transactions on Pattern Analysis and Machine Intelligence", -- 1.7.2.5

1 0

olena-2.0-415-g1750bc5 doc/Doxyfile.in: Generate namespace page.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6a3fb73..a26bd5c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Generate namespace page. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix documentation in registration namespace. * mln/registration/all.hh: New. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index c629d2d..302b669 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -575,7 +575,7 @@ SHOW_FILES = NO # This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. -SHOW_NAMESPACES = NO +SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from -- 1.7.2.5

1 0

olena-2.0-414-g961ef46 Fix documentation in registration namespace.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

* mln/registration/all.hh: New. * mln/registration/icp.hh: Fix reference. --- milena/ChangeLog | 8 ++++++++ milena/mln/{opt => registration}/all.hh | 22 ++++++++++------------ milena/mln/registration/icp.hh | 9 +++------ 3 files changed, 21 insertions(+), 18 deletions(-) copy milena/mln/{opt => registration}/all.hh (74%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4bf766a..6a3fb73 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix documentation in registration namespace. + + * mln/registration/all.hh: New. + + * mln/registration/icp.hh: Fix reference. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix invalid example output in the documentation. * doc/examples/split/tuto3_first_routine-1.cc.raw, diff --git a/milena/mln/opt/all.hh b/milena/mln/registration/all.hh similarity index 74% copy from milena/mln/opt/all.hh copy to milena/mln/registration/all.hh index 204b0c9..11b029c 100644 --- a/milena/mln/opt/all.hh +++ b/milena/mln/registration/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,29 +23,27 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_OPT_ALL_HH -# define MLN_OPT_ALL_HH +#ifndef MLN_REGISTRATION_ALL_HH +# define MLN_REGISTRATION_ALL_HH /// \file /// -/// File that includes the most useful optional routines. +/// File that includes the most useful registration routines. namespace mln { - /// Namespace of optional routines. - namespace opt + /// Namespace of registrationional routines. + namespace registration { - /// Implementation namespace of opt namespace. + /// Implementation namespace of registration namespace. namespace impl {} - } // end of namespace mln::opt + } // end of namespace mln::registration } // end of name -# include <mln/opt/at.hh> -# include <mln/opt/element.hh> -# include <mln/opt/value.hh> +# include <mln/registration/icp.hh> -#endif // ! MLN_OPT_ALL_HH +#endif // ! MLN_REGISTRATION_ALL_HH diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 72b3d84..7c82202 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -107,10 +107,7 @@ namespace mln * * \pre \p P_ and \p X must not be empty. * - * \cite besl.92.pami - * - * Reference article: "A Method for Registration of 3-D Shapes", Paul J. - * Besl and Neil D. McKay, IEEE, 2, February 1992. + * This implementation is based on \cite besl1992pami. * */ template <typename P, typename F> -- 1.7.2.5

1 0

olena-2.0-413-gae155c6 Fix invalid example output in the documentation.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

* doc/examples/split/tuto3_first_routine-1.cc.raw, * doc/examples/split/tuto3_first_routine-3.cc.raw, * doc/mainpage.dox, * doc/outputs/accu-right-instantiation.txt, * doc/outputs/borderthickness.txt, * doc/outputs/estim-sites.txt, * doc/outputs/extend.txt, * doc/outputs/fill-call-1.txt, * doc/outputs/fill-imageif-cfun.txt, * doc/outputs/fill-part-image.txt, * doc/outputs/fill-subdomain-shorter.txt, * doc/outputs/fill-subdomain.txt, * doc/outputs/fill.txt, * doc/outputs/ima-load.txt, * doc/outputs/ima-save.txt, * doc/outputs/ima2d-6-clone.txt, * doc/outputs/ima2d-7.txt, * doc/outputs/ima2d-rot.txt, * doc/outputs/labeling-compute.txt, * doc/outputs/logical-not.txt, * doc/outputs/paste-call-1.txt, * doc/outputs/split/tuto3_println-1.txt, * doc/outputs/split/tuto3_println-2.txt, * doc/outputs/tuto2_first_image.txt, * doc/outputs/tuto3_colorize.txt, * doc/outputs/tuto3_first_routine.txt, * doc/outputs/tuto3_println.txt, * doc/outputs/tuto3_rw_image.txt, * doc/outputs/tuto4_genericity_and_algorithms.txt: Remove trace logs. --- milena/ChangeLog | 35 ++++++++ .../examples/split/tuto3_first_routine-1.cc.raw | 2 +- .../examples/split/tuto3_first_routine-3.cc.raw | 2 +- milena/doc/mainpage.dox | 1 - milena/doc/outputs/accu-right-instantiation.txt | 2 - milena/doc/outputs/borderthickness.txt | 2 - milena/doc/outputs/estim-sites.txt | 2 - milena/doc/outputs/extend.txt | 31 ------- milena/doc/outputs/fill-call-1.txt | 8 -- milena/doc/outputs/fill-imageif-cfun.txt | 10 --- milena/doc/outputs/fill-part-image.txt | 18 ---- milena/doc/outputs/fill-subdomain-shorter.txt | 20 ----- milena/doc/outputs/fill-subdomain.txt | 41 ---------- milena/doc/outputs/fill.txt | 4 - milena/doc/outputs/ima-load.txt | 1 - milena/doc/outputs/ima-save.txt | 1 - milena/doc/outputs/ima2d-6-clone.txt | 7 -- milena/doc/outputs/ima2d-7.txt | 6 -- milena/doc/outputs/ima2d-rot.txt | 32 -------- milena/doc/outputs/labeling-compute.txt | 19 ----- milena/doc/outputs/logical-not.txt | 10 --- milena/doc/outputs/paste-call-1.txt | 15 ---- milena/doc/outputs/split/tuto3_println-1.txt | 11 --- milena/doc/outputs/split/tuto3_println-2.txt | 7 -- milena/doc/outputs/tuto2_first_image.txt | 7 -- milena/doc/outputs/tuto3_colorize.txt | 7 -- milena/doc/outputs/tuto3_first_routine.txt | 48 ----------- milena/doc/outputs/tuto3_println.txt | 18 ---- milena/doc/outputs/tuto3_rw_image.txt | 24 ------ .../outputs/tuto4_genericity_and_algorithms.txt | 83 -------------------- 30 files changed, 37 insertions(+), 437 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4504e7c..4bf766a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,38 @@ +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid example output in the documentation. + + * doc/examples/split/tuto3_first_routine-1.cc.raw, + * doc/examples/split/tuto3_first_routine-3.cc.raw, + * doc/mainpage.dox, + * doc/outputs/accu-right-instantiation.txt, + * doc/outputs/borderthickness.txt, + * doc/outputs/estim-sites.txt, + * doc/outputs/extend.txt, + * doc/outputs/fill-call-1.txt, + * doc/outputs/fill-imageif-cfun.txt, + * doc/outputs/fill-part-image.txt, + * doc/outputs/fill-subdomain-shorter.txt, + * doc/outputs/fill-subdomain.txt, + * doc/outputs/fill.txt, + * doc/outputs/ima-load.txt, + * doc/outputs/ima-save.txt, + * doc/outputs/ima2d-6-clone.txt, + * doc/outputs/ima2d-7.txt, + * doc/outputs/ima2d-rot.txt, + * doc/outputs/labeling-compute.txt, + * doc/outputs/logical-not.txt, + * doc/outputs/paste-call-1.txt, + * doc/outputs/split/tuto3_println-1.txt, + * doc/outputs/split/tuto3_println-2.txt, + * doc/outputs/tuto2_first_image.txt, + * doc/outputs/tuto3_colorize.txt, + * doc/outputs/tuto3_first_routine.txt, + * doc/outputs/tuto3_println.txt, + * doc/outputs/tuto3_rw_image.txt, + * doc/outputs/tuto4_genericity_and_algorithms.txt: Remove trace + logs. + 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> Introduce mln_trace_warning macro. diff --git a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw index d36d6ae..420f141 100644 --- a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw +++ b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw @@ -29,7 +29,7 @@ namespace mln my_algorithm(const Image<I>& ima_, const Neighborhood<N>& nbh_) { - debug::trace("my_algorithm"); + mln_trace("my_algorithm"); const I& ima = exact(ima_); const N& nbh = exact(nbh_); diff --git a/milena/doc/examples/split/tuto3_first_routine-3.cc.raw b/milena/doc/examples/split/tuto3_first_routine-3.cc.raw index d9d40b9..03e3ccd 100644 --- a/milena/doc/examples/split/tuto3_first_routine-3.cc.raw +++ b/milena/doc/examples/split/tuto3_first_routine-3.cc.raw @@ -1 +1 @@ - debug::trace("my_algorithm"); + mln_trace("my_algorithm"); diff --git a/milena/doc/mainpage.dox b/milena/doc/mainpage.dox index cf9bec8..4b366c2 100644 --- a/milena/doc/mainpage.dox +++ b/milena/doc/mainpage.dox @@ -101,7 +101,6 @@ image. \li \ref mln::tag \li \ref mln::test \li \ref mln::topo - \li \ref mln::trace \li \ref mln::trait \li \ref mln::transform \li \ref mln::util diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/accu-right-instantiation.txt index b8389ed..e69de29 100644 --- a/milena/doc/outputs/accu-right-instantiation.txt +++ b/milena/doc/outputs/accu-right-instantiation.txt @@ -1,2 +0,0 @@ -data::compute {} -data::impl::update_fastest {} diff --git a/milena/doc/outputs/borderthickness.txt b/milena/doc/outputs/borderthickness.txt index e159b1a..94f4df7 100644 --- a/milena/doc/outputs/borderthickness.txt +++ b/milena/doc/outputs/borderthickness.txt @@ -1,5 +1,3 @@ -border::fill {} -border::impl::fill_size_1 {} - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/milena/doc/outputs/estim-sites.txt b/milena/doc/outputs/estim-sites.txt index a24151d..e69de29 100644 --- a/milena/doc/outputs/estim-sites.txt +++ b/milena/doc/outputs/estim-sites.txt @@ -1,2 +0,0 @@ -geom::nsites {} -set::impl::card_from_method {} diff --git a/milena/doc/outputs/extend.txt b/milena/doc/outputs/extend.txt index 18621cb..e69de29 100644 --- a/milena/doc/outputs/extend.txt +++ b/milena/doc/outputs/extend.txt @@ -1,31 +0,0 @@ -mln::io::ppm::load {} -mln::io::pnm::load {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::paste {} -data::impl::generic::paste {} -mln::io::pnm::save {} -mln::io::pnm::save {} -mln::io::pnm::save {} -mln::io::pnm::save {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -data::transform {} -data::impl::generic::transform {} -core::initialize {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/fill-call-1.txt b/milena/doc/outputs/fill-call-1.txt index 8cfbfd9..e69de29 100644 --- a/milena/doc/outputs/fill-call-1.txt +++ b/milena/doc/outputs/fill-call-1.txt @@ -1,8 +0,0 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} diff --git a/milena/doc/outputs/fill-imageif-cfun.txt b/milena/doc/outputs/fill-imageif-cfun.txt index fca0e7e..e69de29 100644 --- a/milena/doc/outputs/fill-imageif-cfun.txt +++ b/milena/doc/outputs/fill-imageif-cfun.txt @@ -1,10 +0,0 @@ -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/fill-part-image.txt b/milena/doc/outputs/fill-part-image.txt index 7c8dece..39d0035 100644 --- a/milena/doc/outputs/fill-part-image.txt +++ b/milena/doc/outputs/fill-part-image.txt @@ -1,27 +1,9 @@ -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} - - -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} - diff --git a/milena/doc/outputs/fill-subdomain-shorter.txt b/milena/doc/outputs/fill-subdomain-shorter.txt index 7678968..e69de29 100644 --- a/milena/doc/outputs/fill-subdomain-shorter.txt +++ b/milena/doc/outputs/fill-subdomain-shorter.txt @@ -1,20 +0,0 @@ -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} diff --git a/milena/doc/outputs/fill-subdomain.txt b/milena/doc/outputs/fill-subdomain.txt index f5c403d..e69de29 100644 --- a/milena/doc/outputs/fill-subdomain.txt +++ b/milena/doc/outputs/fill-subdomain.txt @@ -1,41 +0,0 @@ -mln::io::pbm::save {} -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -labeling::colorize {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pnm::save {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -labeling::colorize {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pnm::save {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/fill.txt b/milena/doc/outputs/fill.txt index 15ad66f..e69de29 100644 --- a/milena/doc/outputs/fill.txt +++ b/milena/doc/outputs/fill.txt @@ -1,4 +0,0 @@ -mln::io::ppm::load {} -mln::io::pnm::load {} -mln::io::pnm::save {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/ima-load.txt b/milena/doc/outputs/ima-load.txt index c22c7f9..e69de29 100644 --- a/milena/doc/outputs/ima-load.txt +++ b/milena/doc/outputs/ima-load.txt @@ -1 +0,0 @@ -mln::io::pbm::load {} diff --git a/milena/doc/outputs/ima-save.txt b/milena/doc/outputs/ima-save.txt index 2d09eac..e69de29 100644 --- a/milena/doc/outputs/ima-save.txt +++ b/milena/doc/outputs/ima-save.txt @@ -1 +0,0 @@ -mln::io::pbm::save {} diff --git a/milena/doc/outputs/ima2d-6-clone.txt b/milena/doc/outputs/ima2d-6-clone.txt index 5e5e738..877bce6 100644 --- a/milena/doc/outputs/ima2d-6-clone.txt +++ b/milena/doc/outputs/ima2d-6-clone.txt @@ -1,9 +1,2 @@ -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} 3 - 0 0 diff --git a/milena/doc/outputs/ima2d-7.txt b/milena/doc/outputs/ima2d-7.txt index 45cf668..e69de29 100644 --- a/milena/doc/outputs/ima2d-7.txt +++ b/milena/doc/outputs/ima2d-7.txt @@ -1,6 +0,0 @@ -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} diff --git a/milena/doc/outputs/ima2d-rot.txt b/milena/doc/outputs/ima2d-rot.txt index 0858acd..e69de29 100644 --- a/milena/doc/outputs/ima2d-rot.txt +++ b/milena/doc/outputs/ima2d-rot.txt @@ -1,32 +0,0 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -border::fill {} -border::impl::fill_size_n {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -border::fill {} -border::impl::fill_size_n {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -mln::io::pnm::save {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -data::paste {} -data::impl::generic::paste {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/labeling-compute.txt b/milena/doc/outputs/labeling-compute.txt index e2efdee..19f03f4 100644 --- a/milena/doc/outputs/labeling-compute.txt +++ b/milena/doc/outputs/labeling-compute.txt @@ -1,22 +1,3 @@ -mln::io::pbm::save {} -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -labeling::colorize {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pnm::save {} -labeling::compute {} -labeling::impl::generic::compute {} [(0,1)..(1,2)] [(3,0)..(5,1)] [(3,2)..(4,4)] diff --git a/milena/doc/outputs/logical-not.txt b/milena/doc/outputs/logical-not.txt index add9dd0..e69de29 100644 --- a/milena/doc/outputs/logical-not.txt +++ b/milena/doc/outputs/logical-not.txt @@ -1,10 +0,0 @@ -mln::io::pbm::save {} -logical::not_ {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pbm::save {} -logical::not_inplace {} -data::transform_inplace {} -data::impl::transform_inplace_fastest_lowq {} -mln::io::pbm::save {} diff --git a/milena/doc/outputs/paste-call-1.txt b/milena/doc/outputs/paste-call-1.txt index c482286..49e117a 100644 --- a/milena/doc/outputs/paste-call-1.txt +++ b/milena/doc/outputs/paste-call-1.txt @@ -1,18 +1,3 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::paste {} -border::get {} -border::get {} -data::impl::paste_fastest {} -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} 98 98 98 98 98 98 98 98 98 98 98 98 diff --git a/milena/doc/outputs/split/tuto3_println-1.txt b/milena/doc/outputs/split/tuto3_println-1.txt index 0ff752d..7ef416e 100644 --- a/milena/doc/outputs/split/tuto3_println-1.txt +++ b/milena/doc/outputs/split/tuto3_println-1.txt @@ -1,14 +1,3 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 diff --git a/milena/doc/outputs/split/tuto3_println-2.txt b/milena/doc/outputs/split/tuto3_println-2.txt index 477da9d..4d76ec4 100644 --- a/milena/doc/outputs/split/tuto3_println-2.txt +++ b/milena/doc/outputs/split/tuto3_println-2.txt @@ -1,10 +1,3 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -border::fill {} -border::impl::fill_size_1 {} 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 diff --git a/milena/doc/outputs/tuto2_first_image.txt b/milena/doc/outputs/tuto2_first_image.txt index ebe8ba3..42a59f9 100644 --- a/milena/doc/outputs/tuto2_first_image.txt +++ b/milena/doc/outputs/tuto2_first_image.txt @@ -1,9 +1,3 @@ -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} - - - - - - - - - - - - - - - - - - - - - - | - | - | | | - | - - - | - - - - | - - - | - | - | - - - | - - - | - - - | - | - @@ -18,4 +12,3 @@ data::impl::memset_ {} - | - | - - | - - | - | - | | | - | | - - - - - - - - - - - - - - - - - - - - - - - -mln::io::pbm::save {} diff --git a/milena/doc/outputs/tuto3_colorize.txt b/milena/doc/outputs/tuto3_colorize.txt index f8d7c99..e69de29 100644 --- a/milena/doc/outputs/tuto3_colorize.txt +++ b/milena/doc/outputs/tuto3_colorize.txt @@ -1,7 +0,0 @@ -labeling::colorize {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pgm::save {} -mln::io::pnm::save {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/tuto3_first_routine.txt b/milena/doc/outputs/tuto3_first_routine.txt index e0777a2..e69de29 100644 --- a/milena/doc/outputs/tuto3_first_routine.txt +++ b/milena/doc/outputs/tuto3_first_routine.txt @@ -1,48 +0,0 @@ -my_algorithm {} -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -labeling::compute {} -labeling::impl::generic::compute {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -my_algorithm {} -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -labeling::compute {} -labeling::impl::generic::compute {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -data::compare (==) {} -test::predicate {} diff --git a/milena/doc/outputs/tuto3_println.txt b/milena/doc/outputs/tuto3_println.txt index 24f3047..307681c 100644 --- a/milena/doc/outputs/tuto3_println.txt +++ b/milena/doc/outputs/tuto3_println.txt @@ -1,15 +1,4 @@ // \{ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -debug::println {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -18,13 +7,6 @@ data::impl::memset_ {} // \} // \{ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -border::fill {} -border::impl::fill_size_1 {} 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 diff --git a/milena/doc/outputs/tuto3_rw_image.txt b/milena/doc/outputs/tuto3_rw_image.txt index 9fc001c..e69de29 100644 --- a/milena/doc/outputs/tuto3_rw_image.txt +++ b/milena/doc/outputs/tuto3_rw_image.txt @@ -1,24 +0,0 @@ -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -mln::io::pnm::save {} -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} -mln::io::ppm::load {} -mln::io::pnm::load {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_lines {} -mln::io::pnm::save {} -data::paste {} -data::impl::paste_lines {} -mln::io::pnm::save {} diff --git a/milena/doc/outputs/tuto4_genericity_and_algorithms.txt b/milena/doc/outputs/tuto4_genericity_and_algorithms.txt index 291ad16..e69de29 100644 --- a/milena/doc/outputs/tuto4_genericity_and_algorithms.txt +++ b/milena/doc/outputs/tuto4_genericity_and_algorithms.txt @@ -1,83 +0,0 @@ -mln::io::ppm::load {} -mln::io::pnm::load {} -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pbm::save {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} -core::duplicate {} -core::initialize {} -data::fill {} -data::fill_with_image {} -border::get {} -border::get {} -data::impl::fill_with_image_fastest {} -binarization::binarization {} -binarization::impl::binarization_ {} -data::transform {} -data::impl::transform_fast {} -core::initialize {} -labeling::blobs {} -labeling::blobs {} -core::initialize {} -data::fill {} -data::fill_with_value {} -data::impl::fill_with_value_one_block {} -data::memset_ {} -data::impl::memset_ {} -extension::fill {} -border::fill {} -border::impl::fill_size_1 {} -labeling::colorize {} -data::transform {} -data::impl::transform_fast_lowq {} -core::initialize {} -mln::io::pnm::save {} -data::fill {} -data::fill_with_value {} -data::impl::generic::fill_with_value {} -mln::io::pnm::save {} -- 1.7.2.5

1 0

olena-2.0-394-ga1e60f0 [ICDAR_13] Update XML output + Add XML reference
by Anthony Seure 20 Mar '13

20 Mar '13

--- scribo/sandbox/icdar_13_table/Makefile | 2 +- .../competition-entry-region-model.xsd | 45 +++++++++++++++++++ scribo/sandbox/icdar_13_table/src/new.cc | 5 +-- scribo/sandbox/icdar_13_table/src/xml.cc | 47 +++++++++++++------ scribo/sandbox/icdar_13_table/src/xml.hh | 9 +++- 5 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/sandbox/icdar_13_table/Makefile index 8d0cd1a..7c11bf1 100644 --- a/scribo/sandbox/icdar_13_table/Makefile +++ b/scribo/sandbox/icdar_13_table/Makefile @@ -1,6 +1,6 @@ CCACHE=ccache CC=g++ -CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG +CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG -DMLN_WO_GLOBAL_VARS CLIBS=-I../../../milena/ -I../../ -I/usr/include/poppler CLEAN=*.o output/* log final.xml diff --git a/scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd b/scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd new file mode 100644 index 0000000..2e0d0d4 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" > + <xsd:element name="document"> + <xsd:complexType> + <xsd:sequence> + <xsd:element minOccurs="0" maxOccurs="unbounded" name="table">  + <xsd:complexType> + <xsd:sequence> + <xsd:element name="region" maxOccurs="unbounded" nillable="false">  + <xsd:complexType> + <xsd:sequence> + <xsd:element name="instruction" minOccurs="0" maxOccurs="unbounded">  + <xsd:complexType> + <xsd:attribute name="instr-id" type="xsd:integer" use="required"/> + <xsd:attribute name="subinstr-id" type="xsd:integer"/> +  + </xsd:complexType> + </xsd:element> + <xsd:element name="bounding-box">  + <xsd:complexType> + <xsd:attribute name="x1" type="xsd:integer" use="required"/> + <xsd:attribute name="y1" type="xsd:integer" use="required"/> + <xsd:attribute name="x2" type="xsd:integer" use="required"/> + <xsd:attribute name="y2" type="xsd:integer" use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:nonNegativeInteger" use="required"/> + <xsd:attribute name="page" type="xsd:positiveInteger" use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:nonNegativeInteger" use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="filename" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> +</xsd:schema> diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 95bf575..9f05030 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -1,3 +1,4 @@ +#undef MLN_WO_GLOBAL_VARS #include "xml.hh" // INCLUDES OLENA @@ -231,7 +232,6 @@ int main(int argc, char** argv) typedef value::label_16 V; typedef image2d<V> L; - //std::ofstream xml; std::ostringstream path; image2d<value::rgb8> original, ima_links, ima_groups, ima_valid; image2d<value::int_u8> filtered; @@ -241,7 +241,6 @@ int main(int argc, char** argv) unsigned dpi = 72; // Loading and binarization - //start_xml(xml, "final.xml", argv[1]); XML* xml = new XML("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; @@ -395,8 +394,6 @@ int main(int argc, char** argv) write_image(ima_valid, "valid", page, number, path); } - - //end_xml(xml); delete xml; return 0; diff --git a/scribo/sandbox/icdar_13_table/src/xml.cc b/scribo/sandbox/icdar_13_table/src/xml.cc index 76fed84..86e66e2 100644 --- a/scribo/sandbox/icdar_13_table/src/xml.cc +++ b/scribo/sandbox/icdar_13_table/src/xml.cc @@ -1,31 +1,48 @@ #include "xml.hh" -XML::XML(const char* name, const char* pdf) - : _name(name), _pdf(pdf) +XML::XML(const char* name, + const char* pdf) + : _name(name), _pdf(pdf), _table(0), _region(0), _first_time(true) { _xml.open(_name); _xml << "<?xml version\"1.0\" encoding=\"UTF-8\"?>" << std::endl - << "<document filename='" << _pdf << "'>" << std::endl; + << "<document filename='" << _pdf << "'>" << std::endl; } -XML::~XML() +XML::~XML(void) { _xml << "</document>" << std::endl; _xml.close(); } -void XML::write_table(const point2d& start, const point2d& end) +void XML::table(const point2d& start, + const point2d& end, + const unsigned page, + const bool connect) { - static unsigned table = 0; - static unsigned region = 0; - static unsigned page = 1; + if (_first_time) + { + _xml << "\t<table id='" << _table << "'>" << std::endl; + ++_table; + _first_time = false; + } + else + { + if (!connect) + { + _xml << "\t</table>" << std::endl; + _xml << "\t<table id='" << _table << "'>" << std::endl; + _region = 0; + ++_table; + } + } - _xml << "\t<table id='" << table << "'>" << std::endl - << "\t\t<region id='" << region << "' page='" << page << "'>" << std::endl - << "\t\t<bounding-box x1='" << start[1] << "' y1='" << start[0] << "' " - << "x2='" << end[1] << "' y2='" << end[0] << "'/>" << std::endl - << "\t\t</region>" << std::endl - << "\t</table>" << std::endl; + _xml << "\t\t<region id='" << _region << "' page='" << page + 1 << "'>" << std::endl + << "\t\t\t<bounding-box x1='" << start[1] + << "' y1='" << start[0] + << "' x2='" << end[1] + << "' y2='" << end[0] << "'/>" << std::endl + << "\t\t</region>" << std::endl; - ++table; + ++_region; } diff --git a/scribo/sandbox/icdar_13_table/src/xml.hh b/scribo/sandbox/icdar_13_table/src/xml.hh index 397d585..b4cef29 100644 --- a/scribo/sandbox/icdar_13_table/src/xml.hh +++ b/scribo/sandbox/icdar_13_table/src/xml.hh @@ -1,6 +1,5 @@ #ifndef XML_HH # define XML_HH -# define MLN_WO_GLOBAL_VARS # include <iostream> # include <fstream> @@ -13,12 +12,18 @@ class XML public: XML(const char* name, const char* pdf); ~XML(); - void write_table(const point2d& start, const point2d& end); + void table(const point2d& start, + const point2d& end, + const unsigned page, + const bool connect); private: std::ofstream _xml; const char* _name; const char* _pdf; + unsigned _table; + unsigned _region; + bool _first_time; }; #endif /* !XML_HH */ -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-412-g92262d2
by git＠lrde.epita.fr 20 Mar '13

20 Mar '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 unstable/scribo has been updated via 92262d2499f2eb25a2aa6919ac58c240d66a10d4 (commit) via 5dd49fd54cb0aefc62307d2c44bb2aa2bad9bc13 (commit) via 16506fd482cea6aae09c272d70c0cd12c9d11703 (commit) via ca6ca83dc3fae9efe685fe774df68ddf6793acbe (commit) via 48849ed3b8a9749bb310f12cccf70bdc8429c61a (commit) via 1ec09726a5670c541c9ea5f57b832a6374ca09c0 (commit) from 9a540a39c053b5a730edb6ccff5d9871bdfa1274 (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 ----------------------------------------------------------------- 92262d2 Small fixes. 5dd49fd scribo/binarization/sauvola_ms.hh: Add a new overload and preconditions. 16506fd Improve common documentation. ca6ca83 Improve documentation layout. 48849ed Improve documentation of Scribo. 1ec0972 Replace \fixme with FIXME. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++ doc/Doxyfile.in | 2 +- doc/doc.bib | 29 +++++ scribo/ChangeLog | 95 +++++++++++++++++ scribo/doc/Doxyfile.in | 18 ++-- scribo/doc/DoxygenLayout.xml | 2 +- scribo/doc/scribo/binarization/binarization.dox | 8 +- scribo/doc/scribo/binarization/kim.dox | 23 ++++ scribo/doc/scribo/binarization/otsu.dox | 11 ++- scribo/doc/scribo/binarization/wolf.dox | 6 + scribo/doc/scribo/core/component_set.dox | 90 ++++++++++++++++ scribo/doc/scribo/filter/component_groups.dox | 2 +- scribo/doc/scribo/filter/component_links.dox | 2 +- scribo/doc/scribo/filter/components.dox | 2 +- scribo/doc/scribo/filter/elements.dox | 2 +- scribo/doc/scribo/filter/line_links.dox | 4 +- scribo/doc/scribo/filter/paragraphs.dox | 4 +- scribo/doc/scribo/layout/layout.dox | 6 + scribo/doc/scribo/namespaces.dox | 7 ++ scribo/doc/scribo/primitive/extract/components.dox | 7 ++ scribo/doc/scribo/primitive/extract/extract.dox | 7 ++ scribo/doc/scribo/primitive/extract/separators.dox | 8 +- .../scribo/binarization/global_threshold_auto.hh | 2 +- .../binarization/internal/local_threshold_core.hh | 6 +- .../binarization/internal/niblack_formula.hh | 2 +- .../scribo/binarization/internal/singh_formula.hh | 13 +-- scribo/scribo/binarization/kim.hh | 22 +--- scribo/scribo/binarization/niblack_fast.hh | 20 ++-- scribo/scribo/binarization/niblack_threshold.hh | 14 +-- scribo/scribo/binarization/otsu.hh | 8 +- scribo/scribo/binarization/otsu_threshold.hh | 12 +- scribo/scribo/binarization/sauvola_ms.hh | 26 +++++- scribo/scribo/binarization/sauvola_ms_split.hh | 19 ++-- scribo/scribo/binarization/sauvola_threshold.hh | 2 +- scribo/scribo/binarization/singh.hh | 10 +- scribo/scribo/binarization/wolf.hh | 20 ++-- scribo/scribo/binarization/wolf_fast.hh | 19 ++-- scribo/scribo/core/component_info.hh | 10 ++ scribo/scribo/core/component_set.hh | 80 +++++++++------ scribo/scribo/core/concept/serializable.hh | 9 +- scribo/scribo/core/line_info.hh | 4 +- scribo/scribo/core/object_links.hh | 8 +- scribo/scribo/core/tag/component.hh | 56 +++++++--- scribo/scribo/debug/logger.hh | 8 +- scribo/scribo/filter/images_in_paragraph.hh | 2 +- scribo/scribo/filter/paragraphs_in_borders.hh | 50 +++++---- scribo/scribo/filter/separators_in_borders.hh | 63 ++++++------ scribo/scribo/filter/separators_vert_in_borders.hh | 51 +++++----- scribo/scribo/layout/xy_cut.hh | 14 ++- scribo/scribo/postprocessing/fill_object_holes.hh | 6 +- scribo/scribo/preprocessing/deskew.hh | 2 +- scribo/scribo/primitive/extract/components.hh | 40 +++++--- scribo/scribo/primitive/extract/internal/union.hh | 2 +- scribo/scribo/primitive/extract/lines_h_single.hh | 6 +- scribo/scribo/primitive/extract/lines_v_single.hh | 2 +- scribo/scribo/primitive/extract/non_text.hh | 2 +- scribo/scribo/primitive/extract/non_text_hdoc.hh | 2 +- scribo/scribo/primitive/extract/non_text_kmean.hh | 2 +- .../primitive/link/internal/find_several_links.hh | 4 +- .../primitive/link/internal/link_functor_base.hh | 2 +- .../link/merge_double_link_closest_aligned.hh | 2 +- scribo/scribo/subsampling/bilinear.hh | 4 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 5 +- scribo/scribo/text/merging_hdoc.hh | 112 ++++---------------- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 2 +- 65 files changed, 699 insertions(+), 389 deletions(-) create mode 100644 scribo/doc/scribo/binarization/kim.dox create mode 100644 scribo/doc/scribo/binarization/wolf.dox create mode 100644 scribo/doc/scribo/core/component_set.dox create mode 100644 scribo/doc/scribo/layout/layout.dox create mode 100644 scribo/doc/scribo/namespaces.dox create mode 100644 scribo/doc/scribo/primitive/extract/components.dox create mode 100644 scribo/doc/scribo/primitive/extract/extract.dox hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-412-g92262d2 Small fixes.
by Guillaume Lazzara 20 Mar '13

20 Mar '13

* scribo/primitive/extract/lines_h_single.hh: Fix an invalid function name. * scribo/text/extract_paragraphs_hdoc.hh: Remove useless inline keyword. * scribo/toolchain/text_in_doc_preprocess.hh: Fix argument name. --- scribo/ChangeLog | 12 ++++++++++++ scribo/scribo/primitive/extract/lines_h_single.hh | 6 +++--- scribo/scribo/text/extract_paragraphs_hdoc.hh | 5 ++--- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3bdcd00..5c0905a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. + + * scribo/primitive/extract/lines_h_single.hh: Fix an invalid + function name. + + * scribo/text/extract_paragraphs_hdoc.hh: Remove useless inline + keyword. + + * scribo/toolchain/text_in_doc_preprocess.hh: Fix argument name. + +2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Add a new overload and preconditions. diff --git a/scribo/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh index c3e5794..ab262ab 100644 --- a/scribo/scribo/primitive/extract/lines_h_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_single.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -71,7 +71,7 @@ namespace scribo */ template <typename I, typename N, typename V> component_set<mln_ch_value(I,V)> - lines_v_single(const Image<I>& input, + lines_h_single(const Image<I>& input, const Neighborhood<N>& nbh, const V& nlines, unsigned min_line_length, float w_h_ratio); diff --git a/scribo/scribo/text/extract_paragraphs_hdoc.hh b/scribo/scribo/text/extract_paragraphs_hdoc.hh index a7ba0b8..cc379cb 100644 --- a/scribo/scribo/text/extract_paragraphs_hdoc.hh +++ b/scribo/scribo/text/extract_paragraphs_hdoc.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. @@ -64,10 +64,10 @@ namespace scribo { /*! \brief Extract paragraph in old documents. + \ingroup grptext */ template <typename L> - inline paragraph_set<L> extract_paragraphs_hdoc(line_set<L>& lines, const image2d<bool>& input); @@ -1275,7 +1275,6 @@ namespace scribo template <typename L> - inline paragraph_set<L> extract_paragraphs_hdoc(line_set<L>& lines, const image2d<bool>& input) diff --git a/scribo/scribo/toolchain/text_in_doc_preprocess.hh b/scribo/scribo/toolchain/text_in_doc_preprocess.hh index 881f0d5..d6c7dc5 100644 --- a/scribo/scribo/toolchain/text_in_doc_preprocess.hh +++ b/scribo/scribo/toolchain/text_in_doc_preprocess.hh @@ -127,7 +127,7 @@ namespace scribo */ template <typename I> mln_ch_value(I,bool) - text_in_doc_preprocess(const Image<I>& input_, unsigned lambda, + text_in_doc_preprocess(const Image<I>& input, unsigned lambda, double k2, double k3, double k4, bool enable_fg_bg, Image<I>& fg, bool enable_deskew, bool verbose); -- 1.7.2.5

1 0

olena-2.0-411-g5dd49fd scribo/binarization/sauvola_ms.hh: Add a new overload and preconditions.
by Guillaume Lazzara 20 Mar '13

20 Mar '13

--- scribo/ChangeLog | 5 +++++ scribo/scribo/binarization/sauvola_ms.hh | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a987ade..3bdcd00 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Add a new overload and + preconditions. + +2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve documentation layout. * doc/Doxyfile.in: Improve member functions presentation. diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 0bfd5a4..979a4e9 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -148,6 +148,13 @@ namespace scribo sauvola_ms(const Image<I>& input_1, unsigned w_1, unsigned s, double k2, double k3, double k4); + /// \overload + /// Allow to specify the same k parameter for all scales. + // + template <typename I> + mln_ch_value(I,bool) + sauvola_ms(const Image<I>& input_1, unsigned w_1, unsigned s, + double all_k); # ifndef MLN_INCLUDE_ONLY @@ -1019,6 +1026,8 @@ namespace scribo mln_trace("scribo::binarization::sauvola_ms"); mln_precondition(exact(input_1_).is_valid()); + mln_precondition(s > 1); + // Gray level images ONLY. mlc_is_not_a(mln_value(I), value::Vectorial)::check(); mlc_is_not(mln_value(I), bool)::check(); @@ -1037,6 +1046,8 @@ namespace scribo mln_trace("scribo::binarization::sauvola_ms"); mln_precondition(exact(input_1_).is_valid()); + mln_precondition(s > 1); + // Gray level images ONLY. mlc_is_not_a(mln_value(I), value::Vectorial)::check(); mlc_is_not(mln_value(I), bool)::check(); @@ -1064,6 +1075,19 @@ namespace scribo } + template <typename I> + mln_ch_value(I,bool) + sauvola_ms(const Image<I>& input_1, unsigned w_1, unsigned s, + double all_k) + { + binarization::internal::k2 = all_k; + binarization::internal::k3 = all_k; + binarization::internal::k4 = all_k; + + return sauvola_ms(input_1, w_1, s); + } + + # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0