[Olena-patches] olena: olena-2.0-652-gc1215ff Use mln::math::pi instead of a macro-based definition in Scribo.

* scribo/preprocessing/deskew.hh (scribo::preprocessing::internal::perform_deskew): Here. (PI): Remove macro. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/preprocessing/deskew.hh | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a2960ab..ab98d1e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2013-08-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Use mln::math::pi instead of a macro-based definition in Scribo. + + * scribo/preprocessing/deskew.hh + (scribo::preprocessing::internal::perform_deskew): Here. + (PI): Remove macro. + +2013-08-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Do not declare main()'s arguments if they are not used. * tests/preprocessing/crop.cc, diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index a3fca24..e7b1af8 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -40,8 +40,6 @@ # include <mln/geom/rotate.hh> # include <mln/value/int_u8.hh> -# define PI 3.1415926535897932384 - namespace scribo { @@ -380,7 +378,7 @@ namespace scribo gx += -opt::at(gray, i - 1, j + 1) - 2 * opt::at(gray, i, j + 1) - opt::at(gray, i + 1, j + 1); - double tanv = (PI / 2.0 - atan(gy / gx)) * 180.0 / PI; + double tanv = (math::pi / 2.0 - atan(gy / gx)) * 180.0 / math::pi; if (tanv <= 25.0 || tanv >= 155.0) { -- 1.7.10.4