URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-14 Fabien Freling <fabien.freling@lrde.epita.fr> Disable tiled2d image support (still experimental). * mln/io/magick/load.hh: Disable tiled2d image support. * tests/fun/v2v/rgb_to_hsl.cc: Update test for luminance value. --- mln/io/magick/load.hh | 8 ++++---- tests/fun/v2v/rgb_to_hsl.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Index: trunk/milena/mln/io/magick/load.hh =================================================================== --- trunk/milena/mln/io/magick/load.hh (revision 4474) +++ trunk/milena/mln/io/magick/load.hh (revision 4475) @@ -61,8 +61,8 @@ * data. * \param[in] filename The source. */ - template <typename T> - void load(Image<tiled2d<T> >& ima, const std::string& filename); + /*template <typename T> + void load(Image<tiled2d<T> >& ima, const std::string& filename);*/ # ifndef MLN_INCLUDE_ONLY @@ -163,7 +163,7 @@ } - template<typename T> + /*template<typename T> inline void load(Image<tiled2d<T> >& ima_, const std::string& filename) { @@ -175,7 +175,7 @@ ima = result; trace::exiting("mln::io::magick::load"); - } + }*/ Index: trunk/milena/tests/fun/v2v/rgb_to_hsl.cc =================================================================== --- trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4474) +++ trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4475) @@ -43,8 +43,8 @@ rgb8 dat[][2] = { { rgb8(0,0,0), rgb8(255,255,255) }, { rgb8(128,128,128), rgb8(90,90, 90) } }; -hsl_f ref[][2] = { { hsl_f(0,0,0), hsl_f(0,0,255) }, - { hsl_f(0,0,128), hsl_f(0,0,90) } }; +hsl_f ref[][2] = { { hsl_f(0,0,0), hsl_f(0,0,1.0) }, + { hsl_f(0,0,0.5), hsl_f(0,0,0.35) } }; int main() {