May 2009 - Olena-patches

[Olena] #197: PGM/PBM cannot be saved as ASCII-encoded images.
by Olena Trac 29 May '09

29 May '09

#197: PGM/PBM cannot be saved as ASCII-encoded images. -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Currently it is only possible to load ASCII-encoded images. While saving, they are stored as RAW images. We should let the user choose what he prefers. -- Ticket URL: <https://trac.lrde.org/olena/ticket/197> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #144: Fix load (and maybe save) routine(s) for ASCII-encoded PBM images
by Olena 29 May '09

29 May '09

#144: Fix load (and maybe save) routine(s) for ASCII-encoded PBM images -------------------------------------+-------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: I/O IO input output pbm | -------------------------------------+-------------------------------------- Théo discovered on May 28, 2008 that the load routine for ASCII-encoded PBM (boolean) images was broken (and maybe the save routine, too). The other ASCII-based Netpbm should be checked as well. Don't close this ticket until all of these routine have been inspected and declared safe! -- Ticket URL: <https://trac.lrde.org/olena/ticket/144> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

3935: Last small fixes of the day.
by Guillaume Lazzara 29 May '09

29 May '09

* mln/linear/gaussian/internal/coefficients.hh: fix missing return statement. * mln/math/abs.hh, * mln/math/cos.hh: add missing end line. * tests/tools/pretty_check.sh: enable a commented line. --- milena/ChangeLog | 12 ++++++++++++ .../mln/linear/gaussian/internal/coefficients.hh | 1 + milena/mln/math/abs.hh | 1 + milena/mln/math/cos.hh | 1 + milena/tests/tools/pretty_check.sh | 2 +- 5 files changed, 16 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 43fe289..c93b486 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Last small fixes of the day. + + * mln/linear/gaussian/internal/coefficients.hh: fix missing return + statement. + + * mln/math/abs.hh, + * mln/math/cos.hh: add missing end line. + + * tests/tools/pretty_check.sh: enable a commented line. + +2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix pbm::load and pgm::load with ASCII encoded images. * mln/io/pbm/load.hh, diff --git a/milena/mln/linear/gaussian/internal/coefficients.hh b/milena/mln/linear/gaussian/internal/coefficients.hh index 44b332f..e2fd62a 100644 --- a/milena/mln/linear/gaussian/internal/coefficients.hh +++ b/milena/mln/linear/gaussian/internal/coefficients.hh @@ -284,6 +284,7 @@ namespace mln +0.7480, +2.166, sigma, norm_2nd_derivative); + return tmp; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/math/abs.hh b/milena/mln/math/abs.hh index 844ffca..ac26e2c 100644 --- a/milena/mln/math/abs.hh +++ b/milena/mln/math/abs.hh @@ -101,3 +101,4 @@ namespace mln #endif // ! MLN_MATH_ABS_HH + diff --git a/milena/mln/math/cos.hh b/milena/mln/math/cos.hh index c0aaa14..0279116 100644 --- a/milena/mln/math/cos.hh +++ b/milena/mln/math/cos.hh @@ -63,3 +63,4 @@ namespace mln #endif // ! MLN_MATH_COS_HH + diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh index 2bb6044..738342e 100755 --- a/milena/tests/tools/pretty_check.sh +++ b/milena/tests/tools/pretty_check.sh @@ -406,7 +406,7 @@ main() # Cleanup temporary files. cleanup_tmp_files -# cleanup_gcc_wrapper + cleanup_gcc_wrapper } main -- 1.5.6.5

1 0

3934: Fix pbm::load and pgm::load with ASCII encoded images.
by Guillaume Lazzara 29 May '09

29 May '09

