- Olena-patches

olena: olena-2.0-760-g5d8a125 Fix the use of Pi in Milena's apps/mesh-segm-skel.
by Roland Levillain 30 Aug '13

30 Aug '13

* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Here. --- milena/ChangeLog | 10 ++++++++++ milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc | 4 ---- milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc | 1 - milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 8 +++----- milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 9 ++++----- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 58df7ec..82beada 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix the use of Pi in Milena's apps/mesh-segm-skel. + + * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix header inclusions in Milena's apps/mesh-segm-skel. * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index e17c477..b57b9aa 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -65,10 +65,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) 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 2c879ff..080de26 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 @@ -43,7 +43,6 @@ #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> diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index ced95a0..97b731c 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -45,6 +45,7 @@ #include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> +#include <mln/math/pi.hh> #include <mln/math/max.hh> #include <mln/math/sqr.hh> @@ -56,10 +57,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) @@ -96,7 +93,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); float_ima(v) = h_inv; } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index d9e6ae4..f020794 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -54,6 +54,8 @@ #include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> +#include <mln/math/pi.hh> + #include <mln/util/timer.hh> #include <mln/io/off/load.hh> @@ -64,10 +66,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[]) { @@ -110,7 +108,8 @@ 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); float_ima(v) = h_inv; } -- 1.7.10.4

1 0

*****SPAM***** Excellent Opportunity �- Environmental Business Growing and Seeking Representatives
by olena-patches＠lrde.epita.fr 30 Aug '13

30 Aug '13

1 0

*****SPAM***** Great Opportunity - Environmental Company Expanding and Looking for Reps
by olena-patches＠lrde.epita.fr 30 Aug '13

30 Aug '13

1 0

*****SPAM***** Excellent Opportunity �- Environmental Business Growing and Seeking Representatives
by olena-patches＠lrde.epita.fr 30 Aug '13

30 Aug '13

1 0

*****SPAM***** Located Worldwide? �Searching for a Lucrative Employment Position? �Growing Environmental Business Recruiting Candidates !
by olena-patches＠lrde.epita.fr 29 Aug '13

29 Aug '13

1 0

[Olena] #273: make mln::value::int_u32 usable
by Olena Trac 29 Aug '13

29 Aug '13

#273: make mln::value::int_u32 usable ----------------------+------------------------ Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 2.1 Component: Milena | Version: 2.0 Keywords: | ----------------------+------------------------ Due to the limitations of the built-in `int` type on GNU/Linux with GCC (which is a 32-bit signed integer, even on 64-bit hosts), `mln::value::int_u32` does not compile properly. For instance, here is the compile error output of the `milena/tests/value/int_u32` test on Debian GNU/Linux 7.1 amd64 with `g++` 4.7.2 (Debian 4.7.2-5) : {{{ In file included from ../../../../milena/mln/metal/math/all.hh:54:0, from ../../../../milena/mln/core/concept/object.hh:54, from ../../../../milena/mln/core/internal/exact.hh:142, from ../../../../milena/mln/core/routine/exact.hh:44, from ../../../../milena/mln/trait/solve_unary.hh:38, from ../../../../milena/mln/trait/solve.hh:162, from ../../../../milena/mln/trait/promote.hh:38, from ../../../../milena/mln/trait/op/plus.hh:63, from ../../../../milena/mln/trait/op/all.hh:38, from ../../../../milena/mln/value/ops.hh:34, from ../../../../milena/mln/value/int_u.hh:35, from ../../../../milena/mln/value/int_u32.hh:35, from ../../../../milena/tests/value/int_u32.cc:30: ../../../../milena/mln/metal/math/pow.hh: In instantiation of ‘const int mln::metal::math::impl::pow_int_<2, 31>::value’: ../../../../milena/mln/metal/math/pow.hh:61:51: required from ‘const int mln::metal::math::impl::pow_int_<2, 32>::value’ ../../../../milena/mln/value/int_u.hh:99:84: required from ‘static const self_ mln::trait::value_<mln::value::int_u<n> >::max() [with unsigned int n = 32u; mln::trait::value_<mln::value::int_u<n> >::self_ = mln::value::int_u<32u>]’ ../../../../milena/tests/value/int_u32.cc:35:61: required from here ../../../../milena/mln/metal/math/pow.hh:61:51: warning: integer overflow in expression [-Woverflow] ../../../../milena/mln/metal/math/pow.hh: In instantiation of ‘const int mln::metal::math::impl::pow_int_<2, 32>::value’: ../../../../milena/mln/value/int_u.hh:99:84: required from ‘static const self_ mln::trait::value_<mln::value::int_u<n> >::max() [with unsigned int n = 32u; mln::trait::value_<mln::value::int_u<n> >::self_ = mln::value::int_u<32u>]’ ../../../../milena/tests/value/int_u32.cc:35:61: required from here ../../../../milena/mln/metal/math/pow.hh:61:51: error: initializer invalid for static member with constructor ../../../../milena/mln/metal/math/pow.hh:61:51: error: (an out of class initialization is required) ../../../../milena/mln/metal/math/pow.hh:61:51: error: ‘mln::metal::math::impl::pow_int_<2, 32>::value’ cannot be initialized by a non-constant expression when being declared }}} Maybe we should redefine `mln::metal::math::pow` as well. -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/273> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 1

