- Olena-patches

olena: branch exp/newdoc updated: olena-2.0-612-g5496815
by git＠lrde.epita.fr 15 May '13

15 May '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 549681511e1e366b98634862881a5bd795f4afaf (commit) via bf4c38f2235c4f9f15ef90b26a877b5a20c7ad6c (commit) from c5a51d374b002aaada4860b7d2c6b72efa7f5b13 (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 ----------------------------------------------------------------- 5496815 New page related to Olena powered programs. bf4c38f doc/mln/io/io.dox: Move package dependencies documentation into "note" environnement. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ doc/mainpage.dox | 2 +- doc/olena_powered_program.dox | 30 ++++++++++++++++++++++++++++++ milena/ChangeLog | 5 +++++ milena/doc/mln/io/io.dox | 20 +++++++------------- 5 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 doc/olena_powered_program.dox hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-612-g5496815 New page related to Olena powered programs.
by Guillaume Lazzara 15 May '13

15 May '13

* doc/mainpage.dox: Add link to Olena powered programs page. * doc/olena_powered_program.dox: New. --- ChangeLog | 8 ++++++++ doc/mainpage.dox | 2 +- doc/olena_powered_program.dox | 30 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) create mode 100644 doc/olena_powered_program.dox diff --git a/ChangeLog b/ChangeLog index 00a812d..4d14142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + New page related to Olena powered programs. + + * doc/mainpage.dox: Add link to Olena powered programs page. + + * doc/olena_powered_program.dox: New. + 2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mainpage.dox: Update demo URL. diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 49b5e72..4c5e5cf 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -50,7 +50,7 @@ <td> \li <a class="el" href="http://olena.lrde.epita.fr/demos">Online Demos</a> \li Papers Related Programs - \li Olena Powered Programs + \li \ref olenapoweredprog </td> </tr> </table> diff --git a/doc/olena_powered_program.dox b/doc/olena_powered_program.dox new file mode 100644 index 0000000..ec93543 --- /dev/null +++ b/doc/olena_powered_program.dox @@ -0,0 +1,30 @@ +/*! \page olenapoweredprog Olena Powered Programs + +Olena is a mature platform which is used industrial projects. Here is +a list of projects already using Olena. + +<table border="0" cellpadding="5"> + <tr> + <td align="center"><h2><a href="http://www.nuxeo.com">Nuxeo</a></h2></td> + <td>An Open Source Content Management Platform. + <br>Olena is used in a specific module for extracting text from + document images. (https://github.com/nuxeo/nuxeo-platform-ocr)</td> + </tr> + <tr> + <td align="center"><h2><a href="http://www.xwiki.org">XWiki</a></h2></td> + <td>A professional wiki with a highly modular architecture. + <br>Olena is used in the scribo module of XWiki, a module for + making automatic annotation. It relies on the Scribo module of + Olena for extracting text from + pictures. (https://bitbucket.org/fmancinelli_xwiki/scribo) + </td> + </tr> + <tr> + <td align="center"><h2><a href="http://www.wallix.com">Wallix Admin Bastion + (WAB)</a></h2></td> + <td>A Security solution for information systems. + <br>Olena is used as a dedicated OCR for reading window titles in + VNC videos streams. </td> + </tr> +</table> +*/ \ No newline at end of file -- 1.7.2.5

1 0

olena: olena-2.0-611-gbf4c38f doc/mln/io/io.dox: Move package dependencies documentation into "note" environnement.
by Guillaume Lazzara 15 May '13

15 May '13

