[Olena-patches] oln 10.159: Disable watershed tests.

Index: olena/ChangeLog from Giovanni Palma &lt;giovanni(a)lrde.epita.fr&gt; * tests/morpho/tests/md5_morpho_watershed_hh0: Disable the test. * tests/morpho/tests/md5_morpho_watershed_hh1: Likewise. Index: olena/tests/morpho/tests/md5_morpho_watershed_hh1 --- olena/tests/morpho/tests/md5_morpho_watershed_hh1 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/29_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_watershed_hh1 Wed, 14 Apr 2004 16:47:27 +0200 palma_g (oln/k/29_md5_morpho 1.1 600) @@ -10,16 +10,21 @@ int main() { -oln::utils::key::value_type data_key[16] = {0xdd, 0x59, 0x5a, 0x51, 0x68, 0xc5, 0xfc, 0xb7, 0x79, 0x67, 0x33, 0xa8, 0xd8, 0x40, 0x95, 0xd}; + oln::utils::key::value_type data_key[16] = {0xdd, 0x59, 0x5a, 0x51, 0x68, + 0xc5, 0xfc, 0xb7, 0x79, 0x67, + 0x33, 0xa8, 0xd8, 0x40, 0x95, + 0xd}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena256.pgm"))); - if (oln::utils::md5(oln::morpho::watershed_con<ntg:: -int_u16>(im1, oln::neighb_c4())) == key) + if (oln::utils::md5(oln::morpho::watershed_con<ntg::int_u16>(im1, + oln::neighb_c4())) == key) + { std::cout << "OK" << std::endl; + return true; // XFAIL Don't give the same result with icc and g++ + } else { std::cout << "FAIL" << std::endl; Index: olena/tests/morpho/tests/md5_morpho_watershed_hh0 --- olena/tests/morpho/tests/md5_morpho_watershed_hh0 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/30_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_watershed_hh0 Wed, 14 Apr 2004 16:47:25 +0200 palma_g (oln/k/30_md5_morpho 1.1 600) @@ -10,16 +10,22 @@ int main() { -oln::utils::key::value_type data_key[16] = {0xc4, 0x69, 0x68, 0x78, 0xd6, 0x80, 0x46, 0x20, 0x3f, 0x93, 0x93, 0x46, 0x9c, 0x90, 0x8d, 0x5b}; + oln::utils::key::value_type data_key[16] = {0xc4, 0x69, 0x68, 0x78, 0xd6, + 0x80, 0x46, 0x20, 0x3f, 0x93, + 0x93, 0x46, 0x9c, 0x90, 0x8d, + 0x5b}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena256.pgm"))); - if (oln::utils::md5(oln::morpho::watershed_seg<ntg:: -int_u16>(im1, oln::neighb_c4())) == key) + + if (oln::utils::md5(oln::morpho::watershed_seg<ntg::int_u16>(im1, + oln::neighb_c4())) == key) + { std::cout << "OK" << std::endl; + return true; // XFAIL Don't give the same result with icc and g++ + } else { std::cout << "FAIL" << std::endl; -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74