June 2011 - 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

last-svn-commit-540-gc4bb3f8 mln/io/dicom/load.hh: Fix invalid data while loading large image.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/io/dicom/load.hh | 32 +++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77e5cc3..98f7f77 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-05-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Fix invalid data while loading large + image. + 2010-12-10 Roland Levillain <roland(a)lrde.epita.fr> Ensure non implemented reconstructions on sets abort at run time. diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index f250a16..fb6996b 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -139,14 +140,21 @@ namespace mln algebra::vec<mln_site_(I)::dim, unsigned int> vmin; algebra::vec<mln_site_(I)::dim, unsigned int> vmax; algebra::vec<mln_site_(I)::dim, unsigned int> vdims; - for (int i = 0; i < ndims; ++i) + int j = ndims - 1; + for (int i = 0; i < ndims; ++i, --j) { vmin[i] = 0; vmax[i] = dims[i] - 1; if (i == 0) - vdims[i] = 1; + vdims[j] = 1; else - vdims[i] = dims[i - 1] * vdims[i - 1]; + vdims[j] = dims[i - 1] * vdims[j + 1]; + } + + if (ndims > 1) + { + std::swap(vmin[0], vmin[1]); + std::swap(vmax[0], vmax[1]); } mln_site(I) pmin(vmin); @@ -155,25 +163,23 @@ namespace mln initialize(ima, result); mln_piter(I) p(ima.domain()); unsigned int index = 0; + for_all(p) { index = 0; for (int i = 0; i < ndims; ++i) { - index += p.to_site().to_vec()[i] * vdims[i]; + index += p[i] * vdims[i]; } - ima(p) = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; + mln_value(I) v = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; // FIXME: RGB support, HighBit if HB == 1 - for (int j = 0; j < bytes_allocated; ++j) + for (unsigned int j = 0; j < bytes_allocated; ++j) { - ima(p) += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; + v += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; } - /*std::cout << "[ x = " << p.to_site().to_vec()[0] - << " | y = " << p.to_site().to_vec()[1] - << " | z = " << p.to_site().to_vec()[2] - << " ] => " << ima(p) - << std::endl;*/ + + ima(p) = v; } delete(dataBuffer); -- 1.5.6.5

2 1

[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

branch icdar/hdlac2011 updated: last-svn-commit-932-g2d01d0f
by lazzara＠lrde.epita.fr 28 Jun '11

28 Jun '11

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 icdar/hdlac2011 has been updated via 2d01d0f5e2d9038063cf60d88f85b3c535156e33 (commit) via 4765bc40e02334a6d5ea61f03b8fe04fa5116ffb (commit) via e359183c8a6c53f58608be0afffc5bde7280f082 (commit) via ecd297e8efac105feca05855a8c1c2e49646971a (commit) from e286caca4e66e3378ae593b448649d8771cc35fd (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 ----------------------------------------------------------------- 2d01d0f mln/morpho/skeleton_constrained.hh: Add a missing include. 4765bc4 mln/border/equalize.hh: Fix an invalid assertion. e359183 Regen generated files. ecd297e Fix compilation. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 +++ milena/mln/border/equalize.hh | 2 +- milena/mln/morpho/skeleton_constrained.hh | 1 + scribo/ChangeLog | 55 +++++++++++++++++ scribo/headers.mk | 40 ++++++++++++- scribo/scribo/core/object_groups.hh | 20 +++++- scribo/scribo/core/object_links.hh | 11 ---- scribo/scribo/debug/bboxes_enlarged_image.hh | 3 +- scribo/scribo/debug/logger.hh | 10 ++-- .../scribo/debug/looks_like_a_text_line_image.hh | 3 +- scribo/scribo/estim/object_groups_mean_width.hh | 2 +- scribo/scribo/filter/images_in_paragraph.hh | 1 + scribo/scribo/filter/paragraphs_bbox_overlap.hh | 4 +- scribo/scribo/filter/paragraphs_in_image.hh | 2 + scribo/scribo/filter/separators_in_element.hh | 1 + scribo/scribo/filter/separators_in_paragraph.hh | 3 +- scribo/scribo/io/img/internal/debug_img_visitor.hh | 1 + scribo/scribo/io/img/internal/full_img_visitor.hh | 1 + .../scribo/io/xml/internal/compute_text_colour.hh | 3 + scribo/scribo/io/xml/internal/full_xml_visitor.hh | 1 + scribo/scribo/io/xml/internal/page_xml_visitor.hh | 1 + scribo/scribo/io/xml/internal/time_info.hh | 3 +- scribo/scribo/io/xml/load.hh | 33 +++++----- .../postprocessing/images_to_drop_capital.hh | 1 + scribo/scribo/primitive/group/from_double_link.hh | 25 +++----- .../primitive/link/with_several_left_links.hh | 16 +++--- .../primitive/link/with_several_right_links.hh | 16 +++--- scribo/scribo/primitive/remove/separators.hh | 1 + scribo/scribo/text/extract_paragraphs.hh | 1 + scribo/scribo/text/extract_paragraphs_hdoc.hh | 11 ++-- scribo/scribo/text/paragraphs_closing.hh | 3 + .../toolchain/internal/content_in_hdoc_functor.hh | 2 +- scribo/src/afp/link.hh | 6 +- scribo/src/debug/show_paragraph_blocks.cc | 2 +- scribo/src/debug/show_text_lines.cc | 4 +- scribo/src/non_text_components.cc | 2 +- scribo/src/primitive/extract/alignments.cc | 5 +- scribo/src/text_in_picture.cc | 6 +- scribo/src/text_in_picture_neg.cc | 1 - scribo/src/text_recognition_in_picture.cc | 6 +- scribo/tests/unit_test/unit-tests.mk | 62 +++++++++++++++++++- 41 files changed, 276 insertions(+), 103 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-932-g2d01d0f mln/morpho/skeleton_constrained.hh: Add a missing include.
by Guillaume Lazzara 28 Jun '11

28 Jun '11

--- milena/ChangeLog | 4 ++++ milena/mln/morpho/skeleton_constrained.hh | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 58bec72..65122ba 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2011-06-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/morpho/skeleton_constrained.hh: Add a missing include. + +2011-06-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/border/equalize.hh: Fix an invalid assertion. 2011-06-27 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/morpho/skeleton_constrained.hh b/milena/mln/morpho/skeleton_constrained.hh index 2c986e6..ceee451 100644 --- a/milena/mln/morpho/skeleton_constrained.hh +++ b/milena/mln/morpho/skeleton_constrained.hh @@ -38,6 +38,7 @@ # include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/site_set/p_priority.hh> # include <mln/extension/adjust_duplicate.hh> +# include <mln/extension/adjust_fill.hh> # include <mln/data/fill.hh> # include <mln/util/timer.hh> -- 1.5.6.5

1 0