November 2012 - Olena-patches

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

branch unstable/scribo updated: olena-2.0-85-ge07c016
by git＠lrde.epita.fr 16 Nov '12

16 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 e07c016a87c81f22241ac99053cbd92e673e116a (commit) from f46deddccad811cc836aca7917a6cfbd6a5d12cc (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 ----------------------------------------------------------------- e07c016 configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is enabled. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-85-ge07c016 configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is enabled.
by Guillaume Lazzara 16 Nov '12

16 Nov '12

--- ChangeLog | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81e9545..8b27ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is + enabled. + +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * m4/oln-with-lib.m4: Lookup for multiple AND single libraries while checking Tesseract availability. diff --git a/configure.ac b/configure.ac index a53bcf8..8d7d60d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -212,7 +212,7 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) OLN_WITH_LIB_PKG_CONFIG([ImageMagick++], [Magick++.h], [Magick++], [imagemagickxx], [IMAGEMAGICKXX]) -OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [Magick++], +OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [GraphicsMagick++], [graphicsmagickxx], [GRAPHICSMAGICKXX]) # If both ImageMagick and GraphicsMagic are available, choose the -- 1.7.2.5

1 0

olena-2.0-26-gce13c0e incomplete and unefficient implementation of the lpde inpainting method
by Coddy Levi 13 Nov '12

13 Nov '12

--- milena/mln/inpainting/inpaint.hh | 98 +++++++++++++++++++++++ milena/mln/inpainting/lpde.hh | 146 ++++++++++++++++++++++++++++++++++ milena/mln/inpainting/metric/psnr.hh | 51 ++++++++++++ 3 files changed, 295 insertions(+), 0 deletions(-) create mode 100644 milena/mln/inpainting/inpaint.hh create mode 100644 milena/mln/inpainting/lpde.hh create mode 100644 milena/mln/inpainting/metric/psnr.hh diff --git a/milena/mln/inpainting/inpaint.hh b/milena/mln/inpainting/inpaint.hh new file mode 100644 index 0000000..44f20a8 --- /dev/null +++ b/milena/mln/inpainting/inpaint.hh @@ -0,0 +1,98 @@ +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> + +#include <mln/literal/colors.hh> + +#include <mln/core/alias/box2d.hh> +#include <mln/accu/shape/bbox.hh> +#include <mln/value/label_8.hh> +#include <mln/labeling/compute.hh> + +#include <mln/pw/value.hh> +#include <mln/draw/box.hh> + +#include <mln/util/timer.hh> + +namespace mln +{ + namespace inpainting + { + /* + * Interface + */ + + template <template <typename> class I, typename T, typename F> + I<T> inpaint(const Image<I<T> >& src_, + const Image<I<bool> >& mask_, + F inpaint_method, + unsigned inpaint_radius); + + /* + * Implem + */ + + template <template <typename> class I, typename T, typename F> + I<T> inpaint(const Image<I<T> >& inpaint_src_, + const Image<I<bool> >& inpaint_mask_, + F inpaint_method, + unsigned inpaint_radius) + { + const I<T>& inpaint_src = exact(inpaint_src_); + const I<bool>& inpaint_mask = exact(inpaint_mask_); + + box2d roi; + { // Compute the region of interest + I<value::label_8> lbl(inpaint_mask.domain()); + + data::fill(lbl, 1); + data::fill((lbl | pw::value(inpaint_mask)).rw(), 0); + + value::label_8 nlabels = 2; + + util::array<box2d> roi_bboxes = + labeling::compute(accu::meta::shape::bbox(), + lbl, + nlabels); + + roi = roi_bboxes[0]; + roi.enlarge(inpaint_radius); + roi.crop_wrt(inpaint_src.domain()); + } + + I<mln_sum(T)> new_src(roi); + { // paste inpaint_src to new_src + mln_piter(I<T>) p(roi); + mln_pixter(I<mln_sum(T)>) p_new(new_src); + + for_all_2(p, p_new) + p_new.val() = inpaint_src(p); + } + + I<bool> new_mask(roi); + data::paste(inpaint_mask | roi, new_mask); + + mln::util::timer t; + t.start(); + + inpaint_method(new_src, new_mask); + + t.stop(); + std::cout << "inpaint time = " << t << std::endl; + + I<T> output(inpaint_src); + { // paste new_src to output + mln_piter(I<T>) p(roi); + mln_pixter(const I<mln_sum(T)>) p_new(new_src); + + for_all_2(p, p_new) + output(p) = p_new.val(); + } + + return output; + } + + } /* mln::inpainting */ + +} /* mln*/ diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh new file mode 100644 index 0000000..1f754d8 --- /dev/null +++ b/milena/mln/inpainting/lpde.hh @@ -0,0 +1,146 @@ +#include <algorithm> +#include <vector> + +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/literal/colors.hh> +#include <mln/literal/zero.hh> + +#include <mln/linear/convolve.hh> +#include <mln/linear/gaussian.hh> +#include <mln/core/alias/w_window2d_float.hh> + +#include <mln/pw/value.hh> + +#include <mln/value/int_u.hh> +#include <mln/algebra/vec.hh> + +#include <mln/data/paste.hh> + +#include <mln/core/alias/vec2d.hh> + +namespace mln +{ + namespace inpainting + { + struct lpde + { + public: + lpde(float dt = 1.0f, float dx = 1.0f, float t_f = 20.0); + + template <template <typename> class I, typename T> + void operator()(I<T>& src, + I<bool>& mask); + + void set(const std::vector<float>& w); + + private: + std::vector<float> w; + float dt; + float dx; + float t_f; + }; + + lpde::lpde(float dt, float dx, float t_f) + { + this->dt = dt; + this->dx = dx; + this->t_f = t_f; + } + + template <typename I> + void compute_diff_invariants(const I& u, + std::vector<I>& invs, + const std::vector<float>& w) + { + const float sigma = 0.8; + + invs[0] = linear::gaussian_1st_derivative(u, sigma, 1); + invs[1] = linear::gaussian_1st_derivative(u, sigma, 0); + invs[2] = linear::gaussian_2nd_derivative(u, sigma, 1); + invs[3] = linear::gaussian_2nd_derivative(u, sigma, 0); + invs[4] = linear::gaussian_2nd_derivative(u, sigma); + + { // TV regularization term div ( \nabla u / | \nabla u | ) + + I u_xnx( invs[5].domain() ); + I u_yny( invs[5].domain() ); + + { + mln_piter(I) p( invs[5].domain() ); + + for_all(p) + { + for (unsigned i = 0; i < mln_dim(mln_value(I)); ++i) + { + float norm; + { + vec2d_f v; + + v[0] = invs[0](p)[i]; + v[1] = invs[1](p)[i]; + + norm = norm::l2(v); + } + + u_xnx(p)[i] = invs[0](p)[i] / norm; + u_yny(p)[i] = invs[1](p)[i] / norm; + } + } + } + + u_xnx = linear::gaussian_1st_derivative(u_xnx, sigma, 1); + u_yny = linear::gaussian_1st_derivative(u_yny, sigma, 0); + + mln_piter(I) p( invs[5].domain() ); + for_all(p) + { + invs[5](p) = u_xnx(p) + u_yny(p); + } + } + } + + template <template <typename> class I, typename T> + void lpde::operator()(I<T>& src, + I<bool>& mask) + { + + data::fill((src | pw::value(mask)).rw(), literal::zero); + + std::vector<I<T> > invs(w.size(), src.domain()); + + I<T>& u_t = src; + + float r = this->dt / (this->dx * this->dx); + + for (float t = 0; t < this->t_f; t += dt) + { + compute_diff_invariants(u_t, invs, this->w); + + mln_piter(I<T>) p(u_t.domain()); + + for_all(p) + { + if (mask(p)) + { + T contribution = literal::zero; + + for (unsigned k = 0; k < w.size(); ++k) + { + contribution += this->w[k] * invs[k](p); + } + + u_t(p) += r * contribution; + } + } + } + } + + void lpde::set(const std::vector<float>& w) + { + this->w = w; + } + } /* mln::inpainting */ + +} /* mln*/ diff --git a/milena/mln/inpainting/metric/psnr.hh b/milena/mln/inpainting/metric/psnr.hh new file mode 100644 index 0000000..4998b4a --- /dev/null +++ b/milena/mln/inpainting/metric/psnr.hh @@ -0,0 +1,51 @@ +#ifndef MLN_INPAINTING_METRIC_PSNR_HH +# define MLN_INPAINTING_METRIC_PSNR_HH + +# include <cmath> + +# include <mln/core/concept/image.hh> +# include <mln/norm/l1.hh> +# include <mln/trait/value_.hh> +# include <mln/algebra/vec.hh> + +namespace mln +{ + namespace inpainting + { + namespace metric + { + template <typename I> + double psnr(const Image<I>& original_, + const Image<I>& altered_) + { + const I& original = exact(original_); + const I& altered = exact(altered_); + + mln_piter(I) p( altered.domain() ); + + double mse = 0; + + const unsigned dim = mln_dim(mln_value(I)); + + for_all(p) + { + const mln_sum(mln_value(I)) diff = original(p) - altered(p); + + if (dim == 1) + mse += diff * diff; + else + for (unsigned i = 0; i < dim; ++i) + mse += diff[i] * diff[i]; + } + + mse /= ( altered.ncols() * altered.nrows() * dim); + + const unsigned max = pow(2, mln_nbits(mln_value(I)) / dim) - 1; + + return 20 * log10( max ) - 10 * log10(mse); + } + } + } +} + +#endif -- 1.7.2.5

1 0