* tests/level/Makefile.am, * tests/level/median_.cc: remove this test. It is already tested by level/median/approx/median.cc. * mln/level/approx/median.hh, * tests/level/approx/median.cc, * tests/level/median.cc: fix copyright. --- milena/ChangeLog | 12 ++++++++ milena/mln/level/approx/median.hh | 2 +- milena/tests/level/Makefile.am | 2 - milena/tests/level/approx/median.cc | 4 +- milena/tests/level/median.cc | 4 +- milena/tests/level/median_.cc | 48 ----------------------------------- 6 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 milena/tests/level/median_.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 61a8e60..2a5fb87 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2009-01-09 Guillaume Lazzara <z@lrde.epita.fr> + Remove a useless test in level/median. + + * tests/level/Makefile.am, + * tests/level/median_.cc: remove this test. It is already tested by + level/median/approx/median.cc. + + * mln/level/approx/median.hh, + * tests/level/approx/median.cc, + * tests/level/median.cc: fix copyright. + +2009-01-09 Guillaume Lazzara <z@lrde.epita.fr> + Provide a default implementation of center_at_() in site_relative_iterator_base. diff --git a/milena/mln/level/approx/median.hh b/milena/mln/level/approx/median.hh index 8156b1c..5bf1a9e 100644 --- a/milena/mln/level/approx/median.hh +++ b/milena/mln/level/approx/median.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free diff --git a/milena/tests/level/Makefile.am b/milena/tests/level/Makefile.am index 0d34bc3..39f3a63 100644 --- a/milena/tests/level/Makefile.am +++ b/milena/tests/level/Makefile.am @@ -12,7 +12,6 @@ check_PROGRAMS = \ compute \ convert \ median \ - median_ \ median_fast \ saturate \ sort_psites \ @@ -28,7 +27,6 @@ compare_SOURCES = compare.cc compute_SOURCES = compute.cc convert_SOURCES = convert.cc median_SOURCES = median.cc -median__SOURCES = median_.cc median_fast_SOURCES = median_fast.cc saturate_SOURCES = saturate.cc sort_psites_SOURCES = sort_psites.cc diff --git a/milena/tests/level/approx/median.cc b/milena/tests/level/approx/median.cc index d9e39c4..7dd3f12 100644 --- a/milena/tests/level/approx/median.cc +++ b/milena/tests/level/approx/median.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/tests/level/median.cc b/milena/tests/level/median.cc index 48f6adb..0d749e2 100644 --- a/milena/tests/level/median.cc +++ b/milena/tests/level/median.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/tests/level/median_.cc b/milena/tests/level/median_.cc deleted file mode 100644 index 3d97c7c..0000000 --- a/milena/tests/level/median_.cc +++ /dev/null @@ -1,48 +0,0 @@ -#include <mln/core/image/image2d.hh> -#include <mln/win/rectangle2d.hh> -#include <mln/make/box2d.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> - -#include <mln/value/int_u8.hh> -#include <mln/level/median.hh> - -#include "tests/data.hh" - -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - - -int main() -{ - using namespace mln; - using value::int_u8; - - { - border::thickness = 5; - box2d bb = make::box2d(0, 0, 3, 3); - image2d<int_u8> ima(bb); - debug::iota(ima); - debug::println(ima); - - win::rectangle2d rect(3, 3); - image2d<int_u8> out(ima.domain()); - - level::impl::median_(ima, rect, out); - } - - - { - win::rectangle2d rect(21, 21); - border::thickness = 6; - - image2d<int_u8> lena; - io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - image2d<int_u8> out(lena.domain()); - - level::impl::median_(lena, rect, out); - io::pgm::save(out, "out.pgm"); - } - -} -- 1.5.6.5