https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Catch up with changes in the image abstractions hierachies. * tests/identity_morpher.cc, tests/add_neighborhood_morpher.cc, * tests/morphers.cc: Catch up with changes in the image abstractions hierachies. add_neighborhood_morpher.cc | 7 ++----- identity_morpher.cc | 4 ---- morphers.cc | 9 +-------- 3 files changed, 3 insertions(+), 17 deletions(-) Index: tests/add_neighborhood_morpher.cc --- tests/add_neighborhood_morpher.cc (revision 570) +++ tests/add_neighborhood_morpher.cc (working copy) @@ -48,8 +48,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -58,15 +56,14 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ - typedef oln::morpher::add_neighborhood<image_t, oln::neighb2d> image_with_nbh_t; + typedef oln::neighb2d neighb_t; + typedef oln::morpher::add_neighborhood<image_t, neighb_t> image_with_nbh_t; // Check that the instantiated add_neighborhood morpher realizes the // same interfaces as the underlying morphed image. mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_t, neighborhood), oln::neighb2d) >::check(); Index: tests/morphers.cc --- tests/morphers.cc (revision 570) +++ tests/morphers.cc (working copy) @@ -40,8 +40,6 @@ int main() { - typedef oln::neighb2d neighb_t; - /*----------------. | image2d<char>. | `----------------*/ @@ -52,8 +50,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -62,6 +58,7 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ + typedef oln::neighb2d neighb_t; typedef oln::morpher::add_neighborhood<image_t, neighb_t> image_with_nbh_t; // Check that the instantiated neighborhood addition morpher @@ -69,8 +66,6 @@ mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image_having_neighborhood) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_t, neighborhood), oln::neighb2d) >::check(); @@ -94,8 +89,6 @@ oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_id_t, oln::abstract::image_having_neighborhood) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_id_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_id_t, neighborhood), oln::neighb2d) >::check(); Index: tests/identity_morpher.cc --- tests/identity_morpher.cc (revision 570) +++ tests/identity_morpher.cc (working copy) @@ -48,8 +48,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -65,8 +63,6 @@ mlc::assert_< mlc_is_a_(image_id_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_id_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_id_t, - oln::abstract::not_binary_image) >::check(); image_id_t ima_id(ima); }