* mln/extract/all.hh: include new includes. * mln/extract/hue.hh, * mln/extract/lum.hh, * mln/extract/sat.hh: new. Construct a fun_image from a hsl image and the appropriate meta function. * mln/extract/blue.hh: fix a wrong guard. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/extract/all.hh | 7 +++++-- milena/mln/extract/blue.hh | 6 +++--- milena/mln/extract/{blue.hh => hue.hh} | 22 +++++++++++----------- milena/mln/extract/{blue.hh => lum.hh} | 22 +++++++++++----------- milena/mln/extract/{blue.hh => sat.hh} | 22 +++++++++++----------- 6 files changed, 54 insertions(+), 38 deletions(-) copy milena/mln/extract/{blue.hh => hue.hh} (80%) copy milena/mln/extract/{blue.hh => lum.hh} (80%) copy milena/mln/extract/{blue.hh => sat.hh} (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7cf4e5b..2d2199f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2009-02-12 Guillaume Lazzara <z@lrde.epita.fr> + Add new routines to extract HSL components. + + * mln/extract/all.hh: include new includes. + + * mln/extract/hue.hh, + * mln/extract/lum.hh, + * mln/extract/sat.hh: new. Construct a fun_image from a hsl image and + the appropriate meta function. + + * mln/extract/blue.hh: fix a wrong guard. + +2009-02-12 Guillaume Lazzara <z@lrde.epita.fr> + Add new meta functions to retrieve HSL components. * mln/fun/all.hh: include meta/all.hh. diff --git a/milena/mln/extract/all.hh b/milena/mln/extract/all.hh index eeea24d..cbcc8c6 100644 --- a/milena/mln/extract/all.hh +++ b/milena/mln/extract/all.hh @@ -38,13 +38,16 @@ namespace mln namespace extract { - } + } // end of namespace mln::extract -} +} // end of namespace mln # include <mln/extract/red.hh> # include <mln/extract/green.hh> # include <mln/extract/blue.hh> +# include <mln/extract/hue.hh> +# include <mln/extract/sat.hh> +# include <mln/extract/lum.hh> #endif // ! MLN_EXTRACT_ALL_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/blue.hh index 3315a25..327be89 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/blue.hh @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_BLUE_HH +# define MLN_EXTRACT_BLUE_HH /// \file mln/extract/blue.hh /// @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_BLUE_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/hue.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/hue.hh index 3315a25..8a38606 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/hue.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_HUE_HH +# define MLN_EXTRACT_HUE_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/hue.hh /// -/// Extract the blue component of an image. +/// Extract the hue component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/hue.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima); + fun_image<meta::hue<mln_value(I)>,I> + hue(Image<I>& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima) + fun_image<meta::hue<mln_value(I)>,I> + hue(Image<I>& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::hue<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_HUE_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/lum.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/lum.hh index 3315a25..21821b6 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/lum.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_LUM_HH +# define MLN_EXTRACT_LUM_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/lum.hh /// -/// Extract the blue component of an image. +/// Extract the lum component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/lum.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima); + fun_image<meta::lum<mln_value(I)>,I> + lum(Image<I>& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima) + fun_image<meta::lum<mln_value(I)>,I> + lum(Image<I>& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::lum<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_LUM_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/sat.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/sat.hh index 3315a25..6c375b4 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/sat.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_SAT_HH +# define MLN_EXTRACT_SAT_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/sat.hh /// -/// Extract the blue component of an image. +/// Extract the sat component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/sat.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima); + fun_image<meta::sat<mln_value(I)>,I> + sat(Image<I>& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image<I>& ima) + fun_image<meta::sat<mln_value(I)>,I> + sat(Image<I>& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::sat<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_SAT_HH -- 1.5.6.5