September 2012 - Olena-patches

branch next updated: olena-2.0-26-g28adecb
by git＠lrde.epita.fr 07 Sep '12

07 Sep '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 next has been updated via 28adecba2ea2583a997d208c14798544ca4209d7 (commit) from 39e1152eceddabf1c61e368c2f7bd477dbc2c46e (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 | 7 +++++++ milena/mln/io/pnm/load.hh | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

2 1

branch unstable/scribo updated: olena-2.0-77-ga0009d2
by git＠lrde.epita.fr 07 Sep '12

07 Sep '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 a0009d29906b8d09acfec883cb0525a744af261c (commit) from 4e2298d2cb279e72733a1623e6df1bc913d8df2d (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 ----------------------------------------------------------------- a0009d2 Take OCR confidence into account in HTML reconstruction. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 ++++ scribo/demo/xml2doc/templates/html/main.xsl | 31 ++++++++++++------- scribo/demo/xml2doc/templates/html/main_base64.xsl | 31 ++++++++++++------- 3 files changed, 45 insertions(+), 24 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-77-ga0009d2 Take OCR confidence into account in HTML reconstruction.
by Guillaume Lazzara 07 Sep '12

07 Sep '12

* demo/xml2doc/templates/html/main.xsl, * demo/xml2doc/templates/html/main_base64.xsl: Here. --- scribo/ChangeLog | 7 ++++ scribo/demo/xml2doc/templates/html/main.xsl | 31 ++++++++++++------- scribo/demo/xml2doc/templates/html/main_base64.xsl | 31 ++++++++++++------- 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e4dc651..e18a1c5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Take OCR confidence into account in HTML reconstruction. + + * demo/xml2doc/templates/html/main.xsl, + * demo/xml2doc/templates/html/main_base64.xsl: Here. + +2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/afp/components.hh: Rename index_of_point to offset_of_point. 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/xml2doc/templates/html/main.xsl b/scribo/demo/xml2doc/templates/html/main.xsl index 8c51ed2..bbd7a5a 100644 --- a/scribo/demo/xml2doc/templates/html/main.xsl +++ b/scribo/demo/xml2doc/templates/html/main.xsl @@ -245,19 +245,26 @@ </xsl:choose> </xsl:variable> +  + <xsl:choose> + <xsl:when test="@textConfidence > 60"> + + + <xsl:attribute name="style"> + height:auto; + font-size:<xsl:value-of select="$fsize" />px; + width:<xsl:value-of select="$x2 - $x1" />px; + left:<xsl:value-of select="$x1 " />px; + top:<xsl:value-of select="$y1 " />px; + color:<xsl:value-of select="$color" />; + </xsl:attribute> + <xsl:value-of select="@text"/> + +  + + </xsl:when> + </xsl:choose> - - <xsl:attribute name="style"> - height:auto; - font-size:<xsl:value-of select="$fsize" />px; - width:<xsl:value-of select="$x2 - $x1" />px; - left:<xsl:value-of select="$x1 " />px; - top:<xsl:value-of select="$y1 " />px; - color:<xsl:value-of select="$color" />; - </xsl:attribute> - <xsl:value-of select="@text"/> - -  </xsl:template> diff --git a/scribo/demo/xml2doc/templates/html/main_base64.xsl b/scribo/demo/xml2doc/templates/html/main_base64.xsl index 79941f2..6400174 100644 --- a/scribo/demo/xml2doc/templates/html/main_base64.xsl +++ b/scribo/demo/xml2doc/templates/html/main_base64.xsl @@ -269,19 +269,26 @@ </xsl:choose> </xsl:variable> +  + <xsl:choose> + <xsl:when test="@textConfidence > 60"> + + + <xsl:attribute name="style"> + height:auto; + font-size:<xsl:value-of select="$fsize" />px; + width:<xsl:value-of select="$x2 - $x1" />px; + left:<xsl:value-of select="$x1 " />px; + top:<xsl:value-of select="$y1 " />px; + color:<xsl:value-of select="$color" />; + </xsl:attribute> + <xsl:value-of select="@text"/> + +  + + </xsl:when> + </xsl:choose> - - <xsl:attribute name="style"> - height:auto; - font-size:<xsl:value-of select="$fsize" />px; - width:<xsl:value-of select="$x2 - $x1" />px; - left:<xsl:value-of select="$x1 " />px; - top:<xsl:value-of select="$y1 " />px; - color:<xsl:value-of select="$color" />; - </xsl:attribute> - <xsl:value-of select="@text"/> - -  </xsl:template> -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-76-g4e2298d
by git＠lrde.epita.fr 07 Sep '12

