Olena-patches May 2013

olena-patches@lrde.epita.fr

6 participants
133 discussions

olena: olena-2.0-604-g899735d doc/ref-guide.tex: Mention *_without_localization routines in reference guide.

by Guillaume Lazzara

--- milena/ChangeLog | 5 +++++ milena/doc/ref-guide.tex | 37 ++++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 31c5566..c18309f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/ref-guide.tex: Mention *_without_localization routines in + reference guide. + +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Document sub_image morpher. * doc/examples-outputs.mk, diff --git a/milena/doc/ref-guide.tex b/milena/doc/ref-guide.tex index b26929a..86b9b05 100644 --- a/milena/doc/ref-guide.tex +++ b/milena/doc/ref-guide.tex @@ -1312,27 +1312,34 @@ logical::not\_inplace() & Point-wise "logical not" \\ First, create an image: \doxycode[1]{fill-call-1} -Memory has been allocated so data can be stored but site values -have not been initialized yet. So we fill \var{imga} with the value 'a': +Memory has been allocated so data can be stored but site values have +not been initialized yet. So we fill \var{imga} with the value 'a': \doxycode[2]{fill-call-1} -The \code{fill()} algorithm is located in the sub-namespace "\namespace{mln::data}" since this -algorithm deals with the site values. +data::fill() always preserves the location of the values while filling +an image with another. If location does not matter, see +data::fill\_without\_localization. -The full name of this routine is \code{mln::data::fill()}. -To access to a particular algorithm, the proper file shall be included. -The file names of algorithms strictly map their C++ name; so +The \code{fill()} algorithm is located in the sub-namespace +"\namespace{mln::data}" since this algorithm deals with the site +values. + +The full name of this routine is \code{mln::data::fill()}. To access +to a particular algorithm, the proper file shall be included. The +file names of algorithms strictly map their C++ name; so \namespace{mln::data::fill} is defined in the file \header{mln/data/fill.hh}. %---------------- \subsection*{Note} -Most algorithms in Olena are constructed following the classical scheme: "output -algo(input)", where the input image is only read. However some few algorithms -take an input image in order to modify it. To enforce this particular feature, -the user shall explicitly state that the image is provided so that its data is -modified "read/write". The algorithm call shall be \code{data::fill(ima.rw(), -val)}. When forgetting the \code{rw()} call, it does not compile. +Most algorithms in Olena are constructed following the classical +scheme: "output algo(input)", where the input image is only +read. However some few algorithms take an input image in order to +modify it. To enforce this particular feature, the user shall +explicitly state that the image is provided so that its data is +modified "read/write". The algorithm call shall be +\code{data::fill(ima.rw(), val)}. When forgetting the \code{rw()} +call, it does not compile. \doxycode[3]{fill-call-1} @@ -1345,6 +1352,10 @@ data for the sites (5, 5) to (14, 14) (so it has 100 sites). Output: \doxyoutput{paste-call-1} +data::paste() always preserves the location of the values while +pasting an image into another. If location does not matter, see +data::paste\_without\_localization. + %Before pasting, the couple of images looked like: %FIXME : ajouter des zolies zimages. -- 1.7.2.5

11 years, 7 months

olena: olena-2.0-603-gf6801ca Document sub_image morpher.

by Guillaume Lazzara