--- milena/ChangeLog | 5 +++++ milena/doc/mln/io/io.dox | 20 +++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9782c55..8acf1b4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/io/io.dox: Move package dependencies documentation into + "note" environnement. + 2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/labeling/labeling.dox: Fix auto-link to functions. diff --git a/milena/doc/mln/io/io.dox b/milena/doc/mln/io/io.dox index 720eac7..3402f87 100644 --- a/milena/doc/mln/io/io.dox +++ b/milena/doc/mln/io/io.dox @@ -15,8 +15,7 @@ \brief DICOM I/O routines. - These routines require the following packages: - + \note These routines require the following packages: \li libgdcm2.0 \li libgdcm2-dev @@ -34,8 +33,7 @@ \brief FITS I/O routines. - These routines require the following packages: - + \note These routines require the following packages: \li libcfitsio3 \li libcfitsio3-dev @@ -53,10 +51,9 @@ \brief ImageMagick I/O routines. - These routines require ImageMagick or GraphicsMagick to be installed. - - GraphicsMagick requires the following packages: + \note These routines require ImageMagick or GraphicsMagick to be installed. + \note GraphicsMagick requires the following packages: \li libgraphismagick++-3 \li graphicsmagick \li graphicsmagick-imagemagick-compat @@ -66,8 +63,7 @@ \li libgraphicsmagick1-dev \li graphicsmagick-libmagick-dev-compat - ImageMagick requires the following packages: - + \note ImageMagick requires the following packages: \li libmagick++5 \li libmagick++-dev \li imagemagick @@ -128,8 +124,7 @@ \brief TIFF I/O routines. - These routines require the following packages: - + \note These routines require the following packages: \li libtiff5 \li libtiff5-dev @@ -147,8 +142,7 @@ \brief PDF I/O routines. - These routines require the following packages: - + \note These routines require the following packages: \li libpoppler5 \li libpoppler-dev \li libpoppler-cpp-dev -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-610-gc5a51d3
by git＠lrde.epita.fr 14 May '13

14 May '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 c5a51d374b002aaada4860b7d2c6b72efa7f5b13 (commit) via 9375af1bf8f23d22c0b566c2751026c3ee1c8418 (commit) via 8c22dda3d43b85f55f4ddf7125464661d8f13a3b (commit) via 2c7f276871da2240744b864bc953630c28f3174e (commit) via 3fee889275e51e4a54ddd190fd0a1221e27543f2 (commit) from f4024c0f648bac243f0cb60c04ae3e895a9e08d3 (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 ----------------------------------------------------------------- c5a51d3 doc/mln/labeling/labeling.dox: Fix auto-link to functions. 9375af1 Do not move classes/functions in their related sections. 8c22dda Add documentation about neighborhood and window iterators. 2c7f276 doc/mainpage.dox: Update demo URL. 3fee889 doc/DoxygenLayout.xml: Update demo URL. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + doc/mainpage.dox | 2 +- milena/ChangeLog | 42 +++++++++ milena/doc/DoxygenLayout.xml | 2 +- milena/doc/examples-outputs.mk | 36 +++++++ milena/doc/examples.dox | 20 +++-- milena/doc/examples.mk | 4 +- milena/doc/examples/neighborhood_iterator.cc | 40 ++++++++ milena/doc/examples/window_iterator.cc | 40 ++++++++ milena/doc/mln/core/neighb.dox | 41 +++++++- milena/doc/mln/labeling/labeling.dox | 2 +- milena/doc/mln/win/win.dox | 39 +++++++- milena/doc/outputs.mk | 4 +- ...instantiation.txt => neighborhood_iterator.txt} | 0 ...right-instantiation.txt => window_iterator.txt} | 0 milena/doc/programs-examples.mk | 4 + milena/mln/core/macros.hh | 42 ++++++--- milena/mln/literal/black.hh | 7 +- milena/mln/literal/colors.hh | 98 +++++++++++++++++--- milena/mln/literal/identity.hh | 4 +- milena/mln/literal/max.hh | 3 +- milena/mln/literal/min.hh | 4 +- milena/mln/literal/one.hh | 6 +- milena/mln/literal/origin.hh | 4 +- milena/mln/literal/white.hh | 7 +- milena/mln/literal/zero.hh | 9 ++- 26 files changed, 405 insertions(+), 59 deletions(-) create mode 100644 milena/doc/examples/neighborhood_iterator.cc create mode 100644 milena/doc/examples/window_iterator.cc copy milena/doc/outputs/{accu-right-instantiation.txt => neighborhood_iterator.txt} (100%) copy milena/doc/outputs/{accu-right-instantiation.txt => window_iterator.txt} (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-610-gc5a51d3 doc/mln/labeling/labeling.dox: Fix auto-link to functions.
by Guillaume Lazzara 14 May '13

14 May '13

--- milena/ChangeLog | 4 ++++ milena/doc/mln/labeling/labeling.dox | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6f05562..9782c55 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/labeling/labeling.dox: Fix auto-link to functions. + +2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not move classes/functions in their related sections. * mln/core/macros.hh, diff --git a/milena/doc/mln/labeling/labeling.dox b/milena/doc/mln/labeling/labeling.dox index ae841c5..71b1e48 100644 --- a/milena/doc/mln/labeling/labeling.dox +++ b/milena/doc/mln/labeling/labeling.dox @@ -22,7 +22,7 @@ labeling::mean_colors, massively compute attribute on labeled image. - labeling::pack and labeling::relabel() relabel already labeled + labeling::pack() and labeling::relabel() relabel already labeled images with respect to specific rules. labeling::value_and_compute() performs both labeling and attribute -- 1.7.2.5

