[Olena-patches] proto-1.0 254: Fix some Olena tests

ChangeLog | 13 +++++++++++++ tests/core/tests/setget | 1 + tests/morpho/tests/closing | 6 +++--- tests/morpho/tests/dilation | 6 +++--- tests/morpho/tests/elementary_dilation | 7 +++---- tests/morpho/tests/elementary_erosion | 8 ++++---- tests/morpho/tests/erosion | 6 +++--- tests/morpho/tests/hit_or_miss | 4 ++-- tests/morpho/tests/hit_or_miss_closing | 8 ++++---- tests/morpho/tests/opening | 6 +++--- 10 files changed, 39 insertions(+), 26 deletions(-) Index: olena/ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Fix some Olena tests. * tests/core/tests/setget (oln::set_props<category::image, dummy_image>::image_rawness_type): New typedef. * tests/morpho/tests/elementary_dilation, * tests/morpho/tests/elementary_erosion, * tests/morpho/tests/dilation, tests/morpho/tests/erosion, * tests/morpho/tests/closing, tests/morpho/tests/opening: * tests/morpho/tests/hit_or_miss_closing: Update MD5 sums. 2005-07-19 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Index: olena/tests/morpho/tests/hit_or_miss --- olena/tests/morpho/tests/hit_or_miss (révision 253) +++ olena/tests/morpho/tests/hit_or_miss (copie de travail) @@ -12,8 +12,8 @@ bool check() { utils::key::value_type data_key[16] = - { 0x11, 0x78, 0x96, 0x7f, 0x20, 0xab, 0xb1, 0xad, - 0x3c, 0x39, 0xef, 0x56, 0xf0, 0x12, 0x59, 0x1 } ; + { 0x81, 0xc1, 0x7, 0x12, 0x13, 0x17, 0x30, 0x58, + 0xfe, 0xd, 0x50, 0x5d, 0x7b, 0x5f, 0x36, 0x63 }; utils::key key(data_key); image2d<ntg::bin> ima; Index: olena/tests/morpho/tests/elementary_dilation --- olena/tests/morpho/tests/elementary_dilation (révision 253) +++ olena/tests/morpho/tests/elementary_dilation (copie de travail) @@ -12,11 +12,10 @@ bool check() { - // MD5 sum of object.pbm's elementary dilation result. - // FIXME: Replace this fake with the actual result. + // MD5 sum of 16x16.pbm's elementary dilation result. utils::key::value_type data_key[16] = - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + { 0x1e, 0x6d, 0x61, 0x22, 0xd1, 0x79, 0x76, 0x73, + 0xe0, 0xf2, 0xf3, 0xc, 0xc4, 0x7b, 0x8d, 0x95 }; utils::key key(data_key); typedef image2d<ntg::bin> im_type; Index: olena/tests/morpho/tests/hit_or_miss_closing --- olena/tests/morpho/tests/hit_or_miss_closing (révision 253) +++ olena/tests/morpho/tests/hit_or_miss_closing (copie de travail) @@ -12,13 +12,13 @@ bool check() { utils::key::value_type data_key_hom_closing[16] = - { 0x9d, 0x9d, 0xbb, 0xd7, 0x6b, 0x5, 0x38, 0x29, - 0x69, 0x6e, 0x30, 0xd4, 0x30, 0x99, 0x13, 0x29 }; + { 0xcb, 0x26, 0x85, 0x11, 0x46, 0xe9, 0x2f, 0x4e, + 0xba, 0xcd, 0xf1, 0xba, 0xa1, 0x60, 0xce, 0xac }; utils::key key_hom_closing(data_key_hom_closing); utils::key::value_type data_key_hom_closing_bg[16] = - { 0xfa, 0x7, 0x26, 0x34, 0x16, 0x36, 0xc, 0xf4, - 0x5e, 0x19, 0x53, 0xa2, 0x89, 0x1e, 0xdb, 0xae }; + { 0xe1, 0x8c, 0x75, 0x26, 0xee, 0x60, 0x13, 0xc2, + 0x22, 0xb1, 0xaa, 0x2e, 0xc1, 0x7a, 0x67, 0xa }; utils::key key_hom_closing_bg(data_key_hom_closing_bg); image2d<ntg::bin> ima; Index: olena/tests/morpho/tests/closing --- olena/tests/morpho/tests/closing (révision 253) +++ olena/tests/morpho/tests/closing (copie de travail) @@ -12,10 +12,10 @@ bool check() { - // MD5 sum of object.pbm's closing result. + // MD5 sum of 16x16.pbm's closing result. utils::key::value_type data_key[16] = - { 0xb, 0xec, 0x55, 0x93, 0x1c, 0x3, 0xee, 0xed, - 0x1e, 0xc5, 0x6a, 0x45, 0xa2, 0x95, 0xe3, 0xad }; + { 0x58, 0xc2, 0xef, 0xd1, 0xe3, 0xda, 0x37, 0xcd, + 0x5d, 0xa9, 0x82, 0x95, 0xe5, 0xcb, 0xf8, 0xf9 }; utils::key key(data_key); typedef image2d<ntg::bin> im_type; Index: olena/tests/morpho/tests/opening --- olena/tests/morpho/tests/opening (révision 253) +++ olena/tests/morpho/tests/opening (copie de travail) @@ -12,10 +12,10 @@ bool check() { - // MD5 sum of object.pbm's opening result. + // MD5 sum of 16x16.pbm's opening result. utils::key::value_type data_key[16] = - { 0x21, 0x52, 0x1b, 0x70, 0x84, 0x7f, 0xed, 0x96, - 0xa9, 0x83, 0x80, 0x57, 0x48, 0xa4, 0x26, 0x80 }; + { 0xdc, 0xac, 0x1d, 0xe2, 0xfb, 0x7e, 0x5, 0x4, + 0xf0, 0xfd, 0xcb, 0xc9, 0xbc, 0xc5, 0xc5, 0x49 }; utils::key key(data_key); typedef image2d<ntg::bin> im_type; Index: olena/tests/morpho/tests/dilation --- olena/tests/morpho/tests/dilation (révision 253) +++ olena/tests/morpho/tests/dilation (copie de travail) @@ -12,10 +12,10 @@ bool check() { - // MD5 sum of object.pbm's erosion result. + // MD5 sum of 16x16.pbm's erosion result. utils::key::value_type data_key[16] = - { 0x38, 0x56, 0x92, 0x53, 0xca, 0xd1, 0x32, 0x3e, - 0x99, 0xf4, 0xe7, 0x59, 0x3, 0x54, 0x2c, 0x54 }; + { 0x55, 0x3f, 0xe8, 0x39, 0x41, 0x6c, 0x56, 0x20, + 0xd0, 0xa4, 0x97, 0xe3, 0xa5, 0xe8, 0xef, 0x92 }; utils::key key(data_key); typedef image2d<ntg::bin> im_type; Index: olena/tests/morpho/tests/elementary_erosion --- olena/tests/morpho/tests/elementary_erosion (révision 253) +++ olena/tests/morpho/tests/elementary_erosion (copie de travail) @@ -12,12 +12,12 @@ bool check() { - // MD5 sum of object.pbm's elementary erosion result. - // FIXME: Replace this fake with the actual result. + // MD5 sum of 16x16.pbm's elementary erosion result. utils::key::value_type data_key[16] = - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + { 0xd0, 0x58, 0x50, 0x5f, 0x3b, 0xe6, 0xda, 0x80, + 0xec, 0x2b, 0x7f, 0xa9, 0x6, 0xef, 0xf0, 0xac }; utils::key key(data_key); + typedef image2d<ntg::bin> im_type; im_type ima; ima = io::read(rdata("16x16.pbm")); Index: olena/tests/morpho/tests/erosion --- olena/tests/morpho/tests/erosion (révision 253) +++ olena/tests/morpho/tests/erosion (copie de travail) @@ -12,10 +12,10 @@ bool check() { - // MD5 sum of object.pbm's erosion result. + // MD5 sum of 16x16.pbm's erosion result. utils::key::value_type data_key[16] = - { 0x30, 0x23, 0x4d, 0xe5, 0xd6, 0x28, 0xeb, 0x8b, - 0x18, 0x82, 0x43, 0x4b, 0xfc, 0x3f, 0x21, 0xc2 }; + { 0x36, 0xe0, 0xb2, 0xd1, 0x0, 0xd5, 0x20, 0x2e, + 0xce, 0xf0, 0xec, 0xcc, 0x3d, 0x19, 0x4c, 0xea }; utils::key key(data_key); typedef image2d<ntg::bin> im_type; Index: olena/tests/core/tests/setget --- olena/tests/core/tests/setget (révision 253) +++ olena/tests/core/tests/setget (copie de travail) @@ -17,6 +17,7 @@ { typedef mlc::no_type grid_type; typedef mlc::no_type concrete_type; + typedef mlc::no_type image_rawness_type; typedef mlc::no_type image_dimension_type; typedef int size_type;