07 Sep '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 4e2298d2cb279e72733a1623e6df1bc913d8df2d (commit) via 3388ab1a99b95859e0ee2f8645195904d8825eff (commit) via 031310f04de779261c2d1c947639fd26a977aa61 (commit) from c6498e5c0810332d9df1f36eacd18c71f49bb84a (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 ----------------------------------------------------------------- 4e2298d src/afp/components.hh: Rename index_of_point to offset_of_point. 3388ab1 scribo/debug/logger.hh: Add missing inline keywords. 031310f Take OCR confidence into account in document reconstruction. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 22 +++ scribo/demo/xml2doc/templates/pdf/line.xsl | 157 ++++++++++--------- scribo/scribo/core/line_info.hh | 12 ++- scribo/scribo/debug/logger.hh | 3 + .../io/xml/internal/extended_page_xml_visitor.hh | 1 + scribo/scribo/io/xml/internal/full_xml_visitor.hh | 1 + scribo/scribo/io/xml/load.hh | 1 + scribo/src/afp/components.hh | 4 +- 8 files changed, 123 insertions(+), 78 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-76-g4e2298d src/afp/components.hh: Rename index_of_point to offset_of_point.
by Guillaume Lazzara 07 Sep '12

07 Sep '12

--- scribo/ChangeLog | 4 ++++ scribo/src/afp/components.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0e5fe3f..e4dc651 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/afp/components.hh: Rename index_of_point to offset_of_point. + +2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/debug/logger.hh: Add missing inline keywords. 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/afp/components.hh b/scribo/src/afp/components.hh index 7359d16..f8a67e6 100644 --- a/scribo/src/afp/components.hh +++ b/scribo/src/afp/components.hh @@ -156,7 +156,7 @@ namespace mln const unsigned n_nbhs = dp.nelements(); // Backward. - unsigned p = input.index_of_point(point2d(nrows - 1, ncols - 1)); + unsigned p = input.offset_of_point(point2d(nrows - 1, ncols - 1)); for (int row = nrows - 1; row >= 0; --row, p -= dp_border) for (int col = ncols - 1; col >= 0; --col, --p) { @@ -189,7 +189,7 @@ namespace mln data::fill(label, 0); // Forward. - unsigned p = input.index_of_point(point2d(0, 0)); + unsigned p = input.offset_of_point(point2d(0, 0)); for (int row = 0; row < nrows; ++row, p += dp_border) for (int col = 0; col < ncols; ++col, ++p) { -- 1.7.2.5

1 0

olena-2.0-75-g3388ab1 scribo/debug/logger.hh: Add missing inline keywords.
by Guillaume Lazzara 07 Sep '12

07 Sep '12

