[Olena-patches] oln 10.161: Fix tests

Index: olena/ChangeLog from Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; * olena/tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make compile with ICC. * olena/tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise. * olena/tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise. * olena/tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise. * olena/tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise. * olena/tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise. * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise. * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise. * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise. * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise. Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh5 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh5 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/41_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh5 Wed, 14 Apr 2004 17:21:26 +0200 thivol_d (oln/k/41_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::hybrid::geodesic_reconstruction_erosion(im1, im2, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh4 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh4 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/42_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh4 Wed, 14 Apr 2004 17:21:18 +0200 thivol_d (oln/k/42_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sequential::geodesic_reconstruction_erosion(im1, im2, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh3 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh3 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/43_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh3 Wed, 14 Apr 2004 17:21:07 +0200 thivol_d (oln/k/43_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sure::geodesic_reconstruction_erosion(im1, im2, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh2 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh2 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/44_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh2 Wed, 14 Apr 2004 17:20:58 +0200 thivol_d (oln/k/44_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::hybrid::geodesic_reconstruction_dilation(im2, im1, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh1 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh1 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/45_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh1 Wed, 14 Apr 2004 17:20:50 +0200 thivol_d (oln/k/45_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sequential::geodesic_reconstruction_dilation(im2, im1, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_reconstruction_hh0 --- olena/tests/morpho/tests/md5_morpho_reconstruction_hh0 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/46_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_reconstruction_hh0 Wed, 14 Apr 2004 17:20:41 +0200 thivol_d (oln/k/46_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sure::geodesic_reconstruction_dilation(im2, im1, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1 --- olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/l/5_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1 Wed, 14 Apr 2004 17:20:05 +0200 thivol_d (oln/l/5_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sure::geodesic_erosion(im1, im2, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0 --- olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/l/6_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0 Wed, 14 Apr 2004 17:19:56 +0200 thivol_d (oln/l/6_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::geodesic_erosion(im1, im2, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1 --- olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/l/7_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1 Wed, 14 Apr 2004 17:19:36 +0200 thivol_d (oln/l/7_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::sure::geodesic_dilation(im2, im1, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else Index: olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0 --- olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/l/8_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0 Wed, 14 Apr 2004 17:19:24 +0200 thivol_d (oln/l/8_md5_morpho 1.1 600) @@ -18,7 +18,7 @@ typedef oln::image2d<ntg:: int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); - im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); if (oln::utils::md5(oln::morpho::geodesic_dilation(im2, im1, oln::neighb_c4())) == key) std::cout << "OK" << std::endl; else -- Damien Thivolle damien.thivolle(a)lrde.epita.fr