* doc/examples-outputs.mk, * doc/examples.mk, * doc/figures.mk, * doc/outputs.mk, * doc/programs-examples.mk: Regen. * doc/examples.dox: Revamp layout and add link to the new sub_image example. * doc/examples/sub_image.cc, * doc/outputs/sub_image.txt, * doc/figures/sub_image-1.pbm, * doc/figures/sub_image-2.pbm: New. * mln/core/image/dmorph/sub_image.hh: Write documentation. --- milena/ChangeLog | 20 +++++++++ milena/doc/examples-outputs.mk | 18 ++++++++ milena/doc/examples.dox | 9 ++-- milena/doc/examples.mk | 1 + milena/doc/examples/sub_image.cc | 46 ++++++++++++++++++++ milena/doc/figures.mk | 13 ++++++ .../figures/{logical-not-1.pbm => sub_image-1.pbm} | 2 +- .../figures/{logical-not-1.pbm => sub_image-2.pbm} | Bin 117 -> 115 bytes milena/doc/outputs.mk | 1 + ...{accu-right-instantiation.txt => sub_image.txt} | 0 milena/doc/programs-examples.mk | 2 + milena/mln/core/image/dmorph/sub_image.hh | 37 +++++++++++++--- 12 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 milena/doc/examples/sub_image.cc copy milena/doc/figures/{logical-not-1.pbm => sub_image-1.pbm} (95%) copy milena/doc/figures/{logical-not-1.pbm => sub_image-2.pbm} (92%) copy milena/doc/outputs/{accu-right-instantiation.txt => sub_image.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 039f880..31c5566 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,23 @@ +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Document sub_image morpher. + + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/figures.mk, + * doc/outputs.mk, + * doc/programs-examples.mk: Regen. + + * doc/examples.dox: Revamp layout and add link to the new sub_image + example. + + * doc/examples/sub_image.cc, + * doc/outputs/sub_image.txt, + * doc/figures/sub_image-1.pbm, + * doc/figures/sub_image-2.pbm: New. + + * mln/core/image/dmorph/sub_image.hh: Write documentation. + 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/routine/duplicate.hh: Document this routine. diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 1136c55..10645fb 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -721,6 +721,24 @@ $(srcdir)/outputs/predicate-1.txt: $(srcdir)/examples/predicate-1.stamp fi +$(srcdir)/examples/sub_image.stamp: examples/sub_image.cc + @rm -f $@.tmp + @touch $@.tmp + $(MAKE) $(AM_MAKEFLAGS) sub_image$(EXEEXT) + ./sub_image$(EXEEXT) >$(srcdir)/outputs/sub_image.txt.tmp + mv $(srcdir)/outputs/sub_image.txt.tmp $(srcdir)/outputs/sub_image.txt + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/sub_image.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/sub_image.stamp + +$(srcdir)/outputs/sub_image.txt: $(srcdir)/examples/sub_image.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + $(srcdir)/examples/transformed_image.stamp: examples/transformed_image.cc @rm -f $@.tmp @touch $@.tmp diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index 1acb132..3a10c8a 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -1,19 +1,20 @@ /*! \page examples Examples -\section examplesgenericity Genericity +\section examplesneighb Neighborhoods -\li \link demos/genericity/neighborhood/neighborhood.cc Classical neighborhoods \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 -\li \link demos/inter_pixel/inter_pixel.cc Inter-pixel processings \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 */ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index 12b9419..180b32c 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -41,6 +41,7 @@ EXAMPLES = \ $(srcdir)/examples/paste.cc \ $(srcdir)/examples/point-1.cc \ $(srcdir)/examples/predicate-1.cc \ + $(srcdir)/examples/sub_image.cc \ $(srcdir)/examples/transformed_image.cc \ $(srcdir)/examples/trash/accu.cc \ $(srcdir)/examples/trash/box.cc \ diff --git a/milena/doc/examples/sub_image.cc b/milena/doc/examples/sub_image.cc new file mode 100644 index 0000000..bcc4795 --- /dev/null +++ b/milena/doc/examples/sub_image.cc @@ -0,0 +1,46 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/sub_image.hh> + +// Example specific header. +#include <doc/tools/sample_utils.hh> + +int main() +{ + using namespace mln; + + //! [Input image] + bool vals[5][5] = { { 0, 0, 0, 0, 0 }, + { 0, 1, 1, 1, 0 }, + { 0, 1, 1, 1, 0 }, + { 0, 1, 1, 1, 0 }, + { 0, 0, 0, 0, 0 } }; + typedef image2d<bool> I; + I ima = make::image(vals); + //! [Input image] + + doc::pbmsave(ima, "sub_image"); + + //! [Sub domain] + // Sub domain considered for further processing. + box2d sub_domain = make::box2d(1,1, 3,3); + //! [Sub domain] + + //! [Operator pipe] + // Create a sub image using '|' operator (short way). + mln::sub_image<I,mln::box2d> sub = ima | sub_domain; + //! [Operator pipe] + + //! [Sub_image constructor] + // Create a sub image using sub_image constructor. + mln::sub_image<I,mln::box2d> sub2 = sub_image<I,box2d>(ima, sub_domain); + //! [Sub_image constructor] + + doc::pbmsave(sub, "sub_image"); + + /* sub == sub2 == { + { 2, 2, 2 }, + { 2, 2, 2 }, + { 2, 2, 2 }, + } + */ +} diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index c3e72f1..e2ec7fd 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -87,6 +87,16 @@ $(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp $(MAKE) $(AM_MAKEFLAGS) $<; \ fi +SUB_IMAGE_FIGURES = \ + $(srcdir)/figures/sub_image-1.pbm \ + $(srcdir)/figures/sub_image-2.pbm +$(SUB_IMAGE_FIGURES): $(srcdir)/examples/sub_image.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + TUTO2_FIRST_IMAGE_FIGURES = \ $(srcdir)/figures/tuto2_first_image-1.pbm $(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp @@ -141,6 +151,7 @@ FIGURES = \ $(IMA2D_ROT_FIGURES) \ $(LABELING_COMPUTE_FIGURES) \ $(LOGICAL_NOT_FIGURES) \ + $(SUB_IMAGE_FIGURES) \ $(TUTO2_FIRST_IMAGE_FIGURES) \ $(TUTO3_COLORIZE_FIGURES) \ $(TUTO3_RW_IMAGE_FIGURES) \ @@ -154,6 +165,8 @@ PBM_FIGURES = \ $(srcdir)/figures/logical-not-1.pbm \ $(srcdir)/figures/logical-not-2.pbm \ $(srcdir)/figures/logical-not-3.pbm \ + $(srcdir)/figures/sub_image-1.pbm \ + $(srcdir)/figures/sub_image-2.pbm \ $(srcdir)/figures/tuto2_first_image-1.pbm \ $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm diff --git a/milena/doc/figures/logical-not-1.pbm b/milena/doc/figures/sub_image-1.pbm similarity index 95% copy from milena/doc/figures/logical-not-1.pbm copy to milena/doc/figures/sub_image-1.pbm index 2faf6d4..3f76de9 100644 --- a/milena/doc/figures/logical-not-1.pbm +++ b/milena/doc/figures/sub_image-1.pbm @@ -2,4 +2,4 @@ P4 # Generated by Milena 1.0 http://olena.lrde.epita.fr # EPITA Research and Development Laboratory (LRDE) 5 5 -XšXšš \ No newline at end of file +øø \ No newline at end of file diff --git a/milena/doc/figures/logical-not-1.pbm b/milena/doc/figures/sub_image-2.pbm similarity index 92% copy from milena/doc/figures/logical-not-1.pbm copy to milena/doc/figures/sub_image-2.pbm index 2faf6d4..1b9411e 100644 Binary files a/milena/doc/figures/logical-not-1.pbm and b/milena/doc/figures/sub_image-2.pbm differ diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 40fa6c3..0ff7b94 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -41,6 +41,7 @@ OUTPUTS = \ $(srcdir)/outputs/paste.txt \ $(srcdir)/outputs/point-1.txt \ $(srcdir)/outputs/predicate-1.txt \ + $(srcdir)/outputs/sub_image.txt \ $(srcdir)/outputs/transformed_image.txt \ $(srcdir)/outputs/tuto2_first_image.txt \ $(srcdir)/outputs/tuto3_colorize.txt \ diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/sub_image.txt similarity index 100% copy from milena/doc/outputs/accu-right-instantiation.txt copy to milena/doc/outputs/sub_image.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 42610c4..5cc70df 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -66,6 +66,7 @@ PROGRAMS_examples = \ paste-call-1 \ point-1 \ predicate-1 \ + sub_image \ transformed_image \ win-create-1 \ win-create-2 @@ -132,6 +133,7 @@ paste_SOURCES = examples/paste.cc paste_call_1_SOURCES = examples/paste-call-1.cc 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 win_create_1_SOURCES = examples/win-create-1.cc win_create_2_SOURCES = examples/win-create-2.cc diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh index 15cf254..b48b25a 100644 --- a/milena/mln/core/image/dmorph/sub_image.hh +++ b/milena/mln/core/image/dmorph/sub_image.hh @@ -96,14 +96,32 @@ namespace mln - /// Image having its domain restricted by a site set. - /// - /// \ingroup modimagedomainmorpher - // + /*! Image having its domain restricted by a site set. + + <table border=0> + <tr> + <td> \image html sub_image-1.png "Input"</td> + <td> \f$\rightarrow\f$ </td> + <td> \image html sub_image-2.png "Sub image considered from input." </td> + </tr> + </table> + + Considering the following sub domain in input image: + \snippet sub_image.cc Sub domain + + The output image can be obtained using the two following ways: + \snippet sub_image.cc Operator pipe + \snippet sub_image.cc Sub_image constructor + + A full example is available in \ref examples section or directly + \link doc/examples/sub_image.cc here \endlink. + + \ingroup modimagedomainmorpher + */ template <typename I, typename S> class sub_image : public internal::image_domain_morpher< I, - S, - sub_image<I,S> > + S, + sub_image<I,S> > { public: /// Skeleton. @@ -130,12 +148,17 @@ namespace mln - + /*! \brief Shortcut to create an image restricted by a site set. + \relates mln::sub_image + */ template <typename I, typename S> sub_image<const I, S> operator|(const Image& ima, const Site_Set<S>& pset); + /*! \brief Shortcut to create an image restricted by a site set. + \relates mln::sub_image + */ template <typename I, typename S> sub_image<I, S> operator|(Image& ima, const Site_Set<S>& pset); -- 1.7.2.5

11 years, 7 months

olena: branch exp/upscale updated: olena-2.0-510-g19441a4

by git＠lrde.epita.fr

11 years, 7 months

olena: branch exp/TL updated: olena-2.0-637-g57e5da7

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/TL has been updated via 57e5da750504563b272d09e46958d139abbd66fe (commit) via 605d7143a0a888c09b51519aae4cae138bdb0b91 (commit) via 19441a466fb310216378df22991de802e2d93dc5 (commit) via e7c6040cc2a05d4393803aea488c258558001297 (commit) via 9ab50d8e723ac787402dd898ecf3c33a02332bd5 (commit) from 8b003049116ad7ea9e544118feb81b82b576b029 (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 ----------------------------------------------------------------- 57e5da7 milena/mln/binarization/tmms_hysteresis.hh: Temporary definition of tmms hysteresis. 605d714 Merge branch 'exp/upscale' into exp/TL e7c6040 milena/mln/upscaling/upscaling_bicubic_2x.hh: Add function to upscale x2 with bicubic interpolation. ----------------------------------------------------------------------- Summary of changes: milena/mln/binarization/tmms_hysteresis.hh | 518 ++++++++++++++------------ milena/mln/upscaling/upscaling_bicubic_2x.hh | 149 ++++++++ 2 files changed, 433 insertions(+), 234 deletions(-) create mode 100644 milena/mln/upscaling/upscaling_bicubic_2x.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena: olena-2.0-637-g57e5da7 milena/mln/binarization/tmms_hysteresis.hh: Temporary definition of tmms hysteresis.

by myriam robert-seidowsky

--- milena/mln/binarization/tmms_hysteresis.hh | 518 +++++++++++++++------------- 1 files changed, 284 insertions(+), 234 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 64b5dbf..f80caf5 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -23,19 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_BINARIZATION_TMMS_HH -# define MLN_BINARIZATION_TMMS_HH - -# include <mln/morpho/all.hh> -//# include <mln/labeling/values.hh> -#include <mln/labeling/blobs.hh> - +#ifndef MLN_BINARIZATION_TMMS_HYSTERESIS_HH +# define MLN_BINARIZATION_TMMS_HYSTERESIS_HH /// \file /// -/// \brief Binarization using TMMS algorithm (see "Text Segmentation -/// in Natural Scenes Using Toggle-Mapping" from icip09 for more -/// details) combined with hysteresis. +/// \brief Binarization using TMMS algorithm combined with hysteresis. + + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/morpho/dilation.hh> +# include <mln/morpho/erosion.hh> +# include <mln/labeling/blobs.hh> namespace mln @@ -44,280 +45,329 @@ namespace mln namespace binarization { - /** - Binarize \p in_image by the use of TMMS algorithm (see "Text - Segmentation in Natural Scenes Using Toggle-Mapping" from icip09 - for more details). - \tparam image_in_ the input image (not modified by the algorithm. + /*! + Binarize \p input by the use of TMMS algorithm (see "Text + Segmentation in Natural Scenes Using Toggle-Mapping" from + icip09 for more details \cite fabrizio2009icip). This version + is combined with hysteresis. + + \param[in] input the input image. - \tparam struct_element the structuring element used to compute - erosion and dilation of input image (During TMMS algorithm, input - image is mapped over two fuctions: an erosion and a dilation of - the input image). + \param[in] win the structuring element used to compute erosion + and dilation of input image (During TMMS algorithm, input image + is mapped over two fuctions: an erosion and a dilation of the + input image). - \param c_min the min contrast allowed to extract feature. + \param[in] c_min the min contrast allowed to extract feature. - \return an image with "foreground" marked with the highest - possible color (hc), the "background" marked with the lower - possible color (lc) and homogeneous regions of the image marked - with the color (hc+lc)/2. (This will fail with two colors images, - but it seems to be a bit stupid to try to binarize two color - images?) + \return an image with "foreground" marked with the highest + possible color (hc), the "background" marked with the lowest + possible color (lc) and homogeneous regions of the image marked + with the color (hc+lc)/2. (This will fail with two colors + images, but it seems to be a bit stupid to try to binarize two + color images?) - \author J. Fabrizio - */ + \author J. Fabrizio + + \ingroup modroutines + */ template<typename I, typename W> mln_concrete(I) - tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, - const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent); + tmms_hysteresis(const Image& input_, const Window<W>& win, + const mln_value(I)& c_min_low, + const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent); + # ifndef MLN_INCLUDE_ONLY + // Implementations + namespace impl { - + namespace generic { - + template<typename I, typename W> mln_concrete(I) - tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, - const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent) + tmms_hysteresis(const Image& input_, const Window<W>& win_, + const mln_value(I)& c_min_low, + const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) { - mln_trace("binarization::tmms_hysteresis"); - - const I& in_image = exact(in_image_); + mln_trace("mln::binarization::impl::generic::tmms_hysteresis"); - mln_concrete(I) low_image; - mln_concrete(I) high_image; + const I& input = exact(input_); + const W& win = exact(win_); - mln_concrete(I) dilation = mln::morpho::dilation(in_image, struct_element); - mln_concrete(I) erosion = mln::morpho::erosion(in_image, struct_element); + mln_precondition(input.is_valid()); + mln_precondition(win.is_valid()); - unsigned int nlabels; + typedef mln_value(I) V; - mln_piter(I) p(in_image.domain()); + mln_concrete(I) dilation = mln::morpho::dilation(input, win); + mln_concrete(I) erosion = mln::morpho::erosion(input, win); - initialize(low_image, in_image); - initialize(high_image, in_image); + mln_concrete(I) low_image; + initialize(low_image, input); + mln_concrete(I) high_image; + initialize(high_image, input); - typedef mln_value(I) V; + mln_piter(I) p(input.domain()); for_all(p) { V dil = dilation(p); // by def : dil>=ima>=ero V ero = erosion(p); - V ima = in_image(p); - - if ((V)(dil - ero)<c_min_low) low_image(p) = high_image(p) = med_level; - else if ((V)(dil - ero)<c_min_high) { - low_image(p) = med_level; - if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) - high_image(p) = max_level; - else - high_image(p) = min_level; - } else { - if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) - low_image(p) = high_image(p) = max_level; - else - low_image(p) = high_image(p) = min_level; - } + V ima = input(p); + + if ((V)(dil - ero) < c_min_low) + { + low_image(p) = med_level; + high_image(p) = med_level; + } + else if ((V)(dil - ero) < c_min_high) + { + low_image(p) = med_level; + if ((V)(dil - ima) < pourcent * ((V) (dil - ero)) / 100) + high_image(p) = max_level; + else + high_image(p) = min_level; + } + else + { + if ((V)(dil - ima) < pourcent * ((V)(dil - ero)) / 100) + { + low_image(p) = max_level; + high_image(p) = max_level; + } + else + { + low_image(p) = min_level; + high_image(p) = min_level; + } + } } - mln_ch_value(I, unsigned int) labels_high_images; - //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); - V *values = new V[nlabels]; + unsigned nlabels; + mln_ch_value(I, unsigned) + labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); - for(unsigned int i=0;i<nlabels;i++) { - values[i]=med_level; - } + std::vector<V> values(nlabels + 1); - for_all(p) { - if (low_image(p)!=med_level) { - values[labels_high_images(p)]=low_image(p); - } - } + for (unsigned i = 0; i <= nlabels ; i++) + values[i] = med_level; - for_all(p) { - if (low_image(p)==med_level) { - low_image(p)=values[labels_high_images(p)]; - } - } - delete(values); + for_all(p) + if (low_image(p) != med_level) + values[labels_high_images(p)] = low_image(p); + + for_all(p) + if (low_image(p) == med_level) + low_image(p) = values[labels_high_images(p)]; return low_image; } } // end of namespace mln::binarization::impl::generic - - template<typename I, typename W> - mln_concrete(I) - tmms_hysteresis_fastest(const Image& in_image_, const Window<W>& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, - const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent) - { - mln_trace("binarization::tmms_hysteresis"); - - const I& in_image = exact(in_image_); - mln_concrete(I) low_image; - mln_concrete(I) high_image; - mln_concrete(I) dilation = mln::morpho::dilation(in_image, struct_element); - mln_concrete(I) erosion = mln::morpho::erosion(in_image, struct_element); + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_fastest(const Image& input_, const Window<W>& win_, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) + { + mln_trace("mln::binarization::impl::tmms_hysteresis_fastest"); + + const I& input = exact(input_); + const W& win = exact(win_); + + mln_precondition(input.is_valid()); + mln_precondition(win.is_valid()); + + typedef mln_value(I) V; + + mln_concrete(I) dilation = mln::morpho::dilation(input, win); + mln_concrete(I) erosion = mln::morpho::erosion(input, win); + + // Checking border sizes. + border::resize(dilation, input.border()); + border::resize(erosion, input.border()); + mln_assertion(input.border() == dilation.border()); + mln_assertion(input.border() == erosion.border()); + + mln_concrete(I) low_image; + initialize(low_image, input); + mln_concrete(I) high_image; + initialize(high_image, input); + + unsigned nrows = geom::nrows(input); + unsigned ncols = geom::ncols(input); + for (unsigned row = 0; row < nrows; ++row) + { + const V *p_input = &(input.at_(row, 0)); + const V *p_dilation = &(dilation.at_(row, 0)); + const V *p_erosion = &(erosion.at_(row, 0)); + V *p_low_image = &(low_image.at_(row, 0)); + V *p_high_image = &(high_image.at_(row, 0)); + + for (unsigned col = 0; col < ncols; ++col) + { + V dil = *p_dilation; // by def : dil>=ima>=ero + V ero = *p_erosion; + V ima = *p_input; + + if ((V)(dil - ero) < c_min_low) + { + *p_low_image = med_level; + *p_high_image = med_level; + } + else if ((V)(dil - ero) < c_min_high) + { + *p_low_image = med_level; + + if ((V)(dil - ima) < (V)(pourcent * (dil - ero) / 100)) + *p_high_image = max_level; + else + *p_high_image = min_level; + } + else + { + if ((V)(dil - ima) < (V)(pourcent * (dil - ero) / 100)) + { + *p_low_image = max_level; + *p_high_image = max_level; + } + else + { + *p_low_image = min_level; + *p_high_image = min_level; + } + } + + ++p_input; + ++p_dilation; + ++p_erosion; + ++p_low_image; + ++p_high_image; + } + } + + unsigned nlabels; + mln_ch_value(I, unsigned) + labels_high_images = mln::labeling::blobs(high_image, c4(), nlabels); + + std::vector<V> values(nlabels + 1); + + for(unsigned i = 0; i <= nlabels; ++i) + values[i] = med_level; + + mln_piter(I) p(input.domain()); + for_all(p) + if (low_image(p) != med_level) + values[labels_high_images(p)] = low_image(p); + + for_all(p) + if (low_image(p) == med_level) + low_image(p) = values[labels_high_images(p)]; + + return low_image; + } - unsigned int nlabels; + }// end of namespace mln::binarization::impl - initialize(low_image, in_image); - initialize(high_image, in_image); - border::resize(dilation, in_image.border()); - border::resize(erosion, in_image.border()); - if (in_image.border()!=dilation.border() || - in_image.border()!=erosion.border()) - { - std::abort(); - } - - typedef mln_value(I) V; - - unsigned nrows = geom::nrows(in_image); - unsigned ncols = geom::ncols(in_image); - for (unsigned row = 0; row < nrows; row += 1) - { - const V *p_in_image=&(in_image.at_(row, 0)); - const V *p_dilation=&(dilation.at_(row, 0)); - const V *p_erosion=&(erosion.at_(row, 0)); - V *p_low_image=&(low_image.at_(row, 0)); - V *p_high_image=&(high_image.at_(row, 0)); - - for (unsigned col = 0; col < ncols; col += 1) - { - V dil = *p_dilation; // by def : dil>=ima>=ero - V ero = *p_erosion; - V ima = *p_in_image; - - if ((V)(dil - ero)<c_min_low) (*p_low_image) = (*p_high_image) = med_level; - else if ((V)(dil - ero)<c_min_high) { - (*p_low_image) = med_level; - if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) - (*p_high_image) = max_level; - else - (*p_high_image) = min_level; - } else { - if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) - (*p_low_image) = (*p_high_image) = max_level; - else - (*p_low_image) = (*p_high_image) = min_level; - } - p_in_image++; - p_dilation++; - p_erosion++; - p_low_image++; - p_high_image++; - } - } + // Dispatch - mln_ch_value(I, unsigned int) labels_high_images; - //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); - V *values = new V[nlabels]; + namespace internal + { - for(unsigned int i=0;i<nlabels;i++) { - values[i]=med_level; - } + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_dispatch(const I& ima, const W& win, + const mln_value(I)& c_min_low, + const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent, mln::trait::image::speed::any) + { + return impl::generic::tmms_hysteresis(ima, win, + c_min_low, c_min_high, + min_level, med_level, + max_level, pourcent); + } + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_dispatch(const I& ima, const W& win, + const mln_value(I)& c_min_low, + const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent, mln::trait::image::speed::fastest) + { + return impl::tmms_hysteresis_fastest(ima, win, + c_min_low, c_min_high, + min_level, med_level, + max_level, pourcent); + } + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_dispatch(const I& ima, const W& win, + const mln_value(I)& c_min_low, + const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) + { + return tmms_hysteresis_dispatch(ima, win, + c_min_low, c_min_high, + min_level, med_level, + max_level, pourcent, + mln_trait_image_speed(I)()); + } - mln_piter(I) p(in_image.domain()); - for_all(p) { - if (low_image(p)!=med_level) { - values[labels_high_images(p)]=low_image(p); - } - } + } //end of namespace namespace mln::binarization::internal - for_all(p) { - if (low_image(p)==med_level) { - low_image(p)=values[labels_high_images(p)]; - } - } - delete(values); - return low_image; - } - - }// end of namespace mln::binarization::impl - - namespace internal - { - - template<typename I, typename W> - mln_concrete(I) - tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent, mln::trait::image::speed::any) - { - return mln::binarization::impl::generic::tmms_hysteresis(ima, - struct_element, c_min_low, c_min_high, - min_level, med_level, max_level, pourcent); - } + // Facade - template<typename I, typename W> - mln_concrete(I) - tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent, mln::trait::image::speed::fastest) - { - return mln::binarization::impl::tmms_hysteresis_fastest(ima, - struct_element, c_min_low, c_min_high, - min_level, med_level, max_level, pourcent); - } - - template<typename I, typename W> - mln_concrete(I) - tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent) - { - return tmms_hysteresis_dispatch(ima, - struct_element, c_min_low, c_min_high, - min_level, med_level, max_level, pourcent, - mln_trait_image_speed(I)() - ); - } - - } //end of namespace namespace mln::binarization::internal - template<typename I, typename W> mln_concrete(I) - tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, - const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, - const mln_value(I)& min_level, - const mln_value(I)& med_level, - const mln_value(I)& max_level, - const int pourcent) + tmms_hysteresis(const Image& input_, const Window<W>& win_, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) { - const I& ima = exact(in_image_); - const W& win = exact(struct_element); - return mln::binarization::internal::tmms_hysteresis_dispatch(ima, - win, c_min_low, c_min_high, - min_level, med_level, max_level, pourcent); + mln_trace("mln::binarization::tmms_hysteresis"); + + const I& input = exact(input_); + const W& win = exact(win_); + + mln_precondition(input.is_valid()); + mln_precondition(win.is_valid()); + + return internal::tmms_hysteresis_dispatch(input, win, + c_min_low, c_min_high, + min_level, med_level, + max_level, pourcent); } # endif // ! MLN_INCLUDE_ONLY @@ -327,4 +377,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_BINARIZATION_TMMS_HH +#endif // ! MLN_BINARIZATION_TMMS_HYSTERESIS_HH -- 1.7.2.5

11 years, 7 months

olena: olena-2.0-636-g605d714 Merge branch 'exp/upscale' into exp/TL

by myriam robert-seidowsky

This is a merge commit message of the following branches: Merge: e7c6040 19441a4 Conflicts: milena/mln/upscaling/upscaling_bicubic_2x.hh milena/mln/upscaling/upscaling_bicubic_2x.hh | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --cc milena/mln/upscaling/upscaling_bicubic_2x.hh index 67ed639,e4c2a33..9d1e91e --- a/milena/mln/upscaling/upscaling_bicubic_2x.hh +++ b/milena/mln/upscaling/upscaling_bicubic_2x.hh @@@ -27,8 -27,8 +27,9 @@@ #define MLN_UPSCALING_UPSCALE_BICUBIC_2X_HH #include <mln/core/image/image2d.hh> + #include <cmath> + /// \file /// /// \brief upscale image x2 with bicubic interpolation. @@@ -71,19 -71,17 +72,19 @@@ namespace mln mln_trace("upscaling::upscaling_bicubic_x2"); const I& in_image = exact(in_image_); mln_precondition(in_image.is_valid()); - mln_domain(I) ext_domain(in_image.domain().pmin() * 2, - in_image.domain().pmax() * 2); - mln_concrete(I) output(ext_domain); - + mln_concrete(I) output(in_image.nrows()*2,in_image.ncols()*2); + data::fill(output, 0); mln_concrete(I) tmp; initialize(tmp, in_image); data::fill(tmp, 0); - int x, y, k, l; ++ int k, l; + - for (def::coord row = 1; row < in_image.nrows(); ++row) - for (def::coord col = 1; col < in_image.ncols(); ++col) { ++ + for (def::coord row = geom::min_row(in_image); row <= geom::max_row(in_image) ; ++row) + for (def::coord col = geom::min_col(in_image)+1; col < geom::max_col(in_image)-1; ++col) { opt::at(tmp, row, col) = tl_bicubic_interpol(in_image(point2d(row, col - 1)), in_image(point2d(row, col)), in_image(point2d(row, col + 1)), in_image(point2d(row, col + 2))); } hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

*****SPAM***** revenu supplementaire de EURO 30683 par mois

by olena-patches＠lrde.epita.fr

------------------ Début de Rapport SpamAssassin --------------------- Ce message est probablement du SPAM (message non sollicité envoyé en masse, publicité, escroquerie...). Cette notice a été ajoutée par le système d'analyse "SpamAssassin" sur votre serveur de courrier "goa.lrde.epita.fr", pour vous aider à identifier ce type de messages. Le système SpamAssassin ajoute un en-tête "X-Spam-Flag: YES" aux messages qu'il considère comme étant probablement du Spam. Vous pouvez si vous le souhaitez utiliser cette caractéristique pour régler un filtre dans votre logiciel de lecture de courrier, afin de détruire ou de classer à part ce type de message. Si ce robot a classifié incorrectement un message qui vous était destiné, ou pour toute question, veuillez contacter l'administrateur du système par e-mail à the administrator of that system . Voir http://spamassassin.apache.org/tag/ pour plus de détails (en anglais). Détails de l'analyse du message: (15.8 points, 5.0 requis) 3.3 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.148.233.229 listed in zen.spamhaus.org] 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: googlejob-france.com] 1.7 URIBL_DBL_SPAM Contains an URL listed in the DBL blocklist [URIs: googlejob-france.com] 1.6 URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist [URIs: googlejob-france.com] 3.5 BAYES_99 BODY: L'algorithme Bayésien a évalué la probabilité de spam entre 99 et 100% [score: 1.0000] 1.7 HELO_LH_HOME HELO_LH_HOME 0.0 HTML_MESSAGE BODY: HTML inclus dans le message 0.7 MIME_HTML_ONLY BODY: Le message possède uniquement des parties MIME text/html 1.0 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 MISSING_MID Missing Message-Id: header 0.0 TO_EQ_FM_HTML_ONLY To == From and HTML only -------------------- Fin de Rapport SpamAssassin --------------------- Le message original n'étant pas au format text brut, il est peut-être dangereux de l'ouvrir avec votre logiciel e-mail ; en particulier il pourrait contenir un virus, ou confirmer à l'expéditeur que votre adresse e-mail est active, et peut recevoir du spam. Si vous voulez lire ce message, et n'êtes pas certain de la sécurité de votre logiciel e-mail, il est plus prudent d'enregistrer ce message sur votre disque dur, et de l'afficher ensuite avec un éditeur de texte.

