Olena-patches August 2013

olena-patches@lrde.epita.fr

5 participants
171 discussions

*****SPAM***** Located Worldwide? �Searching for a Lucrative Employment Position? �Growing Environmental Business Recruiting Candidates !

by olena-patches＠lrde.epita.fr

10 years, 8 months

[Olena] #273: make mln::value::int_u32 usable

by Olena Trac

#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.

10 years, 8 months

Re: [Olena-patches] [Olena] #90: Ensure dependencies on FreeImagePlus are handled correctly

by Olena Trac

#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.

10 years, 8 months

olena: branch topological-wst deleted: olena-2.0-655-g7e43020

by git＠lrde.epita.fr

10 years, 8 months

[Olena] #215: Clean up and integrate the Topological Watershed Transform

by Olena Trac

#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.

10 years, 8 months

olena: branch next updated: olena-2.0-655-g7e43020

by git＠lrde.epita.fr

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

10 years, 8 months

olena: olena-2.0-772-g32fe23a Regen images of the Milena documentation.

by Roland Levillain

* doc/figures/extend-1.ppm, * doc/figures/extend-2.ppm, * doc/figures/extend-3.ppm, * doc/figures/extend-4.ppm, * doc/figures/extend-5.ppm, * doc/figures/fill-1.ppm, * doc/figures/fill-2.ppm, * doc/figures/fill-imageif-cfun-1.ppm, * doc/figures/fill-subdomain-1.pbm, * doc/figures/fill-subdomain-2.ppm, * doc/figures/fill-subdomain-3.ppm, * doc/figures/fill-subdomain-4.ppm, * doc/figures/ima2d-rot-1.ppm, * doc/figures/ima2d-rot-2.ppm, * doc/figures/ima_save.pbm, * doc/figures/labeling-compute-1.pbm, * doc/figures/labeling-compute-2.ppm, * doc/figures/logical-not-1.pbm, * doc/figures/logical-not-2.pbm, * doc/figures/logical-not-3.pbm, * doc/figures/tuto2_first_image-1.pbm, * doc/figures/tuto3_colorize-1.pgm, * doc/figures/tuto3_colorize-2.ppm, * doc/figures/tuto3_rw_image-1.ppm, * doc/figures/tuto3_rw_image-2.ppm, * doc/figures/tuto3_rw_image-3.ppm, * doc/figures/tuto4_genericity_and_algorithms-1.ppm, * doc/figures/tuto4_genericity_and_algorithms-2.ppm, * doc/figures/tuto4_genericity_and_algorithms-3.pbm, * doc/figures/tuto4_genericity_and_algorithms-4.ppm, * doc/figures/tuto4_genericity_and_algorithms-5.ppm, * doc/figures/tuto4_genericity_and_algorithms-6.ppm: Regen. --- milena/ChangeLog | 38 ++++++++++++++++++++ milena/doc/figures/extend-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/extend-2.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-3.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-4.ppm | 2 +- milena/doc/figures/extend-5.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-2.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-imageif-cfun-1.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-1.pbm | 2 +- milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-4.ppm | Bin 206 -> 207 bytes milena/doc/figures/ima2d-rot-1.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima2d-rot-2.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima_save.pbm | 2 +- milena/doc/figures/labeling-compute-1.pbm | 2 +- milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/logical-not-1.pbm | 2 +- milena/doc/figures/logical-not-2.pbm | 2 +- milena/doc/figures/logical-not-3.pbm | 2 +- milena/doc/figures/tuto2_first_image-1.pbm | 2 +- milena/doc/figures/tuto3_colorize-1.pgm | Bin 141 -> 142 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 192 bytes milena/doc/figures/tuto3_rw_image-1.ppm | Bin 4918 -> 4919 bytes milena/doc/figures/tuto3_rw_image-2.ppm | 2 +- milena/doc/figures/tuto3_rw_image-3.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-1.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-2.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-3.pbm | 2 +- .../figures/tuto4_genericity_and_algorithms-4.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-6.ppm | Bin 12406 -> 12407 bytes 33 files changed, 48 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2a47e5a..e248291 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,43 @@ 2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Regen images of the Milena documentation. + + * doc/figures/extend-1.ppm, + * doc/figures/extend-2.ppm, + * doc/figures/extend-3.ppm, + * doc/figures/extend-4.ppm, + * doc/figures/extend-5.ppm, + * doc/figures/fill-1.ppm, + * doc/figures/fill-2.ppm, + * doc/figures/fill-imageif-cfun-1.ppm, + * doc/figures/fill-subdomain-1.pbm, + * doc/figures/fill-subdomain-2.ppm, + * doc/figures/fill-subdomain-3.ppm, + * doc/figures/fill-subdomain-4.ppm, + * doc/figures/ima2d-rot-1.ppm, + * doc/figures/ima2d-rot-2.ppm, + * doc/figures/ima_save.pbm, + * doc/figures/labeling-compute-1.pbm, + * doc/figures/labeling-compute-2.ppm, + * doc/figures/logical-not-1.pbm, + * doc/figures/logical-not-2.pbm, + * doc/figures/logical-not-3.pbm, + * doc/figures/tuto2_first_image-1.pbm, + * doc/figures/tuto3_colorize-1.pgm, + * doc/figures/tuto3_colorize-2.ppm, + * doc/figures/tuto3_rw_image-1.ppm, + * doc/figures/tuto3_rw_image-2.ppm, + * doc/figures/tuto3_rw_image-3.ppm, + * doc/figures/tuto4_genericity_and_algorithms-1.ppm, + * doc/figures/tuto4_genericity_and_algorithms-2.ppm, + * doc/figures/tuto4_genericity_and_algorithms-3.pbm, + * doc/figures/tuto4_genericity_and_algorithms-4.ppm, + * doc/figures/tuto4_genericity_and_algorithms-5.ppm, + * doc/figures/tuto4_genericity_and_algorithms-6.ppm: + Regen. + +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Make remaining Milena copyright headers uniform. * apps/generic-skel/image2d-skel-unconstrained.cc, diff --git a/milena/doc/figures/extend-1.ppm b/milena/doc/figures/extend-1.ppm index ccc5f9e..cd9fa8c 100644 Binary files a/milena/doc/figures/extend-1.ppm and b/milena/doc/figures/extend-1.ppm differ diff --git a/milena/doc/figures/extend-2.ppm b/milena/doc/figures/extend-2.ppm index 6e44be0..6588674 100644 Binary files a/milena/doc/figures/extend-2.ppm and b/milena/doc/figures/extend-2.ppm differ diff --git a/milena/doc/figures/extend-3.ppm b/milena/doc/figures/extend-3.ppm index c2ad4ad..e79e3c9 100644 Binary files a/milena/doc/figures/extend-3.ppm and b/milena/doc/figures/extend-3.ppm differ diff --git a/milena/doc/figures/extend-4.ppm b/milena/doc/figures/extend-4.ppm index 5425043..f4b94b3 100644 --- a/milena/doc/figures/extend-4.ppm +++ b/milena/doc/figures/extend-4.ppm @@ -1,5 +1,5 @@ P6 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 64 64 255 diff --git a/milena/doc/figures/extend-5.ppm b/milena/doc/figures/extend-5.ppm index d384c49..c4f03af 100644 Binary files a/milena/doc/figures/extend-5.ppm and b/milena/doc/figures/extend-5.ppm differ diff --git a/milena/doc/figures/fill-1.ppm b/milena/doc/figures/fill-1.ppm index ce4039f..48cbc46 100644 Binary files a/milena/doc/figures/fill-1.ppm and b/milena/doc/figures/fill-1.ppm differ diff --git a/milena/doc/figures/fill-2.ppm b/milena/doc/figures/fill-2.ppm index 4d42131..617e6d0 100644 Binary files a/milena/doc/figures/fill-2.ppm and b/milena/doc/figures/fill-2.ppm differ diff --git a/milena/doc/figures/fill-imageif-cfun-1.ppm b/milena/doc/figures/fill-imageif-cfun-1.ppm index a341258..05a97d5 100644 Binary files a/milena/doc/figures/fill-imageif-cfun-1.ppm and b/milena/doc/figures/fill-imageif-cfun-1.ppm differ diff --git a/milena/doc/figures/fill-subdomain-1.pbm b/milena/doc/figures/fill-subdomain-1.pbm index 4c79df2..b68be4a 100644 --- a/milena/doc/figures/fill-subdomain-1.pbm +++ b/milena/doc/figures/fill-subdomain-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 6 ��(@x \ No newline at end of file diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index 0e507e8..4368d6a 100644 Binary files a/milena/doc/figures/fill-subdomain-2.ppm and b/milena/doc/figures/fill-subdomain-2.ppm differ diff --git a/milena/doc/figures/fill-subdomain-3.ppm b/milena/doc/figures/fill-subdomain-3.ppm index 412ab99..a29ab29 100644 Binary files a/milena/doc/figures/fill-subdomain-3.ppm and b/milena/doc/figures/fill-subdomain-3.ppm differ diff --git a/milena/doc/figures/fill-subdomain-4.ppm b/milena/doc/figures/fill-subdomain-4.ppm index 41f6b54..e341a8c 100644 Binary files a/milena/doc/figures/fill-subdomain-4.ppm and b/milena/doc/figures/fill-subdomain-4.ppm differ diff --git a/milena/doc/figures/ima2d-rot-1.ppm b/milena/doc/figures/ima2d-rot-1.ppm index 512ff99..09dd453 100644 Binary files a/milena/doc/figures/ima2d-rot-1.ppm and b/milena/doc/figures/ima2d-rot-1.ppm differ diff --git a/milena/doc/figures/ima2d-rot-2.ppm b/milena/doc/figures/ima2d-rot-2.ppm index 0d7d601..45b2ebc 100644 Binary files a/milena/doc/figures/ima2d-rot-2.ppm and b/milena/doc/figures/ima2d-rot-2.ppm differ diff --git a/milena/doc/figures/ima_save.pbm b/milena/doc/figures/ima_save.pbm index 2faf6d4..e432b75 100644 --- a/milena/doc/figures/ima_save.pbm +++ b/milena/doc/figures/ima_save.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 X�X�� \ No newline at end of file diff --git a/milena/doc/figures/labeling-compute-1.pbm b/milena/doc/figures/labeling-compute-1.pbm index 4c79df2..b68be4a 100644 --- a/milena/doc/figures/labeling-compute-1.pbm +++ b/milena/doc/figures/labeling-compute-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 6 ��(@x \ No newline at end of file diff --git a/milena/doc/figures/labeling-compute-2.ppm b/milena/doc/figures/labeling-compute-2.ppm index 0e507e8..4368d6a 100644 Binary files a/milena/doc/figures/labeling-compute-2.ppm and b/milena/doc/figures/labeling-compute-2.ppm differ diff --git a/milena/doc/figures/logical-not-1.pbm b/milena/doc/figures/logical-not-1.pbm index 2faf6d4..e432b75 100644 --- a/milena/doc/figures/logical-not-1.pbm +++ b/milena/doc/figures/logical-not-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 X�X�� \ No newline at end of file diff --git a/milena/doc/figures/logical-not-2.pbm b/milena/doc/figures/logical-not-2.pbm index de560ba..025935b 100644 --- a/milena/doc/figures/logical-not-2.pbm +++ b/milena/doc/figures/logical-not-2.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 �P�PP \ No newline at end of file diff --git a/milena/doc/figures/logical-not-3.pbm b/milena/doc/figures/logical-not-3.pbm index de560ba..025935b 100644 --- a/milena/doc/figures/logical-not-3.pbm +++ b/milena/doc/figures/logical-not-3.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 �P�PP \ No newline at end of file diff --git a/milena/doc/figures/tuto2_first_image-1.pbm b/milena/doc/figures/tuto2_first_image-1.pbm index 03baef0..4ba9667 100644 --- a/milena/doc/figures/tuto2_first_image-1.pbm +++ b/milena/doc/figures/tuto2_first_image-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 21 13 ��ث�� \ No newline at end of file diff --git a/milena/doc/figures/tuto3_colorize-1.pgm b/milena/doc/figures/tuto3_colorize-1.pgm index d7222c7..b62c7ec 100644 Binary files a/milena/doc/figures/tuto3_colorize-1.pgm and b/milena/doc/figures/tuto3_colorize-1.pgm differ diff --git a/milena/doc/figures/tuto3_colorize-2.ppm b/milena/doc/figures/tuto3_colorize-2.ppm index b68f373..1d44e4c 100644 Binary files a/milena/doc/figures/tuto3_colorize-2.ppm and b/milena/doc/figures/tuto3_colorize-2.ppm differ diff --git a/milena/doc/figures/tuto3_rw_image-1.ppm b/milena/doc/figures/tuto3_rw_image-1.ppm index 0a14119..674ac7f 100644 Binary files a/milena/doc/figures/tuto3_rw_image-1.ppm and b/milena/doc/figures/tuto3_rw_image-1.ppm differ diff --git a/milena/doc/figures/tuto3_rw_image-2.ppm b/milena/doc/figures/tuto3_rw_image-2.ppm index 5c24dda..0a94b08 100644 --- a/milena/doc/figures/tuto3_rw_image-2.ppm +++ b/milena/doc/figures/tuto3_rw_image-2.ppm @@ -1,5 +1,5 @@ P6 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 40 40 255 diff --git a/milena/doc/figures/tuto3_rw_image-3.ppm b/milena/doc/figures/tuto3_rw_image-3.ppm index 67c37f1..d334995 100644 Binary files a/milena/doc/figures/tuto3_rw_image-3.ppm and b/milena/doc/figures/tuto3_rw_image-3.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm index 989d460..9a9aca7 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm index ff9092a..af5cf30 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm b/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm index 350283c..e6018c1 100644 --- a/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm +++ b/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr +# Generated by Olena 2.0a (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 64 64 �� \ No newline at end of file diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm index 48125b1..222a859 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm index a2952c3..b3cfb27 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm index 84e2681..b63f745 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm differ -- 1.7.10.4

10 years, 8 months

*****SPAM***** Environmental organization is expanding and currently recruiting Worldwide reps

by olena-patches＠lrde.epita.fr

10 years, 8 months

olena: branch topological-wst updated: olena-2.0-655-g7e43020

by git＠lrde.epita.fr

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 updated via 7e43020f1b94958d6287965abf4cb4cab901895b (commit) from 0a1c7ac3b44b539d21e4b3f50738291b2f79e093 (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 ----------------------------------------------------------------- 7e43020 Catch up with the new interface of the topological watershed. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 6 ++++++ .../constrained-connectivity/constrained-connectivity.cc | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 8 months

olena: olena-2.0-655-g7e43020 Catch up with the new interface of the topological watershed.

by Roland Levillain

* apps/constrained-connectivity/constrained-connectivity.cc: Here. --- milena/ChangeLog | 6 ++++++ .../constrained-connectivity/constrained-connectivity.cc | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a11c82d..1d143cb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with the new interface of the topological watershed. + + * apps/constrained-connectivity/constrained-connectivity.cc: Here. + 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> Have the topological WST be more generic. diff --git a/milena/apps/constrained-connectivity/constrained-connectivity.cc b/milena/apps/constrained-connectivity/constrained-connectivity.cc index 3dab1dc..d6ad094 100644 --- a/milena/apps/constrained-connectivity/constrained-connectivity.cc +++ b/milena/apps/constrained-connectivity/constrained-connectivity.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -164,11 +164,11 @@ int main(int argc, char* argv[]) This requires some changes in the topological WST implementation, to make its component tree structure compatible with morpho::tree::data. */ - typedef p_array<tree_t::site> sites_t; - sites_t sites = data::sort_psites_decreasing(w); - morpho::tree::data<w_t, sites_t> t(w, sites, world::inter_pixel::e2e()); + typedef p_array<tree_t::psite> psites_t; + psites_t psites = data::sort_psites_decreasing(w); + morpho::tree::data<w_t, psites_t> t(w, psites, world::inter_pixel::e2e()); - // Create initial images for min and max values on sites (not components). + // Create initial images for min and max values on psites (not components). mln_ch_value_(w_t, accu::stat::min<int_u8>) init_min_val; initialize (init_min_val, w); mln_ch_value_(w_t, accu::stat::max<int_u8>) init_max_val; -- 1.7.10.4

10 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches August 2013