October 2010 - Olena-patches

[Olena] #219: Add \internal in the documentation of internal code
by Olena Trac 29 Nov '12

29 Nov '12

#219: Add \internal in the documentation of internal code ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ Currently, in order to not expose the internal code in the user documentation, everything in the internal and trait namespaces is ignored during the doc generation. The main issue is that inherited members are not shown in the documentation of the classes exposed to the user. The only way to ask Doxygen to show inherited members and not to show internal documentation is to add \internal in the documentation of internal code. -- Ticket URL: <https://trac.lrde.org/olena/ticket/219> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[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

[Olena] #239: Have Scribo be compatible with (also) Tesseract 3.0
by Olena Trac 23 Nov '11

23 Nov '11

#239: Have Scribo be compatible with (also) Tesseract 3.0 -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Scribo | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Scribo's optional parts requiring Tesseract work well with its version 2.0, but this is no longer true with version 3.0, at least with !MacPorts' version (`libtesseract_full.a` is missing). It would be nice to be able to support both versions, since 2.0 is Debian's default, and 3.0 is !MacPorts' version. -- Ticket URL: <https://trac.lrde.org/olena/ticket/239> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #229: Have Olena's BuildBot generate GitStats information
by Olena Trac 23 Nov '11

23 Nov '11

#229: Have Olena's BuildBot generate GitStats information -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: trivial | Milestone: Olena 1.1 Component: other | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Git statistics are generated by my (Roland's) account for a limited set of branches, each night. It'd be smarter to have one of the buildslave invoke a script running `gitstats` and uploading the result (as `lrde- upload.sh` does) prior to building the project. We could even filter branches (having statistics for all branches might not be relevant). -- Ticket URL: <https://trac.lrde.org/olena/ticket/229> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 4

[Olena] #225: Code not displayed in tutorial
by Olena Trac 09 Sep '11

09 Sep '11

#225: Code not displayed in tutorial ---------------------------+------------------------------------------------ Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: doc, tutorial | ---------------------------+------------------------------------------------ in page, [http://www.lrde.epita.fr/dload/olena/1.0/doc/milena/devel_doc/] all examples of code are not displayed (all boxes are empty) -- Ticket URL: <https://trac.lrde.org/olena/ticket/225> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #220: Change the logo of the Trac
by Olena Trac 08 Sep '11

08 Sep '11

#220: Change the logo of the Trac ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Component: Trac | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Use this one instead: http://www.lrde.epita.fr/dload/olena/logos/olena_small.jpg. Unfortunately, we don't have the required permissions on the Trac's files/dirs to change it. -- Ticket URL: <https://trac.lrde.org/olena/ticket/220> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 5

[Olena] #172: Experiment SCOOP 1.5/2 with C++0x concepts
by Olena 12 Jul '11

12 Jul '11

#172: Experiment SCOOP 1.5/2 with C++0x concepts -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: trivial | Milestone: Olena 2.0 Component: Olena-NG | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- What I call SCOOP 1.5 is the paradigm currently used in Milena 1.0 (as of Nov. 2008), and SCOOP 2 the paradigm described in the MPOOL'08 paper (used in Olena-NG). -- Ticket URL: <https://trac.lrde.org/olena/ticket/172> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

last-svn-commit-137-gdb55e63 Add the binarization tool submitted to H-DIBCO 2010.
by Guillaume Lazzara 04 Nov '10

04 Nov '10

