[Olena-patches] olena-2.0-390-ge4ad8e3 Fix compilation issues.

* mln/fun/v2v/round_sat.hh, * mln/io/pdf/get_header.hh: Add missing includes. * mln/value/internal/gray_f.hxx: Update use of math::round. * tests/data.hh.in: Add a new path. * tests/unit_test/Makefile.am, * tests/unit_test/cond_tests_magickxx: Consider more conditional tests. * tests/unit_test/cond_tests_poppler: New. --- milena/ChangeLog | 17 +++++++++++++++++ milena/mln/fun/v2v/round_sat.hh | 4 +++- milena/mln/io/pdf/get_header.hh | 2 ++ milena/mln/value/internal/gray_f.hxx | 8 ++++---- milena/tests/data.hh.in | 3 +++ milena/tests/unit_test/Makefile.am | 1 + milena/tests/unit_test/cond_tests_magickxx | 1 + milena/tests/unit_test/cond_tests_poppler | 2 ++ 8 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_poppler diff --git a/milena/ChangeLog b/milena/ChangeLog index 2b7f730..b5dc109 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2013-03-18 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation issues. + + * mln/fun/v2v/round_sat.hh, + * mln/io/pdf/get_header.hh: Add missing includes. + + * mln/value/internal/gray_f.hxx: Update use of math::round. + + * tests/data.hh.in: Add a new path. + + * tests/unit_test/Makefile.am, + * tests/unit_test/cond_tests_magickxx: Consider more conditional + tests. + + * tests/unit_test/cond_tests_poppler: New. + 2013-03-15 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * tests/algebra/mat.cc: Fix test. diff --git a/milena/mln/fun/v2v/round_sat.hh b/milena/mln/fun/v2v/round_sat.hh index ce8c6b4..d0a0073 100644 --- a/milena/mln/fun/v2v/round_sat.hh +++ b/milena/mln/fun/v2v/round_sat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,6 +32,7 @@ /// Round the given value considering its type as circular. # include <mln/core/concept/function.hh> +# include <mln/trait/value_.hh> namespace mln diff --git a/milena/mln/io/pdf/get_header.hh b/milena/mln/io/pdf/get_header.hh index 1969689..0567433 100644 --- a/milena/mln/io/pdf/get_header.hh +++ b/milena/mln/io/pdf/get_header.hh @@ -33,6 +33,8 @@ # include <iostream> # include <fstream> +#include <poppler/cpp/poppler-document.h> + # include <mln/core/concept/image.hh> # include <mln/core/routine/initialize.hh> # include <mln/core/box_runstart_piter.hh> diff --git a/milena/mln/value/internal/gray_f.hxx b/milena/mln/value/internal/gray_f.hxx index c6863c3..66fdcad 100644 --- a/milena/mln/value/internal/gray_f.hxx +++ b/milena/mln/value/internal/gray_f.hxx @@ -117,8 +117,8 @@ namespace mln inline gray_f::operator graylevel<m>() const { - return graylevel<m>(math::round<int>()(this->v_ - * (mlc_pow_int(2, m) - 1))); + return graylevel<m>(math::round<int>(this->v_ + * (mlc_pow_int(2, m) - 1))); } @@ -126,8 +126,8 @@ namespace mln inline gray_f::operator gray_<m>() const { - return gray_<m>(math::round<int>()(this->v_ - * (mlc_pow_int(2, m) - 1))); + return gray_<m>(math::round<int>(this->v_ + * (mlc_pow_int(2, m) - 1))); } inline diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in index fe3034b..9e87a32 100644 --- a/milena/tests/data.hh.in +++ b/milena/tests/data.hh.in @@ -38,6 +38,9 @@ /// The absolute path to the img directory of Milena. # define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img" +/// \brief The absolute path to the test directory of Milena. +# define MLN_TESTS_DIR "@abs_top_srcdir@/milena/tests/" + /// The absolute path to the mesh directory of Milena. # define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh" diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 4ee9885..37df4c8 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -21,6 +21,7 @@ COND_TESTS = cond_tests_boost-tuple \ cond_tests_cfitsio \ cond_tests_gdcm \ cond_tests_magickxx \ + cond_tests_poppler \ cond_tests_qt \ cond_tests_tiff diff --git a/milena/tests/unit_test/cond_tests_magickxx b/milena/tests/unit_test/cond_tests_magickxx index 2d9ff23..8b34374 100644 --- a/milena/tests/unit_test/cond_tests_magickxx +++ b/milena/tests/unit_test/cond_tests_magickxx @@ -1,3 +1,4 @@ mln/io/magick/all.hh mln/io/magick/load.hh mln/io/magick/save.hh +mln/io/magick/internal/init_magick.hh diff --git a/milena/tests/unit_test/cond_tests_poppler b/milena/tests/unit_test/cond_tests_poppler new file mode 100644 index 0000000..4f13e3c --- /dev/null +++ b/milena/tests/unit_test/cond_tests_poppler @@ -0,0 +1,2 @@ +mln/io/pdf/get_header.hh +mln/io/pdf/load.hh -- 1.7.2.5