1 0

olena: olena-2.0-609-g9375af1 Do not move classes/functions in their related sections.
by Guillaume Lazzara 14 May '13

14 May '13

* mln/core/macros.hh, * mln/literal/black.hh, * mln/literal/colors.hh, * mln/literal/identity.hh, * mln/literal/max.hh, * mln/literal/min.hh, * mln/literal/one.hh, * mln/literal/origin.hh, * mln/literal/white.hh, * mln/literal/zero.hh: Use \relatesalso instead of \relates. --- milena/ChangeLog | 15 ++++++ milena/mln/core/macros.hh | 42 +++++++++++------ milena/mln/literal/black.hh | 7 +++- milena/mln/literal/colors.hh | 98 ++++++++++++++++++++++++++++++++++------ milena/mln/literal/identity.hh | 4 +- milena/mln/literal/max.hh | 3 +- milena/mln/literal/min.hh | 4 +- milena/mln/literal/one.hh | 6 ++- milena/mln/literal/origin.hh | 4 +- milena/mln/literal/white.hh | 7 +++- milena/mln/literal/zero.hh | 9 +++- 11 files changed, 163 insertions(+), 36 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d65543d..6f05562 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not move classes/functions in their related sections. + + * mln/core/macros.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/white.hh, + * mln/literal/zero.hh: Use \relatesalso instead of \relates. + +2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add documentation about neighborhood and window iterators. * doc/examples-outputs.mk, diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 668d582..58b3cac 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -174,7 +174,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_bkd_qiter_(T) @@ -186,7 +187,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /// Shortcuts to access the backward neighbor iterator type associated /// to a window of type T. @@ -223,7 +225,8 @@ To be used in templated functions only. \ingroup macrosima - \relates mln::Image mln::Site_Set + \relatesalso mln::Image + \relatesalso mln::Site_Set */ /*! \def mln_box_(T) @@ -231,7 +234,8 @@ To be used in non-templated functions only. \ingroup macrosima - \relates mln::Image mln::Site_Set + \relatesalso mln::Image + \relatesalso mln::Site_Set */ /// Shortcuts to access the box type associated to T. /// \{ @@ -562,7 +566,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_fwd_qiter_(T) @@ -574,7 +579,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /// Shortcuts to access the forward neighbor iterator type associated /// to a window of site T. @@ -972,7 +978,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_qiter_(T) @@ -984,7 +991,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /// Shortcuts to access the default neighbor iterator type associated /// to the window of type T. @@ -1463,7 +1471,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_fwd_qixter_(T) @@ -1473,7 +1482,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ # define mln_fwd_qixter(I, W) typename mln::trait::fwd_qixter< I, W >::ret # define mln_fwd_qixter_(I, W) mln::trait::fwd_qixter< I, W >::ret @@ -1486,7 +1496,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_bkd_qixter_(T) @@ -1496,7 +1507,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ # define mln_bkd_qixter(I, W) typename mln::trait::bkd_qixter< I, W >::ret # define mln_bkd_qixter_(I, W) mln::trait::bkd_qixter< I, W >::ret @@ -1510,7 +1522,8 @@ To be used in templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ /*! \def mln_qixter_(T) @@ -1520,7 +1533,8 @@ To be used in non-templated functions only. \ingroup macrositerwin - \relates mln::Window mln::Weighted_Window + \relatesalso mln::Window + \relatesalso mln::Weighted_Window */ # define mln_qixter(I, W) mln_fwd_qixter(I, W) # define mln_qixter_(I, W) mln_fwd_qixter_(I, W) diff --git a/milena/mln/literal/black.hh b/milena/mln/literal/black.hh index bd43d22..cf0ec85 100644 --- a/milena/mln/literal/black.hh +++ b/milena/mln/literal/black.hh @@ -55,7 +55,12 @@ namespace mln /*! \brief Literal black. - \relates mln::literal::black_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::black_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const black_t black; diff --git a/milena/mln/literal/colors.hh b/milena/mln/literal/colors.hh index 70d8834..762340a 100644 --- a/milena/mln/literal/colors.hh +++ b/milena/mln/literal/colors.hh @@ -154,98 +154,168 @@ namespace mln /*! \brief Literal red. - \relates mln::literal::red_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::red_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const red_t red; /*! \brief Literal green. - \relates mln::literal::green_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::green_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const green_t green; /*! \brief Literal blue. - \relates mln::literal::blue_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::blue_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const blue_t blue; /*! \brief Literal brown. - \relates mln::literal::brown_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::brown_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const brown_t brown; /*! \brief Literal lime. - \relates mln::literal::lime_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::lime_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const lime_t lime; /*! \brief Literal orange. - \relates mln::literal::orange_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::orange_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const orange_t orange; /*! \brief Literal pink. - \relates mln::literal::pink_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::pink_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const pink_t pink; /*! \brief Literal purple. - \relates mln::literal::purple_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::purple_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const purple_t purple; /*! \brief Literal teal. - \relates mln::literal::teal_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::teal_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const teal_t teal; /*! \brief Literal violet. - \relates mln::literal::violet_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::violet_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const violet_t violet; /*! \brief Literal cyan. - \relates mln::literal::cyan_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::cyan_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const cyan_t cyan; /*! \brief Literal magenta. - \relates mln::literal::magenta_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::magenta_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const magenta_t magenta; /*! \brief Literal yellow. - \relates mln::literal::yellow_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::yellow_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const yellow_t yellow; /*! \brief Literal olive. - \relates mln::literal::olive_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::olive_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const olive_t olive; diff --git a/milena/mln/literal/identity.hh b/milena/mln/literal/identity.hh index 4ff840e..9876a88 100644 --- a/milena/mln/literal/identity.hh +++ b/milena/mln/literal/identity.hh @@ -51,7 +51,9 @@ namespace mln /*! \brief Literal identity. \ingroup modliteral - \relates mln::literal::identity_t mln::algebra::mat + + \relatesalso mln::literal::identity_t + \relatesalso mln::algebra::mat */ extern const identity_t identity; diff --git a/milena/mln/literal/max.hh b/milena/mln/literal/max.hh index 0e3b7c9..bd474a7 100644 --- a/milena/mln/literal/max.hh +++ b/milena/mln/literal/max.hh @@ -56,7 +56,8 @@ namespace mln /*! \brief Literal max. \ingroup modliteral - \relates mln::literal::max_t + + \relatesalso mln::literal::max_t */ extern const max_t max; diff --git a/milena/mln/literal/min.hh b/milena/mln/literal/min.hh index a5cfc40..59a2354 100644 --- a/milena/mln/literal/min.hh +++ b/milena/mln/literal/min.hh @@ -55,7 +55,9 @@ namespace mln /*! \brief Literal min. - \relates mln::literal::min_t + + \relatesalso mln::literal::min_t + \ingroup modliteral */ extern const min_t min; diff --git a/milena/mln/literal/one.hh b/milena/mln/literal/one.hh index 4f06663..910ac30 100644 --- a/milena/mln/literal/one.hh +++ b/milena/mln/literal/one.hh @@ -58,7 +58,11 @@ namespace mln /*! \brief Literal one. \ingroup modliteral - \relates mln::literal::one_t mln::value::int_s mln::value::int_u_sat mln::value::sign + + \relatesalso mln::literal::one_t + \relatesalso mln::value::int_s + \relatesalso mln::value::int_u_sat + \relatesalso mln::value::sign */ extern const one_t one; diff --git a/milena/mln/literal/origin.hh b/milena/mln/literal/origin.hh index a426510..7904f3b 100644 --- a/milena/mln/literal/origin.hh +++ b/milena/mln/literal/origin.hh @@ -52,7 +52,9 @@ namespace mln /*! \brief Literal origin. \ingroup modliteral - \relates mln::literal::origin_t mln::algebra::vec mln::point + + \relatesalso mln::literal::origin_t + \relatesalso mln::algebra::vec mln::point */ extern const origin_t origin; diff --git a/milena/mln/literal/white.hh b/milena/mln/literal/white.hh index b578356..875a18c 100644 --- a/milena/mln/literal/white.hh +++ b/milena/mln/literal/white.hh @@ -55,7 +55,12 @@ namespace mln /*! \brief Literal white. - \relates mln::literal::white_t mln::value::rgb mln::value::rgb8 mln::value::rgb16 + + \relatesalso mln::literal::white_t + \relatesalso mln::value::rgb + \relatesalso mln::value::rgb8 + \relatesalso mln::value::rgb16 + \ingroup literalcolors valuergb */ extern const white_t white; diff --git a/milena/mln/literal/zero.hh b/milena/mln/literal/zero.hh index 40448ba..3929e66 100644 --- a/milena/mln/literal/zero.hh +++ b/milena/mln/literal/zero.hh @@ -58,7 +58,14 @@ namespace mln /*! \brief Literal zero. - \relates mln::literal::zero_t mln::algebra::vec mln::value::int_s mln::value::int_u_sat mln::value::qt::rgb32 mln::value::rgb mln::value::sign + + \relatesalso mln::literal::zero_t + \relatesalso mln::algebra::vec + \relatesalso mln::value::int_s + \relatesalso mln::value::int_u_sat + \relatesalso mln::value::qt::rgb32 + \relatesalso mln::value::rgb + \relatesalso mln::value::sign \ingroup modliteral */ -- 1.7.2.5

