- Olena-patches

olena: olena-2.0-653-g26d3148 Fix Pi usage in Milena's apps.
by Roland Levillain 28 Aug '13

28 Aug '13

* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc | 10 ++++------ milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc | 7 ++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77442f1..4a827d3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-08-28 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Pi usage in Milena's apps. + + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: + Here. + 2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> Use mln::math::pi instead of a local definition in Milena. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 9a00dad..d2c627f 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -41,6 +41,7 @@ #include <mln/morpho/closing/area.hh> #include <mln/morpho/watershed/flooding.hh> +#include <mln/math/pi.hh> #include <mln/math/max.hh> #include <mln/math/sqr.hh> @@ -52,10 +53,6 @@ #include "misc.hh" -// Doesn't C++ have a better way to express Pi? -static const float pi = 4 * atanf(1); - - int main(int argc, char* argv[]) { if (argc != 4) @@ -91,7 +88,8 @@ int main(int argc, char* argv[]) { float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. - float h_inv = 1 / pi * (atan(-h) + pi / 2); + float h_inv = + 1 / float(mln::math::pi) * (atanf(-h) + float(mln::math::pi) / 2); input(v) = h_inv; // FIXME: The program should allow the user to choose the kind // of measure. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 85a0adc..89bc50f 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,10 +55,6 @@ #include "misc.hh" -// Doesn't C++ have a better way to express Pi? -static const float pi = 4 * atanf(1); - - int main(int argc, char* argv[]) { if (argc != 3) -- 1.7.10.4

1 0

olena: branch revamp-doc-build deleted: olena-2.0-642-gb1efc3e
by git＠lrde.epita.fr 28 Aug '13

28 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch revamp-doc-build has been deleted was b1efc3e8713ad04f14e4e65645342927b33fbfe1 ----------------------------------------------------------------------- b1efc3e8713ad04f14e4e65645342927b33fbfe1 Remove old Subversion keywords from ChangeLogs. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch fft deleted: olena-2.0-638-g0a07893
by git＠lrde.epita.fr 28 Aug '13

28 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fft has been deleted was 0a078938b8f3fdc10d234fe663ff74a4b6a44284 ----------------------------------------------------------------------- 0a078938b8f3fdc10d234fe663ff74a4b6a44284 Run FFT unit tests only when FFTW3 support is enabled. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-652-gc1215ff
by git＠lrde.epita.fr 28 Aug '13

28 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via c1215ffb093c6e4b0bfbb8d6d0c522e4591c9979 (commit) via 6e6baf62c3b15ccd846760b5cd5c0ca8401d7afe (commit) via 42bdd44352ec055008afc581b4a61ed892f1ef5f (commit) via b3754d8eda282e0a83afaf8bf5dbe42ffb0193c9 (commit) via 88e9e68e5ee86ef83b4d6ed2fcc926ae4497ecc2 (commit) via 6b9bc50e45224d17f9ac617fc36b9baa8807ffb2 (commit) via a2d5c260202c5cd2d2f536aab7f03370d5c39aaa (commit) via 8c828c81c57a819e5eaf88ffc47fc354948e9d05 (commit) via 3124478b0522c2fda5b4b2d6b903f3c66e8532ea (commit) via 3e32b86e95ee68eaa69bd188a3cfb9a084dd3c64 (commit) from b1efc3e8713ad04f14e4e65645342927b33fbfe1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 49 +++++++++++++++ milena/doc/Makefile.am | 2 - milena/doc/generate_dist_files.sh | 47 -------------- milena/doc/tools/clearbanner.sh | 22 ------- milena/mln/accu/stat/median_alt.hh | 14 +---- milena/mln/algebra/quat.hh | 9 +-- .../canvas/browsing/dir_struct_elt_incr_update.hh | 31 ++-------- milena/mln/core/image/image2d.hh | 5 -- milena/mln/core/internal/classical_window_base.hh | 1 - milena/mln/core/internal/image_morpher.hh | 1 - milena/mln/io/pdf/load.hh | 8 +-- milena/mln/io/raw/load.hh | 3 +- milena/mln/io/tiff/load.hh | 10 +-- milena/mln/math/pi.hh | 10 ++- milena/mln/morpho/tree/data.hh | 10 +-- milena/mln/morpho/tree/impl/dual_hqueue.hh | 5 +- milena/mln/morpho/tree/impl/dual_union_find.hh | 13 +--- milena/mln/morpho/watershed/topological.hh | 4 -- milena/mln/util/edge.hh | 3 +- milena/mln/util/timer.hh | 9 --- scribo/ChangeLog | 56 +++++++++++++++++ scribo/scribo/afp/components.hh | 12 ---- scribo/scribo/core/line_set.hh | 2 - scribo/scribo/core/object_groups.hh | 5 +- scribo/scribo/core/paragraph_set.hh | 3 +- scribo/scribo/estim/components_features.hh | 24 +------- scribo/scribo/filter/objects_with_holes.hh | 33 +--------- scribo/scribo/filter/separators_in_borders.hh | 14 ----- scribo/scribo/io/xml/load.hh | 15 +---- scribo/scribo/postprocessing/fill_object_holes.hh | 9 --- scribo/scribo/preprocessing/deskew.hh | 7 +-- scribo/scribo/preprocessing/deskew_crop.hh | 3 +- .../primitive/extract/lines_h_thick_and_thin.hh | 3 +- scribo/scribo/primitive/extract/non_text.hh | 4 -- scribo/scribo/primitive/extract/non_text_kmean.hh | 5 +- .../primitive/extract/separators_nonvisible.hh | 65 +------------------- scribo/scribo/text/clean_inplace.hh | 15 +---- scribo/scribo/text/extract_paragraphs_hdoc.hh | 44 ------------- scribo/scribo/text/merging.hh | 55 +---------------- scribo/scribo/text/recognition.hh | 4 +- scribo/tests/preprocessing/crop.cc | 6 +- .../preprocessing/crop_without_localization.cc | 6 +- scribo/tests/preprocessing/deskew.cc | 6 +- scribo/tests/preprocessing/rotate_90.cc | 6 +- 44 files changed, 159 insertions(+), 499 deletions(-) delete mode 100755 milena/doc/generate_dist_files.sh delete mode 100755 milena/doc/tools/clearbanner.sh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch cleanup created: olena-2.0-652-gc1215ff
by git＠lrde.epita.fr 27 Aug '13

27 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch cleanup has been created at c1215ffb093c6e4b0bfbb8d6d0c522e4591c9979 (commit) - Log ----------------------------------------------------------------- c1215ff Use mln::math::pi instead of a macro-based definition in Scribo. 6e6baf6 Use mln::math::pi instead of a local definition in Milena. 42bdd44 Set mln::math::pi to 20 decimals. b3754d8 Do not declare main()'s arguments if they are not used. 88e9e68 Remove dead code in Scribo. 6b9bc50 Display Scribo errors on std::cerr, not std::cout. a2d5c26 Remove Scribo debug code making side effects on streams. 8c828c8 Display Milena fatal errors on std::cerr, not std::cout. 3124478 Remove Milena debug code making side effects on streams. 3e32b86 Remove old tools from doc/. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-642-gb1efc3e
by git＠lrde.epita.fr 27 Aug '13

27 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via b1efc3e8713ad04f14e4e65645342927b33fbfe1 (commit) via f15b2c0e82fb846615c755590564955e56b163fc (commit) via 8f094c6dbc3e7a53004f25a6b4268c5fa88e0f47 (commit) via 02c4ea9fa1d28f8f6fd8161f5464e713e6c1c540 (commit) from 0a078938b8f3fdc10d234fe663ff74a4b6a44284 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 17 ++++++++++++---- doc/Doxyfile.in | 4 ++-- doc/Makefile.am | 39 ++++++++++++++++++------------------ milena/ChangeLog | 20 +++++++++++++++---- milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 51 ++++++++++++++++++++++++------------------------ scribo/ChangeLog | 20 +++++++++++++++---- scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 50 +++++++++++++++++++++++------------------------ swilena/ChangeLog | 4 ---- 10 files changed, 119 insertions(+), 90 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-652-gc1215ff Use mln::math::pi instead of a macro-based definition in Scribo.
by Roland Levillain 27 Aug '13

27 Aug '13

* 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 <roland(a)lrde.epita.fr> + 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 <roland(a)lrde.epita.fr> + 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

1 0

olena: olena-2.0-651-g6e6baf6 Use mln::math::pi instead of a local definition in Milena.
by Roland Levillain 27 Aug '13

27 Aug '13

* mln/algebra/quat.hh (mln::algebra::quat::set_unit): Here. --- milena/ChangeLog | 6 ++++++ milena/mln/algebra/quat.hh | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 45d0a38..77442f1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> + Use mln::math::pi instead of a local definition in Milena. + + * mln/algebra/quat.hh (mln::algebra::quat::set_unit): Here. + +2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> + Set mln::math::pi to 20 decimals. * mln/math/pi.hh (mln::math::pi): Here. diff --git a/milena/mln/algebra/quat.hh b/milena/mln/algebra/quat.hh index 2ba89e4..a433725 100644 --- a/milena/mln/algebra/quat.hh +++ b/milena/mln/algebra/quat.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -462,12 +462,9 @@ namespace mln inline void quat::set_unit(float theta, const algebra::vec<3,T>& uv) { - static const float pi = 3.14159265358979323846f; - - mln_precondition(theta > - pi - mln_epsilon(float) - && theta < pi + mln_epsilon(float)); + mln_precondition(theta > - float(math::pi) - mln_epsilon(float) + && theta < float(math::pi) + mln_epsilon(float)); mln_precondition(about_equal(norm::l2(uv), 1.f)); - (void) pi; this->v_[0] = std::cos(theta); float sint = std::sin(theta); -- 1.7.10.4

1 0

olena: olena-2.0-650-g42bdd44 Set mln::math::pi to 20 decimals.
by Roland Levillain 27 Aug '13

27 Aug '13

* mln/math/pi.hh (mln::math::pi): Here. Use the value of the M_PI macro from glibc's math.h header. --- milena/ChangeLog | 7 +++++++ milena/mln/math/pi.hh | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8e8dbcc..45d0a38 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> + Set mln::math::pi to 20 decimals. + + * mln/math/pi.hh (mln::math::pi): Here. + Use the value of the M_PI macro from glibc's math.h header. + +2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> + Display Milena fatal errors on std::cerr, not std::cout. * mln/io/pdf/load.hh, diff --git a/milena/mln/math/pi.hh b/milena/mln/math/pi.hh index b056bc6..bcd43fd 100644 --- a/milena/mln/math/pi.hh +++ b/milena/mln/math/pi.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Copyright (C) 2009, 2010, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -33,17 +33,15 @@ namespace mln namespace math { - /*! \brief The number Pi. - 19 decimals. - \ingroup mlnmath - */ + /// \brief The Pi constant (20-decimal double constant). + /// \ingroup mlnmath extern const double pi; # ifndef MLN_INCLUDE_ONLY # ifndef MLN_WO_GLOBAL_VARS - const double pi = 3.1415926535897932385; + const double pi = 3.14159265358979323846; # endif // ! MLN_WO_GLOBAL_VARS -- 1.7.10.4

1 0

[Olena] #272: linear::gaussian does not work properly on rgb images
by Olena Trac 27 Aug '13

27 Aug '13

#272: linear::gaussian does not work properly on rgb images -----------------------------+------------------------ Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 2.0 Keywords: gaussian filter | -----------------------------+------------------------ Hi, linear::gaussian gives strange results on rgb images. It should be fixed. J.F. -- Ticket URL: <https://trac.lrde.org/olena/ticket/272> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0