- Olena-patches

last-svn-commit-992-gac1a1da Fix the distribution w.r.t. Scribo's test images.
by Roland Levillain 13 Sep '11

13 Sep '11

* tests/Makefile.am (EXTRA_DIST): Add img/comp_on_borders.pbm, img/multi_scale.png, img/phillip.pbm, img/several_objects.pgm, img/single_object.pbm and img/the_valleys.pbm. Aesthetic changes. --- scribo/ChangeLog | 9 +++++++++ scribo/tests/Makefile.am | 36 +++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1c3e5b8..315a47c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-09-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the distribution w.r.t. Scribo's test images. + + * tests/Makefile.am (EXTRA_DIST): Add img/comp_on_borders.pbm, + img/multi_scale.png, img/phillip.pbm, img/several_objects.pgm, + img/single_object.pbm and img/the_valleys.pbm. + Aesthetic changes. + 2011-09-13 Guillaume Lazzara <z(a)lrde.epita.fr> Fix text justification in HTML document reconstruction. diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index e2e7e66..58d375d 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,32 +17,38 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - img/alignment_1.pbm \ +EXTRA_DIST = \ + img/alignment_1.pbm \ img/alignment_2.pbm \ img/alignment_3.pbm \ img/alignment_4.pbm \ - img/phillip.ppm \ - img/pixels.pbm \ + img/comp_on_borders.pbm \ + img/multi_scale.png \ + img/phillip.pbm \ + img/phillip.ppm \ + img/pixels.pbm \ + img/several_objects.pgm \ + img/single_object.pbm \ img/table_to_be_repaired.pbm \ img/table_to_be_repaired2.pbm \ img/table_to_be_repaired3.pbm \ img/text_to_group.pbm \ img/text_to_group.pgm \ img/text_to_group_and_clean.pbm \ + img/the_valleys.pbm \ img/wildly.pbm -SUBDIRS = \ - binarization \ - convert \ - core \ - estim \ - filter \ - preprocessing \ - primitive \ - table \ - text \ - toolchain \ +SUBDIRS = \ + binarization \ + convert \ + core \ + estim \ + filter \ + preprocessing \ + primitive \ + table \ + text \ + toolchain \ unit_test \ util -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-992-gac1a1da
by git＠lrde.epita.fr 13 Sep '11

13 Sep '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 next-next has been updated via ac1a1dacd9ad8009809a8cd2867bbcd67fc110fe (commit) via bb48d4e30c860f9a8da69c53b791bd1697791aa8 (commit) via 47a070a11749226452ba40b207a73d43128da393 (commit) from 75205293d6ff1424f8bccbdfc37b725fd0d48878 (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 ----------------------------------------------------------------- ac1a1da Fix the distribution w.r.t. Scribo's test images. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++ milena/mln/core/concept/function.hh | 4 +- scribo/ChangeLog | 17 +++++++++ scribo/demo/xml2doc/templates/html/css.css | 12 +++++- scribo/demo/xml2doc/templates/html/main.xsl | 23 ++++++++++-- scribo/demo/xml2doc/templates/html/main_base64.xsl | 16 +++++++-- scribo/tests/Makefile.am | 36 +++++++++++-------- 7 files changed, 87 insertions(+), 26 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-1010-g8983aa5 demo/viewer/main.cc: Fix an issue with Tesseract 2.x and specific locales.
by Guillaume Lazzara 13 Sep '11

13 Sep '11

--- scribo/ChangeLog | 5 +++++ scribo/demo/viewer/main.cc | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c0f58bb..fb44bec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-09-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/main.cc: Fix an issue with Tesseract 2.x and + specific locales. + 2011-09-15 Roland Levillain <roland(a)lrde.epita.fr> Update SCRIBO tests w.r.t. the new version of lena.pgm. diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index 0c50c7b..704dfe7 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -18,6 +18,10 @@ #include <QtGui> #include <iostream> +# ifdef HAVE_TESSERACT_2 +#include <clocale> +# endif // ! HAVE_TESSERACT_2 + #undef MLN_WO_GLOBAL_VARS #include "viewer.hh" #include <mln/labeling/colorize.hh> @@ -45,5 +49,15 @@ int main(int argc, char** argv) if (!viewer) return -1; + +# ifdef HAVE_TESSERACT_2 + // Tesseract 2.x is known to have issues while reading training data + // depending on the current locales in use. Training data files use + // float data and the decimal separator can be either '.' or ',' + // causing errors. + // Setting locale to "C" fix that issue. + setlocale(LC_ALL, "C"); +# endif // ! HAVE_TESSERACT_2 + return viewer->exec(); } -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-989-g7520529
by lazzara＠lrde.epita.fr 13 Sep '11

