Commit e4ad8e38 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

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.
parent 64b6e9d0
2013-03-18 Guillaume Lazzara <z@lrde.epita.fr>
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 <z@lrde.epita.fr>
 
* tests/algebra/mat.cc: Fix test.
// 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
......
......@@ -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>
......
......@@ -117,7 +117,7 @@ namespace mln
inline
gray_f::operator graylevel<m>() const
{
return graylevel<m>(math::round<int>()(this->v_
return graylevel<m>(math::round<int>(this->v_
* (mlc_pow_int(2, m) - 1)));
}
......@@ -126,7 +126,7 @@ namespace mln
inline
gray_f::operator gray_<m>() const
{
return gray_<m>(math::round<int>()(this->v_
return gray_<m>(math::round<int>(this->v_
* (mlc_pow_int(2, m) - 1)));
}
......
......@@ -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"
......
......@@ -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
......
mln/io/magick/all.hh
mln/io/magick/load.hh
mln/io/magick/save.hh
mln/io/magick/internal/init_magick.hh
mln/io/pdf/get_header.hh
mln/io/pdf/load.hh
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment