November 2012 - Olena-patches

[Olena] #235: Support GraphicsMagick++ and drop support for ImageMagick++
by Olena Trac 29 Nov '12

29 Nov '12

#235: Support GraphicsMagick++ and drop support for ImageMagick++ -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: proposal | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: io external | -------------------------+-------------------------------------------------- !GraphicsMagick (http://www.graphicsmagick.org/) seems to provide a framework more modern than !ImageMagick's (http://www.imagemagick.org) in particular regarding multi-core support. Moreover Fabien has discovered weird behaviors (#210) and Buildbot has also recently exhibited run time errors that did not surface before (https://buildfarm.lrde.org/buildfarm/oln/builders/i486-linux-gnu- gcc-4.1/builds/539/steps/check/logs/stdio) -- though I don't know who's the culprit here. -- Ticket URL: <https://trac.lrde.org/olena/ticket/235> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

Re: [Olena-patches] [Olena] #93: Create Olena Debian package(s) for i386 (was: Create Olena 1.x Debian package(s) for i386)
by Olena Trac 28 Nov '12

28 Nov '12

#93: Create Olena Debian package(s) for i386 ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 2.1 Component: Olena | Version: 2.0 Keywords: | ----------------------+----------------------------------------------------- Changes (by levill_r): * version: 1.0 => 2.0 -- Ticket URL: <https://trac.lrde.org/olena/ticket/93#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

Re: [Olena-patches] [Olena] #94: Create Olena Debian package(s) for amd64 (was: Create Olena 1.x Debian package(s) for amd64)
by Olena Trac 28 Nov '12

28 Nov '12

#94: Create Olena Debian package(s) for amd64 ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 2.1 Component: Olena | Version: 2.0 Keywords: | ----------------------+----------------------------------------------------- Changes (by levill_r): * version: 1.0 => 2.0 -- Ticket URL: <https://trac.lrde.org/olena/ticket/94#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

Re: [Olena-patches] [Olena] #95: Create an Olena port for the MacPorts (Mac OS X) (was: Create an Olena 1.x port for the MacPorts (Mac OS X))
by Olena Trac 28 Nov '12

28 Nov '12

#95: Create an Olena port for the MacPorts (Mac OS X) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: minor | Milestone: Olena 2.1 Component: Olena | Version: 2.0 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed * version: 1.0 => 2.0 * component: Milena => Olena Comment: The Portfile has been accepted and is now part of the MacPorts: * https://trac.macports.org/browser/trunk/dports/devel/olena/Portfile Thanks Guillaume! -- Ticket URL: <https://trac.lrde.org/olena/ticket/95#comment:5> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

branch exp/inpainting updated: olena-2.0-34-g2f5a09b
by git＠lrde.epita.fr 27 Nov '12