13 Sep '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 next-next has been updated discards 47a070a11749226452ba40b207a73d43128da393 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (75205293d6ff1424f8bccbdfc37b725fd0d48878) \ O -- O -- O (47a070a11749226452ba40b207a73d43128da393) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: milena/ChangeLog | 5 ----- milena/mln/core/concept/function.hh | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next-next updated: last-svn-commit-990-g47a070a
by lazzara＠lrde.epita.fr 13 Sep '11

13 Sep '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 next-next has been updated discards bb48d4e30c860f9a8da69c53b791bd1697791aa8 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (47a070a11749226452ba40b207a73d43128da393) \ O -- O -- O (bb48d4e30c860f9a8da69c53b791bd1697791aa8) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: scribo/ChangeLog | 8 ------- scribo/demo/xml2doc/templates/html/css.css | 12 +-------- scribo/demo/xml2doc/templates/html/main.xsl | 23 +++---------------- scribo/demo/xml2doc/templates/html/main_base64.xsl | 16 ++----------- 4 files changed, 9 insertions(+), 50 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch unstable/scribo updated: last-svn-commit-991-gbb48d4e
by lazzara＠lrde.epita.fr 13 Sep '11

13 Sep '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 unstable/scribo has been updated via bb48d4e30c860f9a8da69c53b791bd1697791aa8 (commit) via 47a070a11749226452ba40b207a73d43128da393 (commit) via 75205293d6ff1424f8bccbdfc37b725fd0d48878 (commit) via 901e408114a91853c2d63d512ebc9920ecd339d5 (commit) via c71f5f39bcb6608f9f55ba0e367a5bee5ab78e0c (commit) from bb65e6448ce06c519c7a92227d913fce49735d9a (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 27 ++++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 1 + milena/mln/core/concept/function.hh | 11 +++---- milena/mln/data/memcpy_.hh | 19 +++++++------ scribo/ChangeLog | 8 ++++++ scribo/demo/xml2doc/templates/html/css.css | 12 +++++++- scribo/demo/xml2doc/templates/html/main.xsl | 23 ++++++++++++++--- scribo/demo/xml2doc/templates/html/main_base64.xsl | 16 +++++++++-- 8 files changed, 93 insertions(+), 24 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next-next updated: last-svn-commit-991-gbb48d4e
by lazzara＠lrde.epita.fr 13 Sep '11

13 Sep '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 next-next has been updated discards 19126a8e17a0fb2578e7cddbfdf2a1baa1823436 (commit) via bb48d4e30c860f9a8da69c53b791bd1697791aa8 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (19126a8e17a0fb2578e7cddbfdf2a1baa1823436) \ N -- N -- N (bb48d4e30c860f9a8da69c53b791bd1697791aa8) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- bb48d4e Fix text justification in HTML document reconstruction. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 3 +- scribo/demo/xml2doc/templates/html/css.css | 4 +- scribo/demo/xml2doc/templates/html/main.xsl | 24 +++++++++++++++---- scribo/demo/xml2doc/templates/html/main_base64.xsl | 16 ++++++++++-- 4 files changed, 36 insertions(+), 11 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-991-gbb48d4e Fix text justification in HTML document reconstruction.
by Guillaume Lazzara 13 Sep '11

13 Sep '11