* mln/io/pbm/load.hh, * mln/value/builtin/integers.hh: make them work with ASCII encoded images. * tests/io/pbm/Makefile.am, * tests/io/pgm/Makefile.am: add new tests. * tests/io/pbm/pbm_ascii.cc, * tests/io/pgm/pgm_ascii.cc: new tests. --- milena/ChangeLog | 14 +++++ milena/mln/io/pbm/load.hh | 9 ++-- milena/mln/value/builtin/integers.hh | 9 +++- milena/tests/io/pbm/Makefile.am | 4 +- milena/tests/io/pbm/pbm_ascii.cc | 83 +++++++++++++++++++++++++++++ milena/tests/io/pgm/Makefile.am | 2 + milena/tests/io/pgm/pgm_ascii.cc | 95 ++++++++++++++++++++++++++++++++++ 7 files changed, 209 insertions(+), 7 deletions(-) create mode 100644 milena/tests/io/pbm/pbm_ascii.cc create mode 100644 milena/tests/io/pgm/pgm_ascii.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 98e1d16..43fe289 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix pbm::load and pgm::load with ASCII encoded images. + + * mln/io/pbm/load.hh, + * mln/value/builtin/integers.hh: make them work with ASCII encoded + images. + + * tests/io/pbm/Makefile.am, + * tests/io/pgm/Makefile.am: add new tests. + + * tests/io/pbm/pbm_ascii.cc, + * tests/io/pgm/pgm_ascii.cc: new tests. + +2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * tests/linear/Makefile.am: fix conflict name between gaussian directory and gaussian test. diff --git a/milena/mln/io/pbm/load.hh b/milena/mln/io/pbm/load.hh index 81ad23d..3180c3a 100644 --- a/milena/mln/io/pbm/load.hh +++ b/milena/mln/io/pbm/load.hh @@ -93,12 +93,11 @@ namespace mln mln_fwd_piter(I) p(ima.domain()); for_all(p) { - unsigned value; + unsigned char value; file >> value; - mln_assertion(value == 0 || value == 1); - ima(p) = (value == 0); // In pbm, '0' means 'white' so 'object', thus 'true'! - // FIXME: Test alt code below. - // file >> ima(p); + + mln_assertion(value == '0' || value == '1'); + ima(p) = (value == '0'); // In pbm, '0' means 'white' so 'object', thus 'true'! } } diff --git a/milena/mln/value/builtin/integers.hh b/milena/mln/value/builtin/integers.hh index 8e83fe3..efc11d3 100644 --- a/milena/mln/value/builtin/integers.hh +++ b/milena/mln/value/builtin/integers.hh @@ -77,7 +77,7 @@ namespace mln nbits = n, card = mln_value_card_from_(n) }; - + typedef trait::value::nature::integer nature; typedef trait::value::kind::data kind; typedef mln_value_quant_from_(card) quant; @@ -105,6 +105,13 @@ namespace mln { return "signed char"; } }; + template <> struct value_< char > + : internal::value_integer_< signed char > + { + static const char* name() + { return "char"; } + }; + template <> struct value_< unsigned short > : internal::value_integer_< unsigned short > { diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index 91d23f0..8649de7 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -3,8 +3,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - pbm + pbm \ + pbm_ascii pbm_SOURCES = pbm.cc +pbm_ascii_SOURCES = pbm_ascii.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pbm/pbm_ascii.cc b/milena/tests/io/pbm/pbm_ascii.cc new file mode 100644 index 0000000..72b51a8 --- /dev/null +++ b/milena/tests/io/pbm/pbm_ascii.cc @@ -0,0 +1,83 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/io/pbm/pbm_asci.cc +/// +/// Test on mln::io::pbm::load and mln::io::pbm::save. + + + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + +#include <mln/level/compare.hh> + +#include <mln/literal/colors.hh> + +#include "tests/data.hh" + +#include <mln/level/convert.hh> + +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/make/box2d.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<bool> lena_raw; + io::pbm::load(lena_raw, MLN_TESTS_IMG_DIR "/lena_raw.pbm"); + + { + image2d<bool> lena_ascii; + io::pbm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pbm"); + + mln_assertion(lena_raw == lena_ascii); + } + + { + image2d<bool> lena_ascii; + io::pbm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pbm"); + io::pbm::save(lena_ascii, "out.pbm"); + + image2d<bool> out; + io::pbm::load(out, "out.pbm"); + + mln_assertion(out == lena_ascii); + mln_assertion(out == lena_raw); + } + +} diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index 929b163..4456e61 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -6,11 +6,13 @@ check_PROGRAMS = \ pgm16 \ pgm19 \ pgm27 \ + pgm_ascii \ pgm pgm16_SOURCES = pgm16.cc pgm19_SOURCES = pgm19.cc pgm27_SOURCES = pgm27.cc +pgm_ascii_SOURCES = pgm_ascii.cc pgm_SOURCES = pgm.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pgm/pgm_ascii.cc b/milena/tests/io/pgm/pgm_ascii.cc new file mode 100644 index 0000000..f80774f --- /dev/null +++ b/milena/tests/io/pgm/pgm_ascii.cc @@ -0,0 +1,95 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/io/pgm/pgm_asci.cc +/// +/// Test on mln::io::pgm::load and mln::io::pgm::save. + + + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/compare.hh> + +#include <mln/literal/colors.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena_raw; + io::pgm::load(lena_raw, MLN_TESTS_IMG_DIR "/lena_raw.pgm"); + + { + image2d<unsigned char> lena_ascii; + io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); + mln_assertion(lena_raw == lena_ascii); + } + { + image2d<unsigned char> lena_ascii; + io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); + io::pgm::save(lena_ascii, "out.pgm"); + + image2d<unsigned char> out; + io::pgm::load(out, "out.pgm"); + + mln_assertion(out == lena_ascii); + mln_assertion(lena_raw == out); + } + + + + { + image2d<int_u8> lena_ascii; + io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); + mln_assertion(lena_raw == lena_ascii); + } + { + image2d<int_u8> lena_ascii; + io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); + io::pgm::save(lena_ascii, "out.pgm"); + + image2d<unsigned char> out; + io::pgm::load(out, "out.pgm"); + + mln_assertion(out == lena_ascii); + mln_assertion(lena_raw == out); + } + +} -- 1.5.6.5

1 0

3933: tests/linear/Makefile.am: fix conflict name between gaussian directory and gaussian test.
by Guillaume Lazzara 29 May '09

29 May '09

--- milena/ChangeLog | 5 +++++ milena/tests/linear/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b7b4b98..98e1d16 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * tests/linear/Makefile.am: fix conflict name between gaussian + directory and gaussian test. + 2009-05-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move to trash non-up-to-date image types. diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 1d6e969..b9c9a5d 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -10,13 +10,13 @@ check_PROGRAMS = \ convolve \ convolve_directional \ convolve_2x1d \ - gaussian \ + gaussian_ \ lap \ log \ sobel_2d convolve_SOURCES = convolve.cc -gaussian_SOURCES = gaussian.cc +gaussian__SOURCES = gaussian.cc lap_SOURCES = lap.cc convolve_directional_SOURCES = convolve_directional.cc convolve_2x1d_SOURCES = convolve_2x1d.cc -- 1.5.6.5

1 0

r3932: Plot all points of a specific label
by Fabien Freling 29 May '09

29 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-29 Fabien Freling <fabien.freling(a)lrde.epita.fr> Plot all points of a specific label. * fabien/igr/plot_points/int2rgb.hh: Convert a unsigned value to a rgb8 value, used for visualization. * fabien/igr/plot_points/plot_points_of_label.cc: Small update. * fabien/igr/wst_edges.cc: Output watershed dump. --- plot_points/Makefile | 2 +- plot_points/int2rgb.hh | 36 ++++++++++++++++++++++++++++++++++++ plot_points/plot_points_of_label.cc | 13 ++++++++++--- wst_edges.cc | 11 ++++++----- 4 files changed, 53 insertions(+), 9 deletions(-) Index: trunk/milena/sandbox/fabien/igr/wst_edges.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/wst_edges.cc (revision 3931) +++ trunk/milena/sandbox/fabien/igr/wst_edges.cc (revision 3932) @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> @@ -56,6 +56,8 @@ #include <mln/debug/println.hh> #include <mln/trace/quiet.hh> +#include "plot_points/int2rgb.hh" + using namespace mln; using value::int_u8; @@ -126,7 +128,6 @@ mln_VAR(w_all, wst.unmorph_()); - //io::dump::save(w_all, "watershed_edges.dump"); //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); @@ -134,8 +135,8 @@ mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); - //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); - io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm"); + io::dump::save(w_all, "watershed.dump"); + io::ppm::save(debug::int2rgb(w_all), "watershed.ppm"); return 0; Index: trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc (revision 3931) +++ trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc (revision 3932) @@ -41,7 +41,7 @@ // Initialization. - typedef int_u12 V; + typedef float V; image3d<V> input; io::dump::load(input, argv[1]); typedef image2d<util::array<V> > I; @@ -55,8 +55,15 @@ ima_arr(p).append(tmp_slice(p)); } + image2d<label_16> wst; + io::dump::load(wst, argv[2]); image2d<label_16> ima_labels; - io::dump::load(ima_labels, argv[2]); + initialize(ima_labels, ima_arr); + mln_piter_(image2d<label_16>) q(ima_labels.domain()); + for_all(q) + { + ima_labels(q) = wst.at_(q.row() * 2, q.col() * 2); + } // Plot points. int origin_x = ima_arr.bbox().pmin()[1]; @@ -69,7 +76,7 @@ int x = p[1] - origin_x; int y = p[0] - origin_y; std::ostringstream slabel; - slabel << "x"; + slabel << "l" << label << "_x"; if (x < 100) slabel << "0"; if (x < 10) Index: trunk/milena/sandbox/fabien/igr/plot_points/int2rgb.hh =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/int2rgb.hh (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_points/int2rgb.hh (revision 3932) @@ -0,0 +1,36 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> + + +namespace mln +{ + + namespace debug + { + + using value::rgb8; + + template <typename V> + image2d<rgb8> + int2rgb(const image2d<V>& input) + { + image2d<rgb8> output; + initialize(output, input); + + mln_piter(image2d<V>) p(input.domain()); + for_all(p) + { + unsigned value = input(p); + output(p).blue() = value % 256; + value /= 256; + output(p).green() = value % 256; + value /= 256; + output(p).red() = value % 256; + } + + return output; + } + +} // end of namespace mln::debug + +} // end of namespace mln Index: trunk/milena/sandbox/fabien/igr/plot_points/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/Makefile (revision 3931) +++ trunk/milena/sandbox/fabien/igr/plot_points/Makefile (revision 3932) @@ -4,7 +4,7 @@ ${CXX} -I../../../../ ${CXXFLAGS} $^ -o plot_all_points plot_points_of_label: plot_points_of_label.cc - ${CXX} -I../../../../ ${CXXFLAGS} $^ -o plot_points_all_label + ${CXX} -I../../../../ ${CXXFLAGS} $^ -o plot_points_of_label clean:

1 0

Re: [Olena-patches] [Olena] #118: Ensure Milena supports separate compilation
by Olena Trac 29 May '09

29 May '09

#118: Ensure Milena supports separate compilation -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: lazzara Type: defect | Status: closed Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: multiple objects separate compilation -----------------------+---------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => fixed Comment: A new test have been added in r3916. This test checks that the linker correctly merges global variables in a multiple-object context. The test use border::thickness and modify its value. The test is divided in two files and they are compiled with the same options. MLN_INCLUDE_ONLY is never defined. On Linux and MacOS duplicate global symbols seems to be handled correctly. I consider this ticket currently fixed. -- Ticket URL: <https://trac.lrde.org/olena/ticket/118#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

3931: Move to trash non-up-to-date image types.
by Thierry Geraud 29 May '09

29 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move to trash non-up-to-date image types. * mln/core/image/bgraph_image.hh, * mln/core/image/bgraph_psite.hh, * mln/core/image/mono_obased_rle_encode.hh, * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/mono_rle_encode.hh, * mln/core/image/mono_rle_image.hh, * mln/core/image/obased_rle_encode.hh, * mln/core/image/obased_rle_image.hh, * mln/core/image/rle_encode.hh, * mln/core/image/rle_image.hh, * mln/core/image/sparse_encode.hh, * mln/core/image/sparse_image.hh, * mln/core/image/value_enc_image.hh, * mln/core/image/value_encode.hh, * tests/core/image/bgraph_image.cc, * tests/core/image/fi_adaptor.cc, * tests/core/image/mono_obased_rle_image.cc, * tests/core/image/mono_rle_image.cc, * tests/core/image/obased_rle_image.cc, * tests/core/image/rle_image.cc, * tests/core/image/sparse_image.cc, * tests/core/image/value_enc_image.cc: Move... * trash/bgraph_image.cc, * trash/bgraph_image.hh, * trash/bgraph_psite.hh, * trash/fi_adaptor.cc, * trash/mono_obased_rle_encode.hh, * trash/mono_obased_rle_image.cc, * trash/mono_obased_rle_image.hh, * trash/mono_rle_encode.hh, * trash/mono_rle_image.cc, * trash/mono_rle_image.hh, * trash/obased_rle_encode.hh, * trash/obased_rle_image.cc, * trash/obased_rle_image.hh, * trash/rle_encode.hh, * trash/rle_image.cc, * trash/rle_image.hh, * trash/sparse_encode.hh, * trash/sparse_image.cc, * trash/sparse_image.hh, * trash/value_enc_image.cc, * trash/value_enc_image.hh, * trash/value_encode.hh: ...here. * tests/core/image/Makefile.am: Remove dead lines. De-activate code for freeimage since fi_adaptor was trashed. * mln/core/site_set/status.txt, * mln/core/image/status.txt: Remove; obsolete. Makefile.am | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) Index: tests/core/image/Makefile.am --- tests/core/image/Makefile.am (revision 3930) +++ tests/core/image/Makefile.am (working copy) @@ -8,7 +8,6 @@ imorph \ vmorph -##FIXME: re-enable tests check_PROGRAMS = \ complex_image \ edge_image \ @@ -20,19 +19,9 @@ line_graph_image \ vertex_image -## bgraph_image \ -## mono_obased_rle_image \ -## mono_rle_image \ -## obased_rle_image \ -## rle_image \ -## sparse_image \ -## value_enc_image - - noinst_HEADERS = complex_image.hh -##bgraph_image_SOURCES = bgraph_image.cc complex_image_SOURCES = complex_image.cc graph_image_SOURCES = graph_image.cc flat_image_SOURCES = flat_image.cc @@ -40,21 +29,15 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc line_graph_image_SOURCES = line_graph_image.cc -##mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc -##mono_rle_image_SOURCES = mono_rle_image.cc -##obased_rle_image_SOURCES = obased_rle_image.cc -##rle_image_SOURCES = rle_image.cc -##sparse_image_SOURCES = sparse_image.cc -##value_enc_image_SOURCES = value_enc_image.cc vertex_image_SOURCES = vertex_image.cc edge_image_SOURCES = edge_image.cc # Tests depending on the FreeImagePlus library. -if FREEIMAGEPLUS - check_PROGRAMS += fi_adaptor - fi_adaptor_SOURCES = fi_adaptor.cc - fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) - fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) -endif +#if FREEIMAGEPLUS +# check_PROGRAMS += fi_adaptor +# fi_adaptor_SOURCES = fi_adaptor.cc +# fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) +# fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) +#endif TESTS = $(check_PROGRAMS)

