- Olena-patches

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

branch unstable/scribo updated: olena-2.0-86-g2f05b08
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 2f05b089e9505c28f2295cdebef098b0131dce1c (commit) from e07c016a87c81f22241ac99053cbd92e673e116a (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 ----------------------------------------------------------------- 2f05b08 src/content_in_doc.cc: Add more options. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/src/content_in_doc.cc | 29 ++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-86-g2f05b08 src/content_in_doc.cc: Add more options.
by Guillaume Lazzara 27 Nov '12

27 Nov '12

--- scribo/ChangeLog | 4 ++++ scribo/src/content_in_doc.cc | 29 ++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1bb8769..503f4a5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +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> * scribo/text/recognition.hh: Restore previous locale. diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 0228f30..010a423 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -86,8 +86,15 @@ static const scribo::debug::opt_data opt_desc[] = "fra, deu, ita, nld, por, spa, vie", "<lang>", scribo::debug::check_ocr_lang, 1, "eng" }, { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, - { "xml-format", "Choose betwen page, page-ext (default: page-ext).", "<format>", + { "xml-format", "Choose betwen page, page-ext and full (default: page-ext).", "<format>", scribo::debug::check_xml_format, 1, "page-ext" }, + { "more-xml-format", "Provide an additional xml output. Format can" + " be chosen between page, page-ext and full (default: page-ext).", "<format>", + scribo::debug::check_xml_format, 1, "none" }, + { "more-xml-file", "Filename of the additional xml output.", "<filename>", + 0, 1, "/dev/null" }, + { "debug-regions", "Save a debug image with all the regions.", "<filename>", + 0, 1, "/dev/null" }, {0, 0, 0, 0, 0, 0} }; @@ -175,15 +182,27 @@ int main(int argc, char* argv[]) // Saving results if (verbose) std::cout << "Saving results..." << std::endl; + + // Default XML output if (options.opt_value("xml-format") == "page-ext") scribo::io::xml::save(doc, options.arg("out.xml"), scribo::io::xml::PageExtended); - else if (options.opt_value("xml-format") == "page") + if (options.opt_value("xml-format") == "page") scribo::io::xml::save(doc, options.arg("out.xml"), scribo::io::xml::Page); - else if (options.opt_value("xml-format") == "full") + if (options.opt_value("xml-format") == "full") scribo::io::xml::save(doc, options.arg("out.xml"), scribo::io::xml::Full); + // Additional XML output + if (options.opt_value("more-xml-format") == "page-ext") + scribo::io::xml::save(doc, options.opt_value("more-xml-file"), scribo::io::xml::PageExtended); + if (options.opt_value("more-xml-format") == "page") + scribo::io::xml::save(doc, options.opt_value("more-xml-file"), scribo::io::xml::Page); + if (options.opt_value("more-xml-format") == "full") + scribo::io::xml::save(doc, options.opt_value("more-xml-file"), scribo::io::xml::Full); + 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); trace::exiting("main"); } -- 1.7.2.5

1 0

branch exp/inpainting updated: olena-2.0-32-g6dcfeca
by git＠lrde.epita.fr 25 Nov '12

25 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 6dcfeca5f214e437a74783ba6978a0d0de12d44e (commit) via 004137da284fdf4733d786a90cd4d9cefa2f0585 (commit) from 144473b6b15382a1f73f4eba1c9e10e95be1c2a9 (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 ----------------------------------------------------------------- 6dcfeca New dummy fast isotropic diffusion inpaint method for comparison 004137d cleaner prints ----------------------------------------------------------------------- Summary of changes: milena/mln/inpainting/fast_isotropic_diffusion.hh | 78 +++++++++++++++++++++ milena/mln/inpainting/inpaint.hh | 4 +- milena/mln/inpainting/lpde.hh | 2 +- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 milena/mln/inpainting/fast_isotropic_diffusion.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-32-g6dcfeca New dummy fast isotropic diffusion inpaint method for comparison
by Coddy Levi 25 Nov '12

25 Nov '12

--- milena/mln/inpainting/fast_isotropic_diffusion.hh | 78 +++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) create mode 100644 milena/mln/inpainting/fast_isotropic_diffusion.hh diff --git a/milena/mln/inpainting/fast_isotropic_diffusion.hh b/milena/mln/inpainting/fast_isotropic_diffusion.hh new file mode 100644 index 0000000..7be713a --- /dev/null +++ b/milena/mln/inpainting/fast_isotropic_diffusion.hh @@ -0,0 +1,78 @@ +#include <mln/core/macros.hh> +#include <mln/core/concept/image.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/pw/value.hh> +#include <mln/core/alias/neighb2d.hh> + +#define CONVERGENCE_THRESHOLD 1 + +namespace mln +{ + namespace inpainting + { + struct fast_isotropic_diffusion + { + public: + typedef double float_type; + + template <template <typename> class I, typename T> + void operator()(I<T>& src, + I<bool>& mask); + }; + + template <template <typename> class I, typename T> + void fast_isotropic_diffusion::operator()(I<T>& src, + I<bool>& mask) + { + mln_piter(I<T>) p(src.domain()); + mln_niter(neighb2d) n(c8(), p); + + int max_diff = 1; + int iterations = 0; + + while (max_diff > 0) + { + ++iterations; + + max_diff = 0; + + for_all(p) + { + if (mask(p)) + { + int diff = src(p)[0]; + + float_type r = 0; + float_type g = 0; + float_type b = 0; + + for_all(n) + { + r += 0.125f * src(n)[0]; + g += 0.125f * src(n)[1]; + b += 0.125f * src(n)[2]; + } + + src(p)[0] = r; + src(p)[1] = g; + src(p)[2] = b; + + diff -= src(p)[0]; + + if (diff < 0) + diff = -diff; + + if (diff > max_diff) + { + max_diff = diff; + } + } + } + } + + std::cout << iterations << "\t"; + } + + } /* mln::inpainting */ + +} /* mln */ -- 1.7.2.5

1 0

olena-2.0-31-g004137d cleaner prints
by Coddy Levi 25 Nov '12

25 Nov '12

--- milena/mln/inpainting/inpaint.hh | 4 ++-- milena/mln/inpainting/lpde.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/milena/mln/inpainting/inpaint.hh b/milena/mln/inpainting/inpaint.hh index f117cb7..9db2438 100644 --- a/milena/mln/inpainting/inpaint.hh +++ b/milena/mln/inpainting/inpaint.hh @@ -94,8 +94,8 @@ namespace mln double psnr = metric::psnr(inpaint_src | pw::value(inpaint_mask), new_src | pw::value(new_mask)); - std::cout << "inpaint time = " << t << "; " - << "psnr = " << psnr << std::endl; + std::cout << t << "\t" + << psnr << "\t"; I<T> output(inpaint_src); { // paste new_src to output diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh index 65f6ab1..77b656e 100644 --- a/milena/mln/inpainting/lpde.hh +++ b/milena/mln/inpainting/lpde.hh @@ -230,7 +230,7 @@ namespace mln t += this->dt; } - std::cout << "Number of iterations: " << t << std::endl; + std::cout << t << "\t"; } void lpde::set(const std::vector<float_type>& w) -- 1.7.2.5

1 0

branch exp/inpainting updated: olena-2.0-30-g144473b
by git＠lrde.epita.fr 19 Nov '12

19 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 144473b6b15382a1f73f4eba1c9e10e95be1c2a9 (commit) from ff189ba30ee97d424fe6e480cabb0fc4cc49e2c3 (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 ----------------------------------------------------------------- 144473b Add forgotten derivative kernels definition file to previous commit ----------------------------------------------------------------------- Summary of changes: milena/mln/inpainting/derivative_kernels.hh | 54 +++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 milena/mln/inpainting/derivative_kernels.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-30-g144473b Add forgotten derivative kernels definition file to previous commit
by Coddy Levi 19 Nov '12

19 Nov '12

--- milena/mln/inpainting/derivative_kernels.hh | 54 +++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 milena/mln/inpainting/derivative_kernels.hh diff --git a/milena/mln/inpainting/derivative_kernels.hh b/milena/mln/inpainting/derivative_kernels.hh new file mode 100644 index 0000000..5b642ee --- /dev/null +++ b/milena/mln/inpainting/derivative_kernels.hh @@ -0,0 +1,54 @@ +namespace mln +{ + namespace inpainting + { + template <typename T> + const T* make_dx_kernel() + { + static const T ws[] = { 0.1, 0.2, 0.1, + 0, 0, 0, + -0.1, -0.2, -0.1 }; + return ws; + } + + template <typename T> + const T* make_dy_kernel() + { + static const T ws[] = { 0.1, 0, -0.1, + 0.2, 0, -0.2, + 0.1, 0, -0.1 }; + + return ws; + } + + template <typename T> + const T* make_dxx_kernel() + { + static const T ws[] = {0.0804, 0.1597, 0.0804, + -0.1608, -0.3194, -0.1608, + 0.0804, 0.1597, 0.0804}; + + return ws; + } + + template <typename T> + const T* make_dyy_kernel() + { + static const T ws[] = {0.0804, -0.1608, 0.0804, + 0.1597, -0.3194, 0.1597, + 0.0804, -0.1608, 0.0804}; + + return ws; + } + + template <typename T> + const T* make_dxy_kernel() + { + static const T ws[] = {0.1051, 0, -0.1051, + 0, 0, 0, + -0.1051, 0, 0.1051}; + + return ws; + } + } +} -- 1.7.2.5

1 0