1 0

olena: olena-2.0-608-g8c22dda Add documentation about neighborhood and window iterators.
by Guillaume Lazzara 14 May '13

14 May '13

* doc/examples-outputs.mk, * doc/examples.mk, * doc/outputs.mk, * doc/programs-examples.mk: Regen. * doc/outputs/neighborhood_iterator.txt, * doc/outputs/window_iterator.txt, * doc/examples/neighborhood_iterator.cc, * doc/examples/window_iterator.cc: New. * doc/examples.dox: Add links to examples. * doc/mln/core/neighb.dox, * doc/mln/win/win.dox: Write documentation. --- milena/ChangeLog | 19 +++++++++ milena/doc/examples-outputs.mk | 36 +++++++++++++++++ milena/doc/examples.dox | 20 ++++++---- milena/doc/examples.mk | 4 +- milena/doc/examples/neighborhood_iterator.cc | 40 +++++++++++++++++++ milena/doc/examples/window_iterator.cc | 40 +++++++++++++++++++ milena/doc/mln/core/neighb.dox | 41 +++++++++++++++++-- milena/doc/mln/win/win.dox | 39 ++++++++++++++++-- milena/doc/outputs.mk | 4 +- ...instantiation.txt => neighborhood_iterator.txt} | 0 ...right-instantiation.txt => window_iterator.txt} | 0 milena/doc/programs-examples.mk | 4 ++ 12 files changed, 227 insertions(+), 20 deletions(-) create mode 100644 milena/doc/examples/neighborhood_iterator.cc create mode 100644 milena/doc/examples/window_iterator.cc copy milena/doc/outputs/{accu-right-instantiation.txt => neighborhood_iterator.txt} (100%) copy milena/doc/outputs/{accu-right-instantiation.txt => window_iterator.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4d2da20..d65543d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,24 @@ 2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add documentation about neighborhood and window iterators. + + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk, + * doc/programs-examples.mk: Regen. + + * doc/outputs/neighborhood_iterator.txt, + * doc/outputs/window_iterator.txt, + * doc/examples/neighborhood_iterator.cc, + * doc/examples/window_iterator.cc: New. + + * doc/examples.dox: Add links to examples. + + * doc/mln/core/neighb.dox, + * doc/mln/win/win.dox: Write documentation. + +2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/DoxygenLayout.xml: Update demo URL. 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 10645fb..4dd9d91 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -613,6 +613,24 @@ $(srcdir)/outputs/mln_var.txt: $(srcdir)/examples/mln_var.stamp fi +$(srcdir)/examples/neighborhood_iterator.stamp: examples/neighborhood_iterator.cc + @rm -f $@.tmp + @touch $@.tmp + $(MAKE) $(AM_MAKEFLAGS) neighborhood_iterator$(EXEEXT) + ./neighborhood_iterator$(EXEEXT) >$(srcdir)/outputs/neighborhood_iterator.txt.tmp + mv $(srcdir)/outputs/neighborhood_iterator.txt.tmp $(srcdir)/outputs/neighborhood_iterator.txt + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/neighborhood_iterator.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/neighborhood_iterator.stamp + +$(srcdir)/outputs/neighborhood_iterator.txt: $(srcdir)/examples/neighborhood_iterator.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + $(srcdir)/examples/parray-append.stamp: examples/parray-append.cc @rm -f $@.tmp @touch $@.tmp @@ -971,3 +989,21 @@ $(srcdir)/outputs/win-create-2.txt: $(srcdir)/examples/win-create-2.stamp rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi + + +$(srcdir)/examples/window_iterator.stamp: examples/window_iterator.cc + @rm -f $@.tmp + @touch $@.tmp + $(MAKE) $(AM_MAKEFLAGS) window_iterator$(EXEEXT) + ./window_iterator$(EXEEXT) >$(srcdir)/outputs/window_iterator.txt.tmp + mv $(srcdir)/outputs/window_iterator.txt.tmp $(srcdir)/outputs/window_iterator.txt + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/window_iterator.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/window_iterator.stamp + +$(srcdir)/outputs/window_iterator.txt: $(srcdir)/examples/window_iterator.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index 3a10c8a..e81f600 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -1,20 +1,24 @@ /*! \page examples Examples -\section examplesneighb Neighborhoods - -\li \link demos/genericity/neighborhood/neighborhood.cc Common neighborhoods \endlink -\li \link demos/genericity/neighborhood/duality.cc Dual neighborhoods \endlink -\li \link demos/genericity/neighborhood/permissive.cc Custom neighborhoods \endlink +\section examplesgraph Graphs +\li \link demos/graph/region_adjacency_graph.cc Region Adjacency Graph \endlink \section examplesmorpher Image Morphers \li \link doc/examples/transformed_image.cc Image domain translation. \endlink \li \link doc/examples/extended_image.cc Image domain extension/shrinking. \endlink \li \link doc/examples/sub_image.cc Image domain restriction. \endlink -\section examplesgraph Graphs -\li \link demos/graph/region_adjacency_graph.cc Region Adjacency Graph \endlink - \section examplesinterpixel Inter-pixel Processings \li \link demos/inter_pixel/inter_pixel.cc Watershed \endlink +\section examplesneighb Neighborhoods + +\li \link doc/examples/neighborhood_iterator.cc Iteration w.r.t. a neighborhood \endlink +\li \link demos/genericity/neighborhood/neighborhood.cc Common neighborhoods \endlink +\li \link demos/genericity/neighborhood/duality.cc Dual neighborhoods \endlink +\li \link demos/genericity/neighborhood/permissive.cc Custom neighborhoods \endlink + +\section exampleswin Windows +\li \link doc/examples/window_iterator.cc Iteration w.r.t. a window \endlink + */ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index 180b32c..52c48dc 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -35,6 +35,7 @@ EXAMPLES = \ $(srcdir)/examples/labeling-compute.cc \ $(srcdir)/examples/logical-not.cc \ $(srcdir)/examples/mln_var.cc \ + $(srcdir)/examples/neighborhood_iterator.cc \ $(srcdir)/examples/parray-append.cc \ $(srcdir)/examples/parray-bbox.cc \ $(srcdir)/examples/paste-call-1.cc \ @@ -85,4 +86,5 @@ EXAMPLES = \ $(srcdir)/examples/tuto4/site_set_create.cc \ $(srcdir)/examples/tuto4_genericity_and_algorithms.cc \ $(srcdir)/examples/win-create-1.cc \ - $(srcdir)/examples/win-create-2.cc + $(srcdir)/examples/win-create-2.cc \ + $(srcdir)/examples/window_iterator.cc diff --git a/milena/doc/examples/neighborhood_iterator.cc b/milena/doc/examples/neighborhood_iterator.cc new file mode 100644 index 0000000..6c865fa --- /dev/null +++ b/milena/doc/examples/neighborhood_iterator.cc @@ -0,0 +1,40 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/debug/iota.hh> + +// Example specific header. +#include <doc/tools/sample_utils.hh> + + +int main() +{ + using namespace mln; + + //! [Input image] + typedef image2d<bool> I; + I ima(5,5); + debug::iota(ima, 100); + //! [Input image] + + { + //! [Iteration over a site] + point2d p(2,2); + mln_niter_(neighb2d) q(c4(), p); + for_all(q) + ; // Do something here. + //! [Iteration over a site] + } + + { + //! [Iteration over a domain] + mln_piter_(I) p(ima.domain()); + mln_niter_(neighb2d) q(c4(), p); + + for_all(p) + for_all(q) + ; // Do something here. + //! [Iteration over a domain] + } +} + + diff --git a/milena/doc/examples/window_iterator.cc b/milena/doc/examples/window_iterator.cc new file mode 100644 index 0000000..a709cc6 --- /dev/null +++ b/milena/doc/examples/window_iterator.cc @@ -0,0 +1,40 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/debug/iota.hh> + +// Example specific header. +#include <doc/tools/sample_utils.hh> + + +int main() +{ + using namespace mln; + + //! [Input image] + typedef image2d<bool> I; + I ima(5,5); + debug::iota(ima, 100); + //! [Input image] + + { + //! [Iteration over a site] + point2d p(2,2); + mln_qiter_(window2d) q(win_c4p(), p); + for_all(q) + ; // Do something here. + //! [Iteration over a site] + } + + { + //! [Iteration over a domain] + mln_piter_(I) p(ima.domain()); + mln_qiter_(window2d) q(win_c4p(), p); + + for_all(p) + for_all(q) + ; // Do something here. + //! [Iteration over a domain] + } +} + + diff --git a/milena/doc/mln/core/neighb.dox b/milena/doc/mln/core/neighb.dox index 1156e3f..1748928 100644 --- a/milena/doc/mln/core/neighb.dox +++ b/milena/doc/mln/core/neighb.dox @@ -1,9 +1,40 @@ /*! \defgroup modneighb Neighborhoods - * - * \brief All the predefined generic neighborhoods. - * - * \ingroup modtypes - */ + + \brief All the predefined generic neighborhoods. + + In the following sections, the common interface of Milena + neighborhood types is detailed. Methods and routines detailed + hereinafter are considered as generic and work for any + neighborhoods. + + \section docitereltneighb Iterate over elements in a neighborhood + + A neighborhood is always centered on a site. Sites parts of + neighborhoods are computed relatively from the neighborhood central + site. + + A generic way of iterating over neighborhood elements is to use + mln_niter() macro to declare an iterator. + + \snippet neighborhood_iterator.cc Iteration over a site + + A neighborhood iterator is defined upon a neighborhood and its + centeral site. The central site may also be a site iterator. + + \snippet neighborhood_iterator.cc Iteration over a domain + + \c p is a site iterator over all the sites of the image \c ima. \c + q, being a neighborhood iterator centered on that iterator, is + automatically updated and centered to the current site pointed by \p + p. + + A full example is available in \link neighborhood_iterator.cc + neighborhood_iterator.cc \endlink + + \note In Milena, neighborhoods never include the central site. + + \ingroup modtypes +*/ /*! \defgroup modneighb1d 1D neighborhoods * diff --git a/milena/doc/mln/win/win.dox b/milena/doc/mln/win/win.dox index a7e9431..2ce3cb1 100644 --- a/milena/doc/mln/win/win.dox +++ b/milena/doc/mln/win/win.dox @@ -1,9 +1,38 @@ /*! \defgroup modwin Windows - * - * \brief All the predefined generic windows. - * - * \ingroup modtypes - */ + + \brief All the predefined generic windows. + + In the following sections, the common interface of Milena window + types is detailed. Methods and routines detailed hereinafter are + considered as generic and work for any window. + + \section docitereltwin Iterate over elements in a window + + A window is always centered on a site. Sites parts of windows are + computed relatively from the window central site. + + A generic way of iterating over window elements is to use + mln_qiter() macro to declare an iterator. + + \snippet window_iterator.cc Iteration over a site + + A window iterator is defined upon a window and its centeral + site. The central site may also be a site iterator. + + \snippet window_iterator.cc Iteration over a domain + + \c p is a site iterator over all the sites of the image \c ima. \c + q, being a window iterator centered on that iterator, is + automatically updated and centered to the current site pointed by \p + p. + + A full example is available in \link window_iterator.cc + window_iterator.cc \endlink + + \note In Milena, windows may include the central site. + + \ingroup modtypes +*/ /*! \defgroup modwin1d 1D windows * diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 0ff7b94..346db79 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -35,6 +35,7 @@ OUTPUTS = \ $(srcdir)/outputs/labeling-compute.txt \ $(srcdir)/outputs/logical-not.txt \ $(srcdir)/outputs/mln_var.txt \ + $(srcdir)/outputs/neighborhood_iterator.txt \ $(srcdir)/outputs/parray-append.txt \ $(srcdir)/outputs/parray-bbox.txt \ $(srcdir)/outputs/paste-call-1.txt \ @@ -54,4 +55,5 @@ OUTPUTS = \ $(srcdir)/outputs/tuto4_point2d.txt \ $(srcdir)/outputs/tuto4_site_set_create.txt \ $(srcdir)/outputs/win-create-1.txt \ - $(srcdir)/outputs/win-create-2.txt + $(srcdir)/outputs/win-create-2.txt \ + $(srcdir)/outputs/window_iterator.txt diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/neighborhood_iterator.txt similarity index 100% copy from milena/doc/outputs/accu-right-instantiation.txt copy to milena/doc/outputs/neighborhood_iterator.txt diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/window_iterator.txt similarity index 100% copy from milena/doc/outputs/accu-right-instantiation.txt copy to milena/doc/outputs/window_iterator.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 5cc70df..9fe1c47 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -60,6 +60,7 @@ PROGRAMS_examples = \ labeling-compute \ logical-not \ mln_var \ + neighborhood_iterator \ parray-append \ parray-bbox \ paste \ @@ -68,6 +69,7 @@ PROGRAMS_examples = \ predicate-1 \ sub_image \ transformed_image \ + window_iterator \ win-create-1 \ win-create-2 @@ -127,6 +129,7 @@ ima_size_SOURCES = examples/ima-size.cc labeling_compute_SOURCES = examples/labeling-compute.cc logical_not_SOURCES = examples/logical-not.cc mln_var_SOURCES = examples/mln_var.cc +neighborhood_iterator_SOURCES = examples/neighborhood_iterator.cc parray_append_SOURCES = examples/parray-append.cc parray_bbox_SOURCES = examples/parray-bbox.cc paste_SOURCES = examples/paste.cc @@ -135,6 +138,7 @@ point_1_SOURCES = examples/point-1.cc predicate_1_SOURCES = examples/predicate-1.cc sub_image_SOURCES = examples/sub_image.cc transformed_image_SOURCES = examples/transformed_image.cc +window_iterator_SOURCES = examples/window_iterator.cc win_create_1_SOURCES = examples/win-create-1.cc win_create_2_SOURCES = examples/win-create-2.cc -- 1.7.2.5

1 0

olena: olena-2.0-607-g2c7f276 doc/mainpage.dox: Update demo URL.
by Guillaume Lazzara 14 May '13

14 May '13

--- ChangeLog | 4 ++++ doc/mainpage.dox | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfd20e3..00a812d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mainpage.dox: Update demo URL. + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> * NEWS: Notify changes in data::convert prototype. diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 52f9c1e..49b5e72 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -48,7 +48,7 @@ \li Document Image Analysis </td> <td> - \li <a class="el" href="http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Demos">Online Demos</a> + \li <a class="el" href="http://olena.lrde.epita.fr/demos">Online Demos</a> \li Papers Related Programs \li Olena Powered Programs </td> -- 1.7.2.5

1 0

olena: olena-2.0-606-g3fee889 doc/DoxygenLayout.xml: Update demo URL.
by Guillaume Lazzara 14 May '13

14 May '13

--- milena/ChangeLog | 4 ++++ milena/doc/DoxygenLayout.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 89d615b..4d2da20 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-05-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/DoxygenLayout.xml: Update demo URL. + 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/labeling/labeling.dox: Write general documentation on diff --git a/milena/doc/DoxygenLayout.xml b/milena/doc/DoxygenLayout.xml index cc73c43..aa8e7d9 100644 --- a/milena/doc/DoxygenLayout.xml +++ b/milena/doc/DoxygenLayout.xml @@ -22,7 +22,7 @@ </tab> <tab type="examples" visible="yes" title="Full Examples" intro=""/> <tab type="user" url="@ref examples" title="Examples"/> - <tab type="user" url="http://caroussel.lrde.epita.fr/olena/demos" title="Demos"/> + <tab type="user" url="http://olena.lrde.epita.fr/demos" title="Demos"/> <tab type="user" url="http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Publications" title="Publications"/> </navindex> -- 1.7.2.5

1 0

olena: branch fix/xy-cut-warnings created: olena-2.0-553-g2c9fdb8
by git＠lrde.epita.fr 14 May '13

14 May '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 fix/xy-cut-warnings has been created at 2c9fdb879015b23b893c1d13630fedb0a314fd98 (commit) - Log ----------------------------------------------------------------- 2c9fdb8 tests/layout/xy_cut.cc: Remove useless arguments in main(). ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0