[Olena-patches] milena r1898: Modifie literals

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-04-29 Caroline Vigouroux &lt;vigour_c(a)epita.fr&gt; Modifie literals. * cmy/rgb_to_cmy.hh: . * literal/black.hh, literal/blue.hh literal/cyan.hh, literal/green.hh literal/red.hh, literal/white.hh: modifications. --- cmy/rgb_to_cmy.hh | 2 +- literal/black.hh | 3 ++- literal/blue.hh | 3 ++- literal/cyan.hh | 3 ++- literal/green.hh | 3 ++- literal/red.hh | 3 ++- literal/white.hh | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) Index: trunk/milena/sandbox/vigouroux/cmy/rgb_to_cmy.hh =================================================================== --- trunk/milena/sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 1898) @@ -65,7 +65,7 @@ } }; - typedef f_cmy_to_rgb_<value::rgb8> f_cmy_to_rgb_3x8_t; + typedef f_cmy_to_rgb_<value::cmy_f> f_cmy_to_rgb_3x8_t; f_cmy_to_rgb_3x8_t f_cmy_to_rgb_3x8; Index: trunk/milena/sandbox/vigouroux/literal/blue.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/blue.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/blue.hh (revision 1898) @@ -7,6 +7,7 @@ */ # include <mln/core/concept/literal.hh> +# include <mln/value/rgb8.hh> namespace mln { @@ -17,7 +18,7 @@ /// Type of literal blue. struct blue_t : public Literal<blue_t> { - T_rgb operator()() const + value::rgb8 operator()() const { return value::rgb8(0,0,255); } Index: trunk/milena/sandbox/vigouroux/literal/cyan.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/cyan.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/cyan.hh (revision 1898) @@ -23,7 +23,8 @@ value::rgb8 operator()() const { const value::cmy_f cmy(255,0,0); - value::rgb8 rgb = fun::v2v::f_rgb_to_cmy_f(fun::v2v::f_rgb_to_cmy_f(cmy)); + value::rgb8 rgb; + rgb = fun::v2v::f_cmy_to_rgb_3x8_t(cmy); return rgb; } Index: trunk/milena/sandbox/vigouroux/literal/green.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/green.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/green.hh (revision 1898) @@ -7,6 +7,7 @@ */ # include <mln/core/concept/literal.hh> +# include <mln/value/rgb8.hh> namespace mln { @@ -17,7 +18,7 @@ /// Type of literal green. struct green_t : public Literal<green_t> { - T_rgb operator()() const + value::rgb8 operator()() const { return value::rgb8(0,255,0); } Index: trunk/milena/sandbox/vigouroux/literal/red.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/red.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/red.hh (revision 1898) @@ -7,6 +7,7 @@ */ # include <mln/core/concept/literal.hh> +# include <mln/value/rgb8.hh> namespace mln { @@ -17,7 +18,7 @@ /// Type of literal red. struct red_t : public Literal<red_t> { - T_rgb operator()() const + value::rgb8 operator()() const { return value::rgb8(255,0,0); } Index: trunk/milena/sandbox/vigouroux/literal/black.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/black.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/black.hh (revision 1898) @@ -7,6 +7,7 @@ */ # include <mln/core/concept/literal.hh> +# include <mln/value/rgb8.hh> namespace mln { @@ -17,7 +18,7 @@ /// Type of literal black. struct black_t : public Literal<black_t> { - T_rgb operator()() const + value::rgb8 operator()() const { return value::rgb8(0,0,0); } Index: trunk/milena/sandbox/vigouroux/literal/white.hh =================================================================== --- trunk/milena/sandbox/vigouroux/literal/white.hh (revision 1897) +++ trunk/milena/sandbox/vigouroux/literal/white.hh (revision 1898) @@ -7,6 +7,7 @@ */ # include <mln/core/concept/literal.hh> +# include <mln/value/rgb8.hh> namespace mln { @@ -17,7 +18,7 @@ /// Type of literal white. struct white_t : public Literal<white_t> { - T_rgb operator()() const + value::rgb8 operator()() const { return value::rgb8(255,255,255); }