11 years, 7 months

olena: branch exp/newdoc updated: olena-2.0-602-g81f1b95

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated discards c55a823794f4f0cfaebd3e53911be7e8216e98fb (commit) discards 83bbddc126e6e94226cf51f60361baef1cfcdf0b (commit) via 81f1b95ffa4a93800125ac751de2086893bf4f0d (commit) via 0a09504ba4f2512f8c82cd73b954d97f859da57f (commit) via 38c46783a22cddd8b99524d1979c48f33e4de6d7 (commit) via 6850b80deff3dbc90abd13f8923f182a1ea201ac (commit) via 75a0e90175493882bd06f42658528143b5788129 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (c55a823794f4f0cfaebd3e53911be7e8216e98fb) \ N -- N -- N (81f1b95ffa4a93800125ac751de2086893bf4f0d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 81f1b95 mln/core/routine/duplicate.hh: Document this routine. 0a09504 Small fixes in documentation. 38c4678 Improve documentation of several macros. 6850b80 Fix missing parts of mln::box interface in documentation. 75a0e90 mln/core/var.hh: Document mln_VAR(). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 35 +++- milena/doc/mln/core/alias/box1d.dox | 4 +- milena/doc/mln/core/alias/box2d.dox | 4 +- milena/doc/mln/core/alias/box2d_h.dox | 4 +- milena/doc/mln/core/alias/box3d.dox | 4 +- milena/doc/mln/core/image/morphers.dox | 9 +- milena/mln/core/concept/iterator.hh | 17 ++- milena/mln/core/macros.hh | 363 ++++++++++++++++++++------------ milena/mln/core/pixter1d.hh | 2 - milena/mln/core/routine/duplicate.hh | 24 ++- milena/mln/core/var.hh | 6 +- milena/mln/data/transform.hh | 51 +++-- milena/mln/debug/trace.hh | 18 ++ milena/mln/io/pdf/load.hh | 12 +- milena/mln/trait/value_.hh | 87 +++++++- 15 files changed, 442 insertions(+), 198 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena: olena-2.0-602-g81f1b95 mln/core/routine/duplicate.hh: Document this routine.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/core/routine/duplicate.hh | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d5b38b1..039f880 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/routine/duplicate.hh: Document this routine. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in documentation. * doc/mln/core/image/morphers.dox: Add a reference to duplicate(). diff --git a/milena/mln/core/routine/duplicate.hh b/milena/mln/core/routine/duplicate.hh index fb79569..fe814c5 100644 --- a/milena/mln/core/routine/duplicate.hh +++ b/milena/mln/core/routine/duplicate.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -38,13 +39,20 @@ namespace mln { - /// Duplicate the image \p model with the values of the image \p - /// data. - /// - /// \param[in] model The image to be duplicated. - /// \result The duplicate. - /// - /// \pre model.is_valid + /*! + \brief Duplicate the image \p model with the values of the image + \p data. + + \param[in] model The image to be duplicated. + \result The duplicate. + + This routine performs a deep copy (create new data) of an image. + It can be used to copy an image or to create a concrete image + (\ref modimageconcrete) from a morphed image (\ref + modimagemorpher). + + \pre model.is_valid + */ template <typename I> mln_concrete(I) duplicate(const Image& model); -- 1.7.2.5

11 years, 7 months

olena: olena-2.0-601-g0a09504 Small fixes in documentation.

by Guillaume Lazzara

* doc/mln/core/image/morphers.dox: Add a reference to duplicate(). * mln/core/pixter1d.hh: Remove \internal commands. * mln/data/transform.hh: Improve layout of pseudo-code. * mln/io/pdf/load.hh: Remove duplicate '*' in comments. --- milena/ChangeLog | 12 +++++++ milena/doc/mln/core/image/morphers.dox | 9 +++-- milena/mln/core/pixter1d.hh | 2 - milena/mln/data/transform.hh | 51 ++++++++++++++++++-------------- milena/mln/io/pdf/load.hh | 12 ++++---- 5 files changed, 52 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 62b5772..d5b38b1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in documentation. + + * doc/mln/core/image/morphers.dox: Add a reference to duplicate(). + + * mln/core/pixter1d.hh: Remove \internal commands. + + * mln/data/transform.hh: Improve layout of pseudo-code. + + * mln/io/pdf/load.hh: Remove duplicate '*' in comments. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve documentation of several macros. * mln/core/concept/iterator.hh: Document arguments. diff --git a/milena/doc/mln/core/image/morphers.dox b/milena/doc/mln/core/image/morphers.dox index 5354898..290a0a6 100644 --- a/milena/doc/mln/core/image/morphers.dox +++ b/milena/doc/mln/core/image/morphers.dox @@ -1,6 +1,7 @@ /*! \defgroup modimagemorpher Image morphers - * - * \brief Morpher on both image values and domain. - * - * \ingroup modimage + + \brief Morpher on both image values and domain. + + \sa mln::duplicate + \ingroup modimage */ diff --git a/milena/mln/core/pixter1d.hh b/milena/mln/core/pixter1d.hh index 0b15ae3..8c76129 100644 --- a/milena/mln/core/pixter1d.hh +++ b/milena/mln/core/pixter1d.hh @@ -42,7 +42,6 @@ namespace mln `------------------*/ /*! - \internal \brief Forward pixel iterator on a 1-D image with border. */ template <typename I> @@ -71,7 +70,6 @@ namespace mln `------------------*/ /*! - \internal \brief Backward pixel iterator on a 1-D image with border. */ template <typename I> diff --git a/milena/mln/data/transform.hh b/milena/mln/data/transform.hh index be425a4..ee58e49 100644 --- a/milena/mln/data/transform.hh +++ b/milena/mln/data/transform.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -50,31 +50,38 @@ namespace mln { /*! \brief Transform the image \p input through a function \p f. - * - * \param[in] input The input image. - * \param[in] f The function. - * - * This routine runs: \n - * for all p of \p input, \p output(p) = \p f( \p input(p) ). - * - * \ingroup mlndata - */ + + \param[in] input The input image. + \param[in] f The function. + + This routine runs: + \verbatim + for all p of input + output(p) = f( input(p) ) + \endverbatim + + \ingroup mlndata + */ template <typename I, typename F> mln_ch_value(I, mln_result(F)) transform(const Image& input, const Function_v2v<F>& f); - /*! \brief Transform two images \p input1 \p input2 through a function \p f. - * - * \param[in] input1 The 1st input image. - * \param[in] input2 The 2nd input image. - * \param[in] f The function. - * - * This routine runs: \n - * for all p of \p input, \p output(p) = \p f( \p input1(p), \p input2(p) ). - * - * \ingroup mlndata - */ + /*! \brief Transform two images \p input1 \p input2 through a + function \p f. + + \param[in] input1 The 1st input image. + \param[in] input2 The 2nd input image. + \param[in] f The function. + + This routine runs: + \verbatim + for all p of input + output(p) = f( input1(p), input2(p) ) + \endverbatim + + \ingroup mlndata + */ template <typename I1, typename I2, typename F> mln_ch_value(I1, mln_result(F)) transform(const Image<I1>& input1, diff --git a/milena/mln/io/pdf/load.hh b/milena/mln/io/pdf/load.hh index 84e0926..c0255a8 100644 --- a/milena/mln/io/pdf/load.hh +++ b/milena/mln/io/pdf/load.hh @@ -45,7 +45,7 @@ namespace mln namespace pdf { - /**! \brief Load a multiple page PDF document using libpoppler. + /*! \brief Load a multiple page PDF document using libpoppler. \param[out] arr An array of images. \param[in] filename The name of the input file. @@ -59,7 +59,7 @@ namespace mln void load(util::array& arr, const std::string& filename, float dpi); - /**! \overload + /*! \overload \brief Load a range of pages from a PDF document using libpoppler. @@ -79,7 +79,7 @@ namespace mln int first_page, int last_page, float dpi); - /**! \overload + /*! \overload \brief Load specific pages from a PDF document using libpoppler. @@ -97,7 +97,7 @@ namespace mln void load(util::array& arr, const std::string& filename, util::array<int> pages, float dpi); - /**! \overload + /*! \overload \brief Load a specific page from a PDF document using libpoppler. @@ -116,7 +116,7 @@ namespace mln int page, float dpi); - /**! \overload + /*! \overload \brief Load a multiple page PDF document using libpoppler. @@ -131,7 +131,7 @@ namespace mln template <typename I> void load(util::array& arr, const std::string& filename); - /**! \overload + /*! \overload \brief Load specific pages from a PDF document using libpoppler. -- 1.7.2.5

11 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2013