27 Nov '12

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 exp/inpainting has been updated via 2f5a09b9567b2d56843c93952104d5cb26774ce2 (commit) from 81cf2b37ac757ffdb551e4141ed61187ad57e2bf (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 ----------------------------------------------------------------- 2f5a09b Add new convergence test ----------------------------------------------------------------------- Summary of changes: milena/mln/inpainting/lpde.hh | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-34-g2f5a09b Add new convergence test
by Coddy Levi 27 Nov '12

27 Nov '12

--- milena/mln/inpainting/lpde.hh | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh index 77b656e..5f34d83 100644 --- a/milena/mln/inpainting/lpde.hh +++ b/milena/mln/inpainting/lpde.hh @@ -24,6 +24,7 @@ #include <mln/core/alias/vec2d.hh> #include <mln/inpainting/derivative_kernels.hh> +#include <mln/inpainting/fast_isotropic_diffusion.hh> #include <mln/core/concept/accumulator.hh> @@ -47,7 +48,7 @@ namespace mln template <template <typename> class I, typename T> void operator()(I<T>& src, - I<bool>& mask); + const I<bool>& mask); void set(const std::vector<float_type>& w); @@ -80,7 +81,7 @@ namespace mln T b) { T c; - // static loop unrolling ? + for (unsigned i = 0; i < mln_dim(T); ++i) c[i] = a[i] * b[i]; @@ -100,7 +101,8 @@ namespace mln I& u_next, //const I& f, const std::vector<lpde::float_type>& w, - const M& mask) + const M& mask, + lpde::float_type& max_diff_norm) { typedef lpde::float_type float_type; typedef mln_value(I) T; @@ -188,7 +190,13 @@ namespace mln + 2 * components_product(components_product(p_x, p_y), p_xy) + components_product(p_y2, p_yy)); - sse += norm::l2(old - p_next.val()); + float_type diff = norm::l2(old - p_next.val()); + sse += diff; + + if (diff > max_diff_norm) + { + max_diff_norm = diff; + } } } @@ -197,8 +205,11 @@ namespace mln template <template <typename> class I, typename T> void lpde::operator()(I<T>& src, - I<bool>& mask) + const I<bool>& mask) { + //fast_isotropic_diffusion fast_iso; + //fast_iso(src, mask); + //const I<T> f(src); I<T>& u_ = src; @@ -214,18 +225,26 @@ namespace mln float_type sse_old = std::numeric_limits<float_type>::max(); + float_type max_diff_norm = std::numeric_limits<float_type>::max(); + + float_type min_max_diff_norm = std::numeric_limits<float_type>::max(); + float t = 0; - while (t < this->t_f && sse < sse_old && !std::isnan(sse)) + while (t < this->t_f + && max_diff_norm > CONVERGENCE_THRESHOLD + //&& sse < sse_old + && !std::isnan(sse)) { + max_diff_norm = 0; + sse_old = sse; - sse = diffuse(*u, *u_next, /* f, */ w, mask); + sse = diffuse(*u, *u_next, /* f, */ w, mask, max_diff_norm); - I<T>* swap = u; - u = u_next; - u_next = swap; + if (max_diff_norm < min_max_diff_norm) + min_max_diff_norm = max_diff_norm; - //std::cout << "sse = " << sse << std::endl; + std::swap(u, u_next); t += this->dt; } -- 1.7.2.5

1 0

branch exp/inpainting updated: olena-2.0-33-g81cf2b3
by git＠lrde.epita.fr 27 Nov '12

27 Nov '12

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 exp/inpainting has been updated via 81cf2b37ac757ffdb551e4141ed61187ad57e2bf (commit) from 6dcfeca5f214e437a74783ba6978a0d0de12d44e (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 ----------------------------------------------------------------- 81cf2b3 Fastest implementation of fast isotropic diffusion method ----------------------------------------------------------------------- Summary of changes: milena/mln/inpainting/fast_isotropic_diffusion.hh | 69 +++++++++++--------- 1 files changed, 38 insertions(+), 31 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-33-g81cf2b3 Fastest implementation of fast isotropic diffusion method
by Coddy Levi 27 Nov '12

27 Nov '12

--- milena/mln/inpainting/fast_isotropic_diffusion.hh | 69 +++++++++++--------- 1 files changed, 38 insertions(+), 31 deletions(-) diff --git a/milena/mln/inpainting/fast_isotropic_diffusion.hh b/milena/mln/inpainting/fast_isotropic_diffusion.hh index 7be713a..d63f9d4 100644 --- a/milena/mln/inpainting/fast_isotropic_diffusion.hh +++ b/milena/mln/inpainting/fast_isotropic_diffusion.hh @@ -3,8 +3,13 @@ #include <mln/core/alias/point2d.hh> #include <mln/pw/value.hh> #include <mln/core/alias/neighb2d.hh> +#include <mln/literal/zero.hh> +#include <mln/norm/l2.hh> -#define CONVERGENCE_THRESHOLD 1 +#include <algorithm> +#include <limits> + +#define CONVERGENCE_THRESHOLD 0.05 namespace mln { @@ -17,57 +22,59 @@ namespace mln template <template <typename> class I, typename T> void operator()(I<T>& src, - I<bool>& mask); + const I<bool>& mask); }; template <template <typename> class I, typename T> void fast_isotropic_diffusion::operator()(I<T>& src, - I<bool>& mask) + const I<bool>& mask) { - mln_piter(I<T>) p(src.domain()); - mln_niter(neighb2d) n(c8(), p); + I<T> src_next(src); + + I<T>* u_ = &src; + I<T>* u_next_ = &src_next; - int max_diff = 1; - int iterations = 0; + float_type max_diff_norm = std::numeric_limits<float_type>::max(); + unsigned iterations = 0; - while (max_diff > 0) + while (max_diff_norm > CONVERGENCE_THRESHOLD) { ++iterations; + max_diff_norm = 0; + + const I<T>& u = *u_; + I<T>& u_next = *u_next_; - max_diff = 0; + mln_pixter(const I<T>) p(u); + mln_pixter(I<T>) p_next(u_next); + mln_pixter(const I<bool>) p_m(mask); + mln_nixter(const I<T>, const neighb2d) n(p, c8()); - for_all(p) + for_all_3(p, p_next, p_m) { - if (mask(p)) + if (p_m.val()) { - int diff = src(p)[0]; + T diff = p.val(); - float_type r = 0; - float_type g = 0; - float_type b = 0; + T accu = literal::zero; - for_all(n) - { - r += 0.125f * src(n)[0]; - g += 0.125f * src(n)[1]; - b += 0.125f * src(n)[2]; - } + for_all(n) + accu += ((float_type) 0.125) * n.val(); - src(p)[0] = r; - src(p)[1] = g; - src(p)[2] = b; + p_next.val() = accu; - diff -= src(p)[0]; + diff -= p_next.val(); - if (diff < 0) - diff = -diff; - - if (diff > max_diff) + float_type diff_norm = norm::l2(diff); + if (diff_norm > max_diff_norm) { - max_diff = diff; - } + max_diff_norm = diff_norm; + } } } + + std::swap(u_, u_next_); + } std::cout << iterations << "\t"; -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-87-ga9795b3
by git＠lrde.epita.fr 27 Nov '12

27 Nov '12

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 unstable/scribo has been updated via a9795b3b2307fea0b16162cb5a00f2f7197f829f (commit) from 2f05b089e9505c28f2295cdebef098b0131dce1c (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 ----------------------------------------------------------------- a9795b3 Save full size region debug image. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 ++++++++ scribo/scribo/io/img/save.hh | 19 ++++++++----------- scribo/src/content_in_doc.cc | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-87-ga9795b3 Save full size region debug image.
by Guillaume Lazzara 27 Nov '12

27 Nov '12

* src/content_in_doc.cc: Set output format to DebugWithImage. * scribo/io/img/save.hh: Do not subsample output image. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/io/img/save.hh | 19 ++++++++----------- scribo/src/content_in_doc.cc | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 503f4a5..3361823 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2012-11-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Save full size region debug image. + + * src/content_in_doc.cc: Set output format to DebugWithImage. + + * scribo/io/img/save.hh: Do not subsample output image. + +2012-11-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/content_in_doc.cc: Add more options. 2011-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/io/img/save.hh b/scribo/scribo/io/img/save.hh index a985d07..76c583b 100644 --- a/scribo/scribo/io/img/save.hh +++ b/scribo/scribo/io/img/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -39,8 +40,7 @@ # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/io/magick/save.hh> -# include <mln/subsampling/antialiased.hh> -# include <mln/data/transform_inplace.hh> +# include <mln/data/transform.hh> # include <scribo/core/document.hh> @@ -160,11 +160,9 @@ namespace scribo save_debug_without_image(const document<L>& doc) { mln_precondition(doc.is_valid()); - mln::image2d<value::rgb8> - output(box2d(doc.image().domain().pmin() / 4, - doc.image().domain().pmax() / 4)); + mln::image2d<value::rgb8> output(doc.image().domain()); data::fill(output, literal::black); - scribo::io::img::internal::debug_img_visitor<L> f(output, 4); + scribo::io::img::internal::debug_img_visitor<L> f(output, 1); doc.accept(f); return output; } @@ -174,11 +172,10 @@ namespace scribo save_debug_with_image(const document<L>& doc) { mln_precondition(doc.is_valid()); - mln::image2d<value::rgb8> - output = mln::subsampling::antialiased(doc.image(), 4); internal::highlight_mask highlight(0.5f); - data::transform_inplace(output, highlight); - scribo::io::img::internal::debug_img_visitor<L> f(output, 4); + mln::image2d<value::rgb8> + output = data::transform(doc.image(), highlight); + scribo::io::img::internal::debug_img_visitor<L> f(output, 1); doc.accept(f); return output; } diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 010a423..0d2fcac 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -202,7 +202,7 @@ int main(int argc, char* argv[]) if (scribo::debug::logger().is_enabled()) scribo::io::img::save(doc, mln::debug::filename("regions.png"), scribo::io::img::DebugWoImage); if (options.opt_value("debug-regions") != "/dev/null") - scribo::io::img::save(doc, options.opt_value("debug-regions"), scribo::io::img::DebugWoImage); + scribo::io::img::save(doc, options.opt_value("debug-regions"), scribo::io::img::DebugWithImage); trace::exiting("main"); } -- 1.7.2.5

1 0