1 0

3930: Propagate update from level to data.
by Thierry Geraud 29 May '09

29 May '09

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Propagate update from level to data. * configure.ac: Propagate update from level to data. configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: configure.ac --- configure.ac (revision 3929) +++ configure.ac (working copy) @@ -255,6 +255,8 @@ milena/tests/core/routine/Makefile milena/tests/core/site_set/Makefile milena/tests/data/Makefile + milena/tests/data/approx/Makefile + milena/tests/data/naive/Makefile milena/tests/debug/Makefile milena/tests/display/Makefile milena/tests/draw/Makefile @@ -287,9 +289,6 @@ milena/tests/io/ppm/Makefile milena/tests/io/tiff/Makefile milena/tests/labeling/Makefile - milena/tests/level/Makefile - milena/tests/level/approx/Makefile - milena/tests/level/naive/Makefile milena/tests/linear/Makefile milena/tests/linear/gaussian/Makefile milena/tests/linear/local/Makefile

1 0

3929: Fix missing remove.
by Thierry Geraud 29 May '09

29 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix missing remove. * tests/level/Makefile.am: Remove. * tests/level: Remove directory. Makefile.am | 38 -------------------------------------- 1 file changed, 38 deletions(-) Index: tests/level/Makefile.am --- tests/level/Makefile.am (revision 3928) +++ tests/level/Makefile.am (working copy) @@ -1,38 +0,0 @@ -## Process this file through Automake to create Makefile.in. - -include $(top_srcdir)/milena/tests/tests.mk - -SUBDIRS = approx naive - -check_PROGRAMS = \ - abs \ - all_headers \ - apply \ - compare \ - compute \ - convert \ - median \ - median_fast \ - saturate \ - sort_psites \ - stretch \ - transform \ - transform_inplace \ - update - -abs_SOURCES = abs.cc -all_headers_SOURCES = all_headers.cc -apply_SOURCES = apply.cc -compare_SOURCES = compare.cc -compute_SOURCES = compute.cc -convert_SOURCES = convert.cc -median_SOURCES = median.cc -median_fast_SOURCES = median_fast.cc -saturate_SOURCES = saturate.cc -sort_psites_SOURCES = sort_psites.cc -stretch_SOURCES = stretch.cc -transform_SOURCES = transform.cc -transform_inplace_SOURCES = transform_inplace.cc -update_SOURCES = update.cc - -TESTS = $(check_PROGRAMS)

1 0