--- scribo/ChangeLog | 4 ++++ scribo/scribo/debug/logger.hh | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dbad5ca..0e5fe3f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/debug/logger.hh: Add missing inline keywords. + +2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Take OCR confidence into account in document reconstruction. * demo/xml2doc/templates/pdf/line.xsl: Do not print lines with diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 5822cf3..9153bf9 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -213,6 +213,7 @@ namespace scribo namespace internal { + inline std::string to_upper(const std::string& s) { std::string out(s); @@ -481,6 +482,7 @@ namespace scribo } + inline logger_& logger_::operator<<(std::ostream& (*f)(std::ostream&)) { @@ -501,6 +503,7 @@ namespace scribo } + inline VerboseMode txt_to_verbose_mode(const std::string& name) { struct mode_name -- 1.7.2.5

1 0

olena-2.0-74-g031310f Take OCR confidence into account in document reconstruction.
by Guillaume Lazzara 07 Sep '12

07 Sep '12

* demo/xml2doc/templates/pdf/line.xsl: Do not print lines with confidence < 60%. * scribo/core/line_info.hh: Add access to text confidence. * scribo/io/xml/internal/extended_page_xml_visitor.hh, * scribo/io/xml/internal/full_xml_visitor.hh: Save text confidence. * scribo/io/xml/load.hh: Load text confidence. --- scribo/ChangeLog | 14 ++ scribo/demo/xml2doc/templates/pdf/line.xsl | 157 ++++++++++--------- scribo/scribo/core/line_info.hh | 12 ++- .../io/xml/internal/extended_page_xml_visitor.hh | 1 + scribo/scribo/io/xml/internal/full_xml_visitor.hh | 1 + scribo/scribo/io/xml/load.hh | 1 + 6 files changed, 110 insertions(+), 76 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5561f60..dbad5ca 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Take OCR confidence into account in document reconstruction. + + * demo/xml2doc/templates/pdf/line.xsl: Do not print lines with + confidence < 60%. + + * scribo/core/line_info.hh: Add access to text confidence. + + * scribo/io/xml/internal/extended_page_xml_visitor.hh, + * scribo/io/xml/internal/full_xml_visitor.hh: Save text confidence. + + * scribo/io/xml/load.hh: Load text confidence. + 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> Rename point_at_index, delta_index and index_of_point. diff --git a/scribo/demo/xml2doc/templates/pdf/line.xsl b/scribo/demo/xml2doc/templates/pdf/line.xsl index 0c1b9d7..8ce024b 100644 --- a/scribo/demo/xml2doc/templates/pdf/line.xsl +++ b/scribo/demo/xml2doc/templates/pdf/line.xsl @@ -124,93 +124,102 @@ </xsl:variable>  - <fo:block-container position="absolute" border-width="5mm"> - - <xsl:attribute name="left"> - <xsl:value-of select="$x1" />px - </xsl:attribute> - <xsl:attribute name="top"> - <xsl:value-of select="$y1" />px - </xsl:attribute> - - <xsl:attribute name="right"> - <xsl:value-of select="$xmax" />px - </xsl:attribute> - <xsl:attribute name="bottom"> - <xsl:value-of select="$ymax" />px - </xsl:attribute> - - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax - $x1" />px - </xsl:attribute> - - <xsl:attribute name="color"> - <xsl:value-of select="$colour" /> - </xsl:attribute> - -  - <xsl:variable name="fsize"> - <xsl:choose> - <xsl:when test="($a + $d) > (1.16 * (37 * $char_width) div 17)"> - <xsl:value-of select="((37 * $char_width) div 17)" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="($a + $d)" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - -  - -  - <fo:table table-layout="fixed"> - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax -$x1" />px - </xsl:attribute> - - <fo:table-column column-number="1"> - <xsl:attribute name="column-width"> - <xsl:value-of select="$xmax -$x1" />px + +  + <xsl:choose> + <xsl:when test="@textConfidence > 60"> + + + <fo:block-container position="absolute" border-width="5mm"> + + <xsl:attribute name="left"> + <xsl:value-of select="$x1" />px + </xsl:attribute> + <xsl:attribute name="top"> + <xsl:value-of select="$y1" />px + </xsl:attribute> + + <xsl:attribute name="right"> + <xsl:value-of select="$xmax" />px + </xsl:attribute> + <xsl:attribute name="bottom"> + <xsl:value-of select="$ymax" />px + </xsl:attribute> + + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax - $x1" />px + </xsl:attribute> + + <xsl:attribute name="color"> + <xsl:value-of select="$colour" /> </xsl:attribute> - </fo:table-column> - <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> +  + <xsl:variable name="fsize"> + <xsl:choose> + <xsl:when test="($a + $d) > (1.16 * (37 * $char_width) div 17)"> + <xsl:value-of select="((37 * $char_width) div 17)" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="($a + $d)" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + +  + +  + <fo:table table-layout="fixed"> + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + + <fo:table-column column-number="1"> + <xsl:attribute name="column-width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + </fo:table-column> + + <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> + + <fo:table-row> - <fo:table-row> + <fo:table-cell> - <fo:table-cell> + <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> - <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> + <xsl:attribute name="font-size"> + <xsl:value-of select="$fsize" />px + </xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$fsize" />px - </xsl:attribute> + <xsl:value-of select="@text"/> + </fo:block> - <xsl:value-of select="@text"/> - </fo:block> + </fo:table-cell> - </fo:table-cell> + </fo:table-row> - </fo:table-row> + </fo:table-body> - </fo:table-body> + </fo:table> - </fo:table> + </fo:block-container> + </xsl:when> - </fo:block-container> + </xsl:choose> </xsl:for-each> diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index b121205..59ce1d3 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -758,6 +758,14 @@ namespace scribo template <typename L> + float + line_info<L>::text_confidence() const + { + return data_->text_confidence_; + } + + + template <typename L> const std::string& line_info<L>::text() const { @@ -775,7 +783,7 @@ namespace scribo template <typename L> void - line_info<L>::update_text(const std::string& str, float confidence = 1.0) + line_info<L>::update_text(const std::string& str, float confidence = 100.0) { data_->text_confidence_ = confidence; data_->text_ = str; diff --git a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh index c766515..8c83ffa 100644 --- a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh @@ -337,6 +337,7 @@ namespace scribo << "\" dHeight=\"" << line.d_height() << "\" aHeight=\"" << line.a_height() << "\" charWidth=\"" << line.char_width() + << "\" textConfidence=\"" << line.text_confidence() << "\">" << std::endl; internal::print_box_coords(output, line.bbox(), " "); diff --git a/scribo/scribo/io/xml/internal/full_xml_visitor.hh b/scribo/scribo/io/xml/internal/full_xml_visitor.hh index e398389..23b48a8 100644 --- a/scribo/scribo/io/xml/internal/full_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/full_xml_visitor.hh @@ -518,6 +518,7 @@ namespace scribo << "\" dHeight=\"" << line.d_height() << "\" aHeight=\"" << line.a_height() << "\" charWidth=\"" << line.char_width() + << "\" textConfidence=\"" << line.text_confidence() << "\">" << std::endl; internal::print_box_coords(output, line.bbox(), " "); diff --git a/scribo/scribo/io/xml/load.hh b/scribo/scribo/io/xml/load.hh index 6b570f8..62ad4a2 100644 --- a/scribo/scribo/io/xml/load.hh +++ b/scribo/scribo/io/xml/load.hh @@ -284,6 +284,7 @@ namespace scribo line_data = new scribo::internal::line_info_data<L>(lines, mln::util::array<component_id_t>()); line_data->text_ = atts.value("text").toUtf8().constData(); + line_data->text_confidence_ = atts.value("textConfidence").toUtf8().constData(); line_data->hidden_ = false; line_data->tag_ = static_cast<line::Tag>(atts.value("tag").toInt()); -- 1.7.2.5

1 0