* src/Makefile.am, * src/contest/Makefile.am, * src/contest/hdibco-2010/Makefile.am: New. * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code of the submitted program for H-DIBCO 2010. --- scribo/ChangeLog | 11 ++ scribo/src/Makefile.am | 1 + .../{tests/toolchain => src/contest}/Makefile.am | 2 +- .../contest/hdibco-2010}/Makefile.am | 8 +- .../hdibco-2010/sauvola_ms_hdibco.cc} | 100 +++++++------------ 5 files changed, 56 insertions(+), 66 deletions(-) copy scribo/{tests/toolchain => src/contest}/Makefile.am (98%) copy scribo/{tests/toolchain => src/contest/hdibco-2010}/Makefile.am (87%) copy scribo/src/{binarization/pgm_sauvola_ms.cc => contest/hdibco-2010/sauvola_ms_hdibco.cc} (53%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f2eb3c3..3888981 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add the binarization tool submitted to H-DIBCO 2010. + + * src/Makefile.am, + * src/contest/Makefile.am, + * src/contest/hdibco-2010/Makefile.am: New. + + * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code + of the submitted program for H-DIBCO 2010. + +2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tools in scribo/src. * src/Makefile.am: Add postprocessing subdir. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index b3a7859..774740a 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ binarization \ + contest \ debug \ primitive \ filter \ diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/Makefile.am similarity index 98% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/Makefile.am index 826fb86..81f314b 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -20,4 +20,4 @@ include $(top_srcdir)/scribo/tests/tests.mk SUBDIRS = \ - nepomuk \ No newline at end of file + hdibco-2010 \ No newline at end of file diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am similarity index 87% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/hdibco-2010/Makefile.am index 826fb86..44add64 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -19,5 +19,9 @@ include $(top_srcdir)/scribo/tests/tests.mk -SUBDIRS = \ - nepomuk \ No newline at end of file +check_PROGRAMS = sauvola_ms_hdibco + +sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc + + +TESTS = $(check_PROGRAMS) diff --git a/scribo/src/binarization/pgm_sauvola_ms.cc b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc similarity index 53% copy from scribo/src/binarization/pgm_sauvola_ms.cc copy to scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc index 38ff2e6..68fdaac 100644 --- a/scribo/src/binarization/pgm_sauvola_ms.cc +++ b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,86 +23,61 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <cctype> #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> +#include <mln/io/ppm/load.hh> #include <mln/io/pbm/save.hh> #include <scribo/binarization/sauvola_ms.hh> -#include <scribo/debug/usage.hh> - -bool check_args(int argc, char * argv[]) -{ - if (argc < 3 || argc > 6) - return false; - - if (argc >= 5) - { - int s = atoi(argv[4]); - - if (s < 1 || s > 3) - { - std::cout << "s must be set to 2 or 3." - << std::endl; - return false; - } - } - - return true; -} - - -const char *args_desc[][2] = -{ - { "input.pgm", "A graylevel image." }, - { "out.pbm", "A binary image." }, - { "w", "Window size at scale 1. (default: 101)" }, - { "s", "First subsampling ratio (default: 3)." }, - { "k", "Sauvola's formuale parameter (default: 0.34)" }, - {0, 0} -}; - - - +#include <scribo/postprocessing/fill_object_holes.hh> +#include <scribo/preprocessing/denoise.hh> int main(int argc, char *argv[]) { using namespace mln; using namespace scribo; - if (!check_args(argc, argv)) - return scribo::debug::usage(argv, - "Multi-Scale Binarization of a color image based on Sauvola's algorithm.", - "input.pgm output.pbm <w> <s> <k>", - args_desc); - trace::entering("main"); + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << " <input.{pgm,ppm}> <output.pbm>" << std::endl; + std::cout << "--------------" << std::endl; + std::cout << "EPITA/LRDE - 2010" << std::endl; + return 1; + } - // Window size - unsigned w_1; - if (argc >= 4) - w_1 = atoi(argv[3]); // Scale 1 - else - w_1 = 101u; + std::string ext = argv[1]; + ext = ext.substr(ext.length() - 3, 3); + for (unsigned i = 0; i < ext.length(); ++i) + ext[i] = tolower(ext[i]); - // First subsampling scale. - unsigned s; - if (argc >= 5) - s = atoi(argv[4]); - else - s = 3u; + // Load + image2d<value::int_u8> input; - double k; - if (argc >= 6) - k = atof(argv[5]); - else - k = 0.34f; + if (ext == "pgm") + io::pgm::load(input, argv[1]); + else if (ext == "ppm") + { + image2d<value::rgb8> input_color; + io::ppm::load(input_color, argv[1]); - image2d<value::int_u8> input_1; - io::pgm::load(input_1, argv[1]); + // Convert to Gray level image. + input = data::transform(input_color, mln::fun::v2v::rgb_to_int_u<8>()); + } + else + { + std::cout << "Invalid input file format! Expecting PGM or PPM images." << std::endl; + return 1; + } + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); + output = scribo::binarization::sauvola_ms(input, 101, 3, 0.4); + + output = scribo::preprocessing::denoise_bg(output, c8(), 4); + output = scribo::postprocessing::fill_object_holes(output, 0.01f); io::pbm::save(output, argv[2]); } -- 1.5.6.5

2 1

branch non-8-bit-magick-quantum created: last-svn-commit-537-gdd1c8b5
by git＠lrde.epita.fr 28 Oct '10

28 Oct '10

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 non-8-bit-magick-quantum has been created at dd1c8b5e0e3162477a220b28b5d3eb233a68a82e (commit) - Log ----------------------------------------------------------------- dd1c8b5 Handle properly non 8-bit Magick::Quantum's. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-528-g0d8813e Handle properly non 8-bit Magick::Quantum's.
by Roland Levillain 28 Oct '10

28 Oct '10

* mln/io/magick/load.hh (mln::io::magick::load(Image&, const std::string&)) * mln/io/magick/save.hh (mln::io::magick::impl::get_color(const value::int_u8&)) (mln::io::magick::impl::get_color(const value::rgb8&)): Properly convert values between Magick::Quantum and mln::value::int_u8, and vice versa. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/io/magick/load.hh | 17 +++++++++++------ milena/mln/io/magick/save.hh | 30 ++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8e94f5d..2b6ae78 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> + + Handle properly non 8-bit Magick::Quantum's. + + * mln/io/magick/load.hh + (mln::io::magick::load(Image&, const std::string&)) + * mln/io/magick/save.hh + (mln::io::magick::impl::get_color(const value::int_u8&)) + (mln::io::magick::impl::get_color(const value::rgb8&)): + Properly convert values between Magick::Quantum and + mln::value::int_u8, and vice versa. + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> Fix Boost.Tuple handling. diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 7004a80..60e857e 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -35,8 +35,6 @@ /// before using any of these functions, as advised by the /// GraphicsMagick documentation /// (http://www.graphicsmagick.org/Magick++/Image.html) -/// -/// \fixme: re-enable quantum size check # include <cstdlib> @@ -142,9 +140,6 @@ namespace mln { trace::entering("mln::io::magick::load"); - // Ensure a Magick++'s Quantum is an 8-bit value. - //mln::metal::equal<Magick::Quantum, unsigned char>::check(); - I& ima = exact(ima_); // FIXME: Handle Magick++'s exceptions (see either @@ -166,7 +161,17 @@ namespace mln mln_piter(I) p(ima.domain()); for_all(p) { - value::rgb8 c(pixels->red, pixels->green, pixels->blue); + /* Each channel of a Magick++ image is coded on a + Magick::Quantum value, which can be an 8-, 16- or 32-bit + integer. Load the most significant bits of each channel + into a component of an mln::value::rgb8 value (i.e., into + an mln::value::int_u8 value). */ + value::rgb8 c(pixels->red >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::red_t)), + pixels->green >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::green_t)), + pixels->blue >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::blue_t))); mln_value(I) res; if (!impl::do_it(c, res)) { diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 2c87c88..7a91ee0 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -35,8 +35,6 @@ /// before using any of these functions, as advised by the /// GraphicsMagick documentation /// (http://www.graphicsmagick.org/Magick++/Image.html) -/// -/// \fixme: re-enable quantum size check # include <cstdlib> @@ -95,17 +93,33 @@ namespace mln inline Magick::Color get_color(const value::int_u8& value) { - // Ensure a Magick++'s Quantum is an 8-bit value. - //mln::metal::equal<Magick::Quantum, unsigned char>::check(); - return Magick::Color(value, value, value); + /* Each channel of a Magick++ image is coded on a + Magick::Quantum value, which can be an 8-, 16- or 32-bit + integer. Store the data from each mln::value::int_u8 + values into the most significant bits of Magick::Color's + channels. */ + return Magick::Color + (value << 8 * (sizeof(Magick::Quantum) - sizeof(value::int_u8)), + value << 8 * (sizeof(Magick::Quantum) - sizeof(value::int_u8)), + value << 8 * (sizeof(Magick::Quantum) - sizeof(value::int_u8))); } inline Magick::Color get_color(const value::rgb8& value) { - // Ensure a Magick++'s Quantum is an 8-bit value. - //mln::metal::equal<Magick::Quantum, unsigned char>::check(); - return Magick::Color(value.red(), value.green(), value.blue()); + /* Each channel of a Magick++ image is coded on a + Magick::Quantum value, which can be an 8-, 16- or 32-bit + integer. Store the data from each component of + mln::value::rgb8 values (of type mln::value::int_u8) into + the most significant bits of Magick::Color's + channels. */ + return Magick::Color + (value.red() << 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::red_t)), + value.green() << 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::green_t)), + value.blue() << 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::blue_t))); } } // end of namespace mln::io::magick::impl -- 1.5.6.5

1 0