Re: [Olena-patches] [Olena] #90: Ensure dependencies on FreeImagePlus are handled correctly
by Olena Trac 29 Aug '13

29 Aug '13

#90: Ensure dependencies on FreeImagePlus are handled correctly -----------------------+------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: closed Priority: major | Milestone: Olena 2.1 Component: Milena | Version: 2.0 Resolution: wontfix | Keywords: freeimage freeimageplus -----------------------+------------------------------------- Changes (by levill_r): * keywords: freeinage freeimageplus => freeimage freeimageplus * status: new => closed * version: 1.0 => 2.0 * resolution: => wontfix Comment: This ticket is now irrelevant; closing. -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/90#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

olena: branch topological-wst deleted: olena-2.0-655-g7e43020
by git＠lrde.epita.fr 29 Aug '13

29 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 topological-wst has been deleted was 7e43020f1b94958d6287965abf4cb4cab901895b ----------------------------------------------------------------------- 7e43020f1b94958d6287965abf4cb4cab901895b Catch up with the new interface of the topological watershed. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

[Olena] #215: Clean up and integrate the Topological Watershed Transform
by Olena Trac 29 Aug '13

29 Aug '13

#215: Clean up and integrate the Topological Watershed Transform ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Alexandre Abraham's implementation of the Topological WST is working (see an example of use in source:trunk/milena/sandbox/roland/constrained- connectivity.cc) but there are a few issues here and there (notably w.r.t. genericity). Clean it up, and move it to source:trunk/milena/mln/morpho/watershed/. Do not forget to tag the initial file as outdated in the sandbox (or even to remove it). -- Ticket URL: <https://trac.lrde.org/olena/ticket/215> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 3

olena: branch next updated: olena-2.0-655-g7e43020
by git＠lrde.epita.fr 29 Aug '13

29 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 7e43020f1b94958d6287965abf4cb4cab901895b (commit) via 0a1c7ac3b44b539d21e4b3f50738291b2f79e093 (commit) via 26d31484856f050052cfed5122507ad24926e81a (commit) from c1215ffb093c6e4b0bfbb8d6d0c522e4591c9979 (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 | 23 +++ .../constrained-connectivity.cc | 10 +- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 10 +- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 7 +- milena/mln/core/site_set/p_set.hh | 14 +- milena/mln/morpho/watershed/topological.hh | 194 ++++++++++---------- 6 files changed, 146 insertions(+), 112 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0