* demo/xml2doc/templates/html/css.css, * demo/xml2doc/templates/html/main.xsl, * demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules. --- scribo/ChangeLog | 8 +++++++ scribo/demo/xml2doc/templates/html/css.css | 12 ++++++++- scribo/demo/xml2doc/templates/html/main.xsl | 23 ++++++++++++++++--- scribo/demo/xml2doc/templates/html/main_base64.xsl | 16 +++++++++++-- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f351b82..1c3e5b8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2011-09-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix text justification in HTML document reconstruction. + + * demo/xml2doc/templates/html/css.css, + * demo/xml2doc/templates/html/main.xsl, + * demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules. + 2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo. diff --git a/scribo/demo/xml2doc/templates/html/css.css b/scribo/demo/xml2doc/templates/html/css.css index 0443390..baf03cf 100644 --- a/scribo/demo/xml2doc/templates/html/css.css +++ b/scribo/demo/xml2doc/templates/html/css.css @@ -3,8 +3,8 @@ position:absolute; background-color:white; z-index:7; - display:inline; - white-space:pre; + + /*white-space:pre;*/ /* FIXME */ letter-spacing:-2px; @@ -13,6 +13,9 @@ margin:0px; filter:alpha(opacity=100); font-family:"Times New Roman", Times, serif; + + text-align: justify; + display: block; } .para { @@ -28,4 +31,9 @@ { position:absolute; border:0; +} +.line noop +{ + width:1000px; + display: inline-block; } \ No newline at end of file diff --git a/scribo/demo/xml2doc/templates/html/main.xsl b/scribo/demo/xml2doc/templates/html/main.xsl index 9492604..46b4b8f 100644 --- a/scribo/demo/xml2doc/templates/html/main.xsl +++ b/scribo/demo/xml2doc/templates/html/main.xsl @@ -10,27 +10,41 @@ .line { position:absolute; + background-color:white; z-index:7; - display:inline; - white-space:pre; + /*white-space:pre;*/ -  + /* FIXME */ letter-spacing:-2px; padding:0px; margin:0px; + filter:alpha(opacity=100); font-family:"Times New Roman", Times, serif; + + text-align: justify; + display: block; } - .region + .para { position:absolute; z-index:6; } + .region + { + position:absolute; + z-index:5; + } .image { position:absolute; border:0; } + .line noop + { + width:1000px; + display: inline-block; + } </style> </head> <body> @@ -222,6 +236,7 @@ color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> + <noop /> </span>  </xsl:template> diff --git a/scribo/demo/xml2doc/templates/html/main_base64.xsl b/scribo/demo/xml2doc/templates/html/main_base64.xsl index 79489e6..623f4a2 100644 --- a/scribo/demo/xml2doc/templates/html/main_base64.xsl +++ b/scribo/demo/xml2doc/templates/html/main_base64.xsl @@ -7,13 +7,13 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>SCRIBO</title> <style type="text/css"> - .line + .line { position:absolute; background-color:white; z-index:7; - display:inline; - white-space:pre; + + /* white-space:pre; */ /* FIXME */ letter-spacing:-2px; @@ -22,6 +22,9 @@ margin:0px; filter:alpha(opacity=100); font-family:"Times New Roman", Times, serif; + + text-align: justify; + display: block; } .para { @@ -38,6 +41,11 @@ position:absolute; border:0; } + .line noop + { + width:1000px; + display: inline-block; + } </style>  </head> @@ -237,6 +245,7 @@ color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> + <noop /> </span>  </xsl:template> @@ -376,6 +385,7 @@ color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> + <noop /> </div> </xsl:if>  -- 1.7.2.5

1 0

last-svn-commit-990-g47a070a mln/core/concept/function.hh: Be consistent in operator=() prototype.
by Guillaume Lazzara 13 Sep '11

13 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/core/concept/function.hh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8014d4b..839b808 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-09-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/concept/function.hh: Be consistent in operator=() + prototype. + 2011-09-13 Roland Levillain <roland(a)lrde.epita.fr> Prevent g++ 4.2 from issuing bad code for constrained-connectivity. diff --git a/milena/mln/core/concept/function.hh b/milena/mln/core/concept/function.hh index 5b6c15a..22e338e 100644 --- a/milena/mln/core/concept/function.hh +++ b/milena/mln/core/concept/function.hh @@ -76,7 +76,7 @@ namespace mln Apple's llvm-gcc has a bug causing memmove() errors if the copy constructor is not declared along with operator=(). */ - Function& operator=(const Function&); + Function<E>& operator=(const Function<E>&); }; @@ -231,7 +231,7 @@ namespace mln template <typename E> inline Function<E>& - Function<E>::operator=(const Function&) + Function<E>::operator=(const Function<E>&) { return *this; } -- 1.7.2.5

2 1

branch next-next updated: last-svn-commit-991-g19126a8
by lazzara＠lrde.epita.fr 13 Sep '11

13 Sep '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 next-next has been updated via 19126a8e17a0fb2578e7cddbfdf2a1baa1823436 (commit) via 47a070a11749226452ba40b207a73d43128da393 (commit) from 75205293d6ff1424f8bccbdfc37b725fd0d48878 (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 ----------------------------------------------------------------- 19126a8 Fix text justification in HTML document reconstruction. 47a070a mln/core/concept/function.hh: Be consistent in operator=() prototype. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/core/concept/function.hh | 4 ++-- scribo/ChangeLog | 7 +++++++ scribo/demo/xml2doc/templates/html/css.css | 8 ++++++++ scribo/demo/xml2doc/templates/html/main.xsl | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

2 1