Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-739-g0462459 Handle paragraphs correctly in scribo-viewer.

by Guillaume Lazzara

* demo/viewer/common.hh, * demo/viewer/image_region.cc, * demo/viewer/key_widget.cc, * demo/viewer/step_widget.cc, * demo/viewer/viewer.cc, * demo/viewer/viewer.hh, * demo/viewer/xml_widget.cc: Get rid of the paragraph node and consider text_region as a paragraph. --- scribo/ChangeLog | 13 ++++++++ scribo/demo/viewer/common.hh | 7 ++-- scribo/demo/viewer/image_region.cc | 11 ++---- scribo/demo/viewer/key_widget.cc | 38 ++++++++++++---------- scribo/demo/viewer/step_widget.cc | 4 ++ scribo/demo/viewer/viewer.cc | 60 +++++++++++++++-------------------- scribo/demo/viewer/viewer.hh | 2 +- scribo/demo/viewer/xml_widget.cc | 29 +++++------------ 8 files changed, 81 insertions(+), 83 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 564ed4d..37d0ea8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2011-01-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle paragraphs correctly in scribo-viewer. + + * demo/viewer/common.hh, + * demo/viewer/image_region.cc, + * demo/viewer/key_widget.cc, + * demo/viewer/step_widget.cc, + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh, + * demo/viewer/xml_widget.cc: Get rid of the paragraph node and + consider text_region as a paragraph. + +2011-01-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add support for paragraphs. * scribo/core/document.hh: Add support for paragraphs. diff --git a/scribo/demo/viewer/common.hh b/scribo/demo/viewer/common.hh index 7f67f82..b2d8f7e 100644 --- a/scribo/demo/viewer/common.hh +++ b/scribo/demo/viewer/common.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -24,7 +25,6 @@ namespace region enum RegionId { Text = 0, - Paragraph, Line, Image, Noise, @@ -33,7 +33,8 @@ namespace region LineDrawing, Graphic, Chart, - Maths + Maths, + RegionIdCount }; } diff --git a/scribo/demo/viewer/image_region.cc b/scribo/demo/viewer/image_region.cc index 19ca872..93d9d79 100644 --- a/scribo/demo/viewer/image_region.cc +++ b/scribo/demo/viewer/image_region.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -40,9 +41,7 @@ ImageRegion::ImageRegion(region::RegionId id, alpha_(50) { setCursor(Qt::ArrowCursor); - if (id_ == region::Paragraph) - setZValue(2); - else if (id_ == region::Line) + if (id_ == region::Line) setZValue(3); else setZValue(1); @@ -128,9 +127,7 @@ ImageRegion::deselect() if (selected_) { selected_ = false; - if (id_ == region::Paragraph) - setZValue(2); - else if (id_ == region::Line) + if (id_ == region::Line) setZValue(3); else setZValue(1); diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 47cfbcf..3a4b47b 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -35,12 +36,11 @@ KeyWidget::KeyWidget(const region::KeyMap& key_map) regions_->setCheckState(0, Qt::Checked); regions_->setExpanded(true); - for (int i = 0; i < 3; ++i) + for (int i = 0; i < 2; ++i) add_item_(key_map.at(i).first, key_map.at(i).second, - i == region::Line || - i == region::Paragraph, text_); + i == region::Line, text_); - for (int i = 3; i < key_map.size(); ++i) + for (int i = 2; i < key_map.size(); ++i) add_item_(key_map.at(i).first, key_map.at(i).second, false, regions_); QVBoxLayout* layout = new QVBoxLayout; @@ -89,20 +89,17 @@ void KeyWidget::setAllCheck(QTreeWidgetItem* parent) void KeyWidget::change_mode(bool b) { - int id_region = region::Paragraph; int id_line = region::Line; if (b) { //text_->child(id_region)->setCheckState(0, Qt::Checked); - text_->child(id_region)->setHidden(false); // text_->child(id_line)->setCheckState(0, Qt::Checked); text_->child(id_line)->setHidden(false); } else { //text_->child(id_region)->setCheckState(0, Qt::Unchecked); - text_->child(id_region)->setHidden(true); // text_->child(id_line)->setCheckState(0, Qt::Unchecked); text_->child(id_line)->setHidden(true); } @@ -140,20 +137,27 @@ KeyWidget::isChecked(region::RegionId id) void KeyWidget::update(QTreeWidgetItem* item) { - int id; - id = text_->indexOfChild(item); - if (id == -1) - id = regions_->indexOfChild(item) + 4; - - emit updated(id, item->checkState(0) == Qt::Checked); - + int id = -1; if (item == text_ || item == regions_) + { + setAllCheck(item); + } + else + { + id = text_->indexOfChild(item); + if (id == -1) { - setAllCheck(item); - return; + // +2 since image region id starts from 0 to the number of + // region type without considering categories. There are 2 + // elements in text category and the rest is in the region's + // one. + id = regions_->indexOfChild(item) + 2; } + emit updated(id, item->checkState(0) == Qt::Checked); + } } KeyWidget::~KeyWidget() { } + diff --git a/scribo/demo/viewer/step_widget.cc b/scribo/demo/viewer/step_widget.cc index 9d26971..77e9bd3 100644 --- a/scribo/demo/viewer/step_widget.cc +++ b/scribo/demo/viewer/step_widget.cc @@ -119,7 +119,11 @@ void StepWidget::fill_steps(QString file, bool step, bool container) emit activated(list.first()); } else + { step_ = QString::Null(); + if (view_->count()) + emit activated(view_->item(0)); + } } } diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index a633a2c..46172ce 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -40,7 +41,7 @@ Viewer::Viewer(int &argc, char** argv) scene_(new ImageScene()), files_(new QDirModel()), doc_layout_(0), - key_map_(11), + key_map_(region::RegionIdCount), no_cache_(false), extended_mode_(false), xml_file_(QString::Null()), @@ -52,7 +53,6 @@ Viewer::Viewer(int &argc, char** argv) // Key map key_map_[region::Text] = qMakePair(tr("Text Region"), QColor(0, 200, 0)); - key_map_[region::Paragraph] = qMakePair(tr("Paragraph"), QColor(0, 0, 255)); key_map_[region::Line] = qMakePair(tr("Text line"), QColor(255, 0, 0)); key_map_[region::Image] = qMakePair(tr("Image"), QColor(255, 120, 0)); @@ -68,7 +68,6 @@ Viewer::Viewer(int &argc, char** argv) // Region ids region_ids_["text_region"] = region::Text; - region_ids_["paragraph"] = region::Paragraph; region_ids_["line"] = region::Line; region_ids_["image_region"] = region::Image; region_ids_["noise_region"] = region::Noise; @@ -297,6 +296,8 @@ Viewer::Viewer(int &argc, char** argv) this, SLOT(run_progress())); connect(&runner_, SIGNAL(xml_saved(const QString&)), this, SLOT(on_xml_saved(const QString&))); + + extended_action->setChecked(true); } @@ -308,12 +309,12 @@ Viewer::~Viewer() } void -Viewer::add_text(QDomNode line, QDomNode region) +Viewer::add_text(QDomNode line) { - int a_height = region.toElement().attribute("a_height", "0").toInt(); - int d_height = region.toElement().attribute("d_height", "0").toInt(); - int x_height = region.toElement().attribute("x_height", "0").toInt(); + int a_height = line.toElement().attribute("a_height", "0").toInt(); + int d_height = line.toElement().attribute("d_height", "0").toInt(); + int x_height = line.toElement().attribute("x_height", "0").toInt(); if (d_height < 0) d_height = -d_height; @@ -324,7 +325,7 @@ Viewer::add_text(QDomNode line, QDomNode region) if ( (a_height - x_height) > (d_height)) d_height = a_height - x_height; - QDomNode coords = region.firstChild(); + QDomNode coords = line.firstChild(); while (!coords.isNull() && !coords.toElement().tagName().contains("coords")) coords = coords.nextSibling(); @@ -523,32 +524,25 @@ Viewer::load_xml(QString filename) } } - // if ((extended_mode_ || text_) && if (region.toElement().tagName().contains("text_region")) - { - QDomNode para = region.firstChild(); - while (!para.isNull() && !para.toElement().tagName().contains("paragraph")) - para = para.nextSibling(); - - if (!para.isNull()) - { - if (extended_mode_) - add_region(para, attr_id); - - QDomNode line = para.firstChild(); - while (!line.isNull() && !line.toElement().tagName().contains("line")) - line = line.nextSibling(); + { + QDomNode line = region.firstChild(); - if (!line.isNull()) - { - if (extended_mode_) - add_region(line, attr_id); - add_text(line, region); - } - } + do + { + while (!line.isNull() && !line.toElement().tagName().contains("line")) + line = line.nextSibling(); + + if (!line.isNull()) + { + if (extended_mode_) + add_region(line, attr_id); + add_text(line); + } } - - } + while (!(line = line.nextSiblingElement("line")).isNull()); + } + } region = region.nextSibling(); } @@ -804,8 +798,6 @@ Viewer::export_as() runner_.start_export(browser_wgt_->current(), step_widget_->current(), output); qDebug() << "Saving to " << output << " - " << browser_wgt_->current() << " - " << step_widget_->current(); } - - qDebug() << "Toggled"; } diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index f491c33..3aefaf6 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -78,7 +78,7 @@ private: void xml_to_layout(); QPixmap load_base64(QString xml); void add_region(QDomNode father, QString attr_id); - void add_text(QDomNode line, QDomNode region); + void add_text(QDomNode line); QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); void reset_progress_dialog(); diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index df68960..c45177b 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -49,26 +50,12 @@ XmlWidget::select(QString id, QString name) { QDomNode n = node_map_[item_map_[id]]; - if (name.contains("Paragraph")) - { - n = n.firstChild(); - while (!n.isNull() && !n.toElement().tagName().contains("paragraph")) - n = n.nextSibling(); - } - - if (name.contains("Text line")) - { - n = n.firstChild(); - while (!n.isNull() && !n.toElement().tagName().contains("paragraph")) - n = n.nextSibling(); - - if (!n.isNull()) - { - n = n.firstChild(); - while (!n.isNull() && !n.toElement().tagName().contains("line")) - n = n.nextSibling(); - } - } + if (name.contains("Text line")) + { + n = n.firstChild(); + while (!n.isNull() && !n.toElement().tagName().contains("line")) + n = n.nextSibling(); + } if (!n.isNull()) { -- 1.5.6.5

13 years, 12 months

last-svn-commit-738-g332c502 Add support for paragraphs.

by Guillaume Lazzara

* scribo/core/document.hh: Add support for paragraphs. * scribo/core/macros.hh: Add new macro for_all_paragraph_lines. * scribo/core/line_links.hh, * scribo/core/paragraph_info.hh, * scribo/core/paragraph_set.hh: New. New structures. * scribo/filter/line_links_x_height.hh, * scribo/text/link_lines.hh: New. New routine. --- scribo/ChangeLog | 15 ++ scribo/scribo/core/document.hh | 20 ++ scribo/scribo/core/line_links.hh | 263 ++++++++++++++++++++ scribo/scribo/core/macros.hh | 3 + scribo/scribo/core/paragraph_info.hh | 120 +++++++++ scribo/scribo/core/paragraph_set.hh | 163 ++++++++++++ .../crop.hh => filter/line_links_x_height.hh} | 69 +++--- scribo/scribo/text/link_lines.hh | 165 ++++++++++++ 8 files changed, 784 insertions(+), 34 deletions(-) create mode 100644 scribo/scribo/core/line_links.hh create mode 100644 scribo/scribo/core/paragraph_info.hh create mode 100644 scribo/scribo/core/paragraph_set.hh copy scribo/scribo/{preprocessing/crop.hh => filter/line_links_x_height.hh} (53%) create mode 100644 scribo/scribo/text/link_lines.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2415ee4..564ed4d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,20 @@ 2011-01-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add support for paragraphs. + + * scribo/core/document.hh: Add support for paragraphs. + + * scribo/core/macros.hh: Add new macro for_all_paragraph_lines. + + * scribo/core/line_links.hh, + * scribo/core/paragraph_info.hh, + * scribo/core/paragraph_set.hh: New. New structures. + + * scribo/filter/line_links_x_height.hh, + * scribo/text/link_lines.hh: New. New routine. + +2011-01-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/text_extraction.cc: Fix test. 2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index b6b79df..f4a78ff 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -36,6 +36,7 @@ # include <scribo/core/component_set.hh> # include <scribo/core/line_set.hh> +# include <scribo/core/paragraph_set.hh> namespace scribo { @@ -62,6 +63,9 @@ namespace scribo bool has_text() const; void set_text(const line_set<L>& line); + const paragraph_set<L>& paragraphs() const; + void set_paragraphs(const paragraph_set<L>& parset); + const component_set<L>& elements() const; bool has_elements() const; void set_elements(const component_set<L>& elements); @@ -74,6 +78,7 @@ namespace scribo mln::image2d<mln::value::rgb8> image_; line_set<L> lines_; + paragraph_set<L> parset_; component_set<L> elements_; }; @@ -167,6 +172,21 @@ namespace scribo lines_ = line; } + template <typename L> + const paragraph_set<L>& + document<L>::paragraphs() const + { + return parset_; + } + + + template <typename L> + void + document<L>::set_paragraphs(const paragraph_set<L>& parset) + { + parset_ = parset; + } + template <typename L> const component_set<L>& diff --git a/scribo/scribo/core/line_links.hh b/scribo/scribo/core/line_links.hh new file mode 100644 index 0000000..85c45e8 --- /dev/null +++ b/scribo/scribo/core/line_links.hh @@ -0,0 +1,263 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_LINE_LINKS_HH +# define SCRIBO_CORE_LINE_LINKS_HH + +/// \file +/// +/// \brief Line links representation. + + +# include <mln/util/array.hh> +# include <mln/util/tracked_ptr.hh> + +# include <scribo/core/line_set.hh> + + +namespace scribo +{ + + using namespace mln; + + // Forward declaration. + template <typename L> class line_links; + + + namespace internal + { + /// Data structure for \c scribo::line_links. + template <typename L> + struct line_links_data + { + line_links_data(); + line_links_data(const line_set<L>& lines, unsigned size); + line_links_data(const line_set<L>& lines, + unsigned size, line_id_t value); + + mln::util::array<line_id_t> line_to_link_; + line_set<L> lines_; + }; + + } // end of namespace scribo::internal + + + + + /// \brief Line group representation. + // + template <typename L> + class line_links + { + typedef internal::line_links_data<L> data_t; + + public: + line_links(); + line_links(const line_set<L>& lines); + line_links(const line_set<L>& lines, line_id_t value); + + const line_set<L>& lines() const; + + bool is_valid() const; + + unsigned nelements() const; + + line_id_t& operator()(line_id_t comp_id); + const line_id_t& operator()(line_id_t comp_id) const; + + const mln::util::array<line_id_t>& line_to_link() const; + + void init(); + + line_links<L> duplicate() const; + + private: + mln::util::tracked_ptr<data_t> data_; + }; + + + template <typename L> + std::ostream& + operator<<(std::ostream& ostr, const line_links<L>& links); + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + + + /// Data structure for \c scribo::line_links. + template <typename L> + line_links_data<L>::line_links_data() + { + } + + + template <typename L> + line_links_data<L>::line_links_data(const line_set<L>& lines, + unsigned size) + : line_to_link_(size), lines_(lines) + { + }; + + + template <typename L> + line_links_data<L>::line_links_data(const line_set<L>& lines, + unsigned size, line_id_t value) + : line_to_link_(size, value), lines_(lines) + { + }; + + + } // end of namespace scribo::internal + + + + template <typename L> + line_links<L>::line_links() + { + data_ = new data_t(); + } + + + template <typename L> + line_links<L>::line_links(const line_set<L>& lines) + { + data_ = new data_t(lines, value::next(lines.nelements())); + } + + + template <typename L> + line_links<L>::line_links(const line_set<L>& lines, + line_id_t value) + { + data_ = new data_t(lines, value::next(lines.nelements()), + value); + } + + + template <typename L> + const line_set<L>& + line_links<L>::lines() const + { + return data_->lines_; + } + + + template <typename L> + bool + line_links<L>::is_valid() const + { + return data_->lines_.is_valid() + && data_->lines_.nelements() == (this->nelements() - 1); + } + + + template <typename L> + unsigned + line_links<L>::nelements() const + { + return data_->line_to_link_.nelements(); + } + + + template <typename L> + line_id_t& + line_links<L>::operator()(line_id_t comp_id) + { + return data_->line_to_link_(comp_id); + } + + + template <typename L> + const line_id_t& + line_links<L>::operator()(line_id_t comp_id) const + { + return data_->line_to_link_(comp_id); + } + + + template <typename L> + const mln::util::array<line_id_t>& + line_links<L>::line_to_link() const + { + return data_->line_to_link_; + } + + + template <typename L> + void + line_links<L>::init() + { + for (unsigned i = 0; i < nelements(); ++i) + if (! data_->lines_(i).is_valid() + || data_->lines_(i).is_hidden() + || data_->lines_(i).type() != line::Text) + { + data_->line_to_link_(i) = 0; + } + else + { + data_->line_to_link_(i) = i; + } + } + + template <typename L> + inline + line_links<L> + line_links<L>::duplicate() const + { + line_links<L> output; + output.data_ = new data_t(); + + *(output.data_.ptr_) = *(data_.ptr_); + return output; + } + + + template <typename L> + std::ostream& + operator<<(std::ostream& ostr, const line_links<L>& links) + { + ostr << "line_links["; + + for_all_links(l, links) + ostr << l << "->" << links.line_to_link()[l] << ", "; + + ostr << "]"; + + return ostr; + } + + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace scribo + + +#endif // ! SCRIBO_CORE_LINE_LINKS_HH diff --git a/scribo/scribo/core/macros.hh b/scribo/scribo/core/macros.hh index f7de5b6..1060358 100644 --- a/scribo/scribo/core/macros.hh +++ b/scribo/scribo/core/macros.hh @@ -50,6 +50,9 @@ # define for_all_lines(E, S) \ for_all_comps(E, S) +# define for_all_paragraphs(E, S) \ + for_all_comps(E, S) + # define for_all_line_comps(E, S) \ for_all_elements(E, S) diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh new file mode 100644 index 0000000..a8c623a --- /dev/null +++ b/scribo/scribo/core/paragraph_info.hh @@ -0,0 +1,120 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_PARAGRAPH_INFO_HH +# define SCRIBO_CORE_PARAGRAPH_INFO_HH + +# include <scribo/core/line_info.hh> +# include <scribo/core/line_links.hh> +# include <mln/util/array.hh> +# include <mln/accu/shape/bbox.hh> + +namespace scribo +{ + + /*! \brief Paragraph structure information. + + */ + template <typename L> + class paragraph_info + { + public: + paragraph_info(); + paragraph_info(const line_links<L>& llinks); + + void add_line(const line_info<L>& line); + + const mln::box2d& bbox() const; + + const line_info<L>& line(line_id_t id) const; + + const mln::util::array<line_id_t>& line_ids() const; + + bool is_valid() const; + + private: + mln::util::array<line_id_t> line_ids_; + mln::accu::shape::bbox<mln_site(L)> bbox_; + line_links<L> llinks_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + paragraph_info<L>::paragraph_info() + { + } + + template <typename L> + paragraph_info<L>::paragraph_info(const line_links<L>& llinks) + : llinks_(llinks) + { + } + + template <typename L> + void + paragraph_info<L>::add_line(const line_info<L>& line) + { + line_ids_.append(line.id()); + bbox_.take(line.bbox()); + } + + template <typename L> + const mln::box2d& + paragraph_info<L>::bbox() const + { + return bbox_.to_result(); + } + + template <typename L> + const line_info<L>& + paragraph_info<L>::line(line_id_t id) const + { + mln_precondition(is_valid()); + return llinks_.lines()(id); + } + + template <typename L> + const mln::util::array<line_id_t>& + paragraph_info<L>::line_ids() const + { + return line_ids_; + } + + template <typename L> + bool + paragraph_info<L>::is_valid() const + { + return llinks_.is_valid(); + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace scribo + +#endif // ! SCRIBO_CORE_PARAGRAPH_INFO_HH diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh new file mode 100644 index 0000000..afb59c5 --- /dev/null +++ b/scribo/scribo/core/paragraph_set.hh @@ -0,0 +1,163 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_PARAGRAPH_SET_HH +# define SCRIBO_CORE_PARAGRAPH_SET_HH + +# include <mln/util/array.hh> +# include <mln/make/relabelfun.hh> +# include <mln/value/int_u16.hh> +# include <scribo/core/line_links.hh> +# include <scribo/core/line_set.hh> +# include <scribo/core/paragraph_info.hh> + +namespace scribo +{ + + /*! \brief Paragraph container. + + Paragraph ids start from 1. + + */ + template <typename L> + class paragraph_set + { + public: + paragraph_set(); + paragraph_set(const line_links<L>& llinks, unsigned npars); + + unsigned nelements() const; + + paragraph_info<L>& operator()(unsigned i); + const paragraph_info<L>& operator()(unsigned i) const; + + + private: + mln::util::array<paragraph_info<L> > pars_; + }; + + + + namespace make + { + + /// \brief Construct a paragraph set from line links information. + template <typename L> + scribo::paragraph_set<L> + paragraph(const line_links<L>& llinks); + + } // end of namespace scribo::make + + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + paragraph_set<L>::paragraph_set() + { + } + + template <typename L> + paragraph_set<L>::paragraph_set(const line_links<L>& llinks, unsigned npars) + : pars_(npars + 1, paragraph_info<L>(llinks)) + { + } + + template <typename L> + unsigned + paragraph_set<L>::nelements() const + { + return pars_.nelements() - 1; + } + + template <typename L> + paragraph_info<L>& + paragraph_set<L>::operator()(unsigned i) + { + return pars_[i]; + } + + template <typename L> + const paragraph_info<L>& + paragraph_set<L>::operator()(unsigned i) const + { + return pars_[i]; + } + + + + namespace make + { + + namespace internal + { + + template <typename L> + inline + unsigned + find_root(line_links<L>& parent, unsigned x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + } // end of namespace scribo::make::internal + + + template <typename L> + scribo::paragraph_set<L> + paragraph(const line_links<L>& llinks) + { + line_links<L> links = llinks.duplicate(); + + for (unsigned i = 1; i < links.nelements(); ++i) + links(i) = internal::find_root(links, i); + + unsigned npars; + mln::fun::i2v::array<unsigned> + par_ids = mln::make::relabelfun(links.line_to_link(), + links.nelements() - 1, npars); + paragraph_set<L> parset(links, npars); + + const scribo::line_set<L>& lines = links.lines(); + for_all_links(l, links) + if (links(l)) + { + value::int_u16 par_id = par_ids(l); + parset(par_id).add_line(lines(l)); + } + + return parset; + } + + } // end of namespace scribo::make + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace scribo + +#endif // ! SCRIBO_CORE_PARAGRAPH_SET_HH diff --git a/scribo/scribo/preprocessing/crop.hh b/scribo/scribo/filter/line_links_x_height.hh similarity index 53% copy from scribo/scribo/preprocessing/crop.hh copy to scribo/scribo/filter/line_links_x_height.hh index c289f86..47f214e 100644 --- a/scribo/scribo/preprocessing/crop.hh +++ b/scribo/scribo/filter/line_links_x_height.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,62 +23,63 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PREPROCESSING_CROP_HH -# define SCRIBO_PREPROCESSING_CROP_HH - -# include <mln/core/concept/image.hh> -# include <mln/data/paste.hh> +#ifndef SCRIBO_TEXT_LINE_LINKS_X_HEIGHT_HH +# define SCRIBO_TEXT_LINE_LINKS_X_HEIGHT_HH /// \file /// -/// \brief Crop an image preserving the localization. +/// \brief Filter line links according to character x height. + +# include <scribo/core/macros.hh> +# include <scribo/core/line_set.hh> namespace scribo { - namespace preprocessing + namespace filter { - using namespace mln; - - - /*! \brief crop an image preserving the localization. - - \param[in] input An image. - \param[in] domain A region of interest. + template <typename L> + line_links<L> + line_links_x_height(const line_links<L>& links); - \return An image defined on the domain \p domain with the - corresponding data copied from \p input. - */ - template <typename I> - mln_concrete(I) - crop(const Image& input, const mln_box(I)& domain); +# ifndef MLN_INCLUDE_ONLY + template <typename L> + line_links<L> + line_links_x_height(const line_links<L>& links) + { + line_links<L> output = links.duplicate(); -# ifndef MLN_INCLUDE_ONLY + float min_x, max_x;//, min_a, max_a; + const line_set<L>& lines = links.lines(); + for_all_links(l, links) + if (links(l)) + { + max_x = lines(l).x_height(); + // max_a = lines(l).a_height; + min_x = lines(output(l)).x_height(); + // min_a = lines(output(l)).a_height; + if (lines(l).x_height() < lines(output(l)).x_height()) + std::swap(max_x, min_x); - template <typename I> - mln_concrete(I) - crop(const Image& input, const mln_box(I)& domain) - { - trace::entering("scribo::preprocessing::crop"); - mln_assertion(exact(input).is_valid()); + // if (lines(l).a_height < lines(output(l)).a_height) + // std::swap(max_a, min_a); - mln_concrete(I) output(domain); - data::paste(input | domain, output); + if (min_x / max_x < 0.72f)// || min_a / max_a < 0.80f) + output(l) = l; + } - trace::exiting("scribo::preprocessing::crop"); return output; } - # endif // ! MLN_INCLUDE_ONLY - } // end of namespace scribo::preprocessing + } // end of namespace scribo::filter } // end of namespace scribo -#endif // ! SCRIBO_PREPROCESSING_CROP_HH +#endif // ! SCRIBO_TEXT_LINE_LINKS_X_HEIGHT_HH diff --git a/scribo/scribo/text/link_lines.hh b/scribo/scribo/text/link_lines.hh new file mode 100644 index 0000000..6c985f5 --- /dev/null +++ b/scribo/scribo/text/link_lines.hh @@ -0,0 +1,165 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_TEXT_LINK_LINES_HH +# define SCRIBO_TEXT_LINK_LINES_HH + +/// \file +/// +/// \brief Verticaly link text lines to prepare paragraph +/// construction. + +#include <mln/value/int_u16.hh> +#include <mln/data/fill.hh> +#include <mln/geom/rotate.hh> +#include <mln/geom/ncols.hh> +#include <mln/draw/box_plain.hh> +#include <mln/util/array.hh> + +#include <scribo/core/line_links.hh> + + +namespace scribo +{ + + namespace text + { + + using namespace mln; + + + template <typename L> + line_links<L> + link_lines(const line_set<L>& lines); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + line_links<L> + link_lines(const line_set<L>& lines) + { + typedef value::int_u16 V; + + const mln_concrete(L)& lbl = lines.components().labeled_image(); + + // Rotate the domain in order to browse the image efficiently. + mln_ch_value(L,V) blocks(geom::rotate(lbl.domain(), + -90, lbl.domain().pcenter())); + mln::data::fill(blocks, literal::zero); + + // Construct a list of rotated bboxes for each lines. + util::array<mln_box(L)> rbbox(1); + rbbox.reserve(lines.nelements()); + + for_all_lines(l, lines) + { + if (! lines(l).is_valid() || lines(l).is_hidden() || lines(l).type() != line::Text) + { + rbbox.resize(rbbox.nelements() + 1); + continue; + } + + mln_box(L) b = mln::geom::rotate(lines(l).bbox(), -90, lbl.domain().pcenter()); + rbbox.append(b); + mln::draw::box_plain(blocks, b, l); + } + + // Looking for neighbor lines. + line_links<L> links(lines); + links.init(); + + for_all_lines(l, lines) + { + if (! lines(l).is_valid() || lines(l).is_hidden() || lines(l).type() != line::Text) + continue; + + int dmax = 1.5 * lines(l).x_height(); // FIXME: better ratio? + mln_site(L) c = rbbox(l).pcenter(); + + int + midcol = (rbbox(l).pmax().col() + - rbbox(l).pmin().col()) / 2; + + int + nleftima = std::abs(c.col() - blocks.domain().pmin().col()), // abs, useful? + nleft = std::min(nleftima, midcol + dmax); + + // Left + { + const V + *p = &blocks(c), + *pstop = p - nleft; + + for (; p != pstop; --p) + { + if (*p != literal::zero // Not the background + && *p != l // Not the current component + && links(*p) != l) // No loops + { + links(l) = *p; + break; + } + } + } + + // Right + { + int + nrightima = geom::ncols(blocks) - c.col() + blocks.domain().pmin().col(), + nright = std::min(nrightima, midcol + dmax); + + const V + *p = &blocks(c), + *pstop = p + nright - 1; + + for (; p != pstop; ++p) + { + if (*p != literal::zero // Not the background + && *p != l // Not the current component + && links(l) != *p // No loops + && links(*p) == *p) // Not already connected + { + links(*p) = l; + break; + } + } + } + } + + return links; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::text + +} // end of namespace scribo + + +#endif // ! SCRIBO_TEXT_LINK_LINES_HH -- 1.5.6.5

13 years, 12 months

last-svn-commit-737-ge56d207 Fix test for nepomuk toolchain.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/tests/toolchain/nepomuk/text_extraction.cc | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 22ed824..2415ee4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-01-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/toolchain/nepomuk/text_extraction.cc: Fix test. + 2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> Various fixes in Scribo. diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/tests/toolchain/nepomuk/text_extraction.cc index 30051ae..7191650 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/tests/toolchain/nepomuk/text_extraction.cc @@ -43,12 +43,9 @@ int main() QImage ima(SCRIBO_IMG_DIR "/wildly.pbm"); QSet<QString> words = scribo::toolchain::nepomuk::text_extraction(ima); + words = words.toLower(); mln_assertion(words.size() == 1); - -#ifndef HAVE_TESSERACT_3 - mln_assertion(words.contains("Wildly")); -#else // HAVE_TESSERACT_2 mln_assertion(words.contains("wildly")); -#endif // ! HAVE_TESSERACT_3 + return 0; } -- 1.5.6.5

13 years, 12 months

branch next-build-test updated: last-svn-commit-736-g50ac33a

by lazzara＠lrde.epita.fr

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-build-test has been updated via 50ac33a582bb71a54b2b7f2944113d1a144e3fb7 (commit) via 89e985dfcc2cd3b51052c32f18a188fe99ba4dbe (commit) from 213b9ca3cc09f7d79c5bdcc1d920a8ca1b954868 (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 ----------------------------------------------------------------- 50ac33a Various fixes in Scribo. 89e985d Fix a serious bug with gcc 4.5 and later. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 +++++- milena/mln/value/equiv.hh | 15 +++++++---- scribo/ChangeLog | 16 ++++++++++++ scribo/scribo/core/component_info.hh | 8 +++--- scribo/scribo/core/line_info.hh | 26 ++++++++++--------- scribo/scribo/debug/usage.hh | 6 ++-- .../toolchain/internal/text_in_doc_functor.hh | 8 ++++- scribo/tests/toolchain/nepomuk/text_extraction.cc | 8 +++++- 8 files changed, 67 insertions(+), 28 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years

last-svn-commit-736-g50ac33a Various fixes in Scribo.

by Guillaume Lazzara

* scribo/core/component_info.hh: Initialize type_ attribute. * scribo/core/line_info.hh: Rename accumulators. * scribo/debug/usage.hh: Update copyright. * scribo/toolchain/internal/text_in_doc_functor.hh: Initialize input_cleaned local variable. * tests/toolchain/nepomuk/text_extraction.cc: Support both Tesseract 2 and 3. --- scribo/ChangeLog | 16 ++++++++++++ scribo/scribo/core/component_info.hh | 8 +++--- scribo/scribo/core/line_info.hh | 26 ++++++++++--------- scribo/scribo/debug/usage.hh | 6 ++-- .../toolchain/internal/text_in_doc_functor.hh | 8 ++++- scribo/tests/toolchain/nepomuk/text_extraction.cc | 8 +++++- 6 files changed, 50 insertions(+), 22 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7982a78..22ed824 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,21 @@ 2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Various fixes in Scribo. + + * scribo/core/component_info.hh: Initialize type_ attribute. + + * scribo/core/line_info.hh: Rename accumulators. + + * scribo/debug/usage.hh: Update copyright. + + * scribo/toolchain/internal/text_in_doc_functor.hh: Initialize + input_cleaned local variable. + + * tests/toolchain/nepomuk/text_extraction.cc: Support both + Tesseract 2 and 3. + +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/Makefile.am: Explicitly link to libtiff. 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index 8345266..4ed6db7 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -97,7 +97,7 @@ namespace scribo inline component_info::component_info() - : id_(0), tag_(component::Ignored) + : id_(0), tag_(component::Ignored), type_(component::Undefined) { } @@ -109,7 +109,7 @@ namespace scribo const mln::point2d& mass_center, unsigned card) : id_(id), bbox_(bbox), mass_center_(mass_center), card_(card), - tag_(component::None), line_id_(0) + tag_(component::None), type_(component::Undefined), line_id_(0) { } diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index ed31d17..54a5094 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -801,8 +801,8 @@ namespace scribo typedef mln::value::int_u<12> median_data_t; typedef mln::accu::stat::median_h<median_data_t> median_t; median_t - absolute_meanline, - absolute_baseline, + meanline, + baseline, char_space, char_width; @@ -871,13 +871,15 @@ namespace scribo if (bb.width() <= 1000) char_width.take(bb.width()); - // Meanline (compute an absolute value, from the top left - // corner of the image). - absolute_meanline.take(bb.pmin().row() - ref_line); + // Meanline (compute an absolute value, from the top left corner + // of the highest character bounding box, excluding + // punctuation). + meanline.take(bb.pmin().row() - ref_line); - // Baseline (compute an absolute value, from the top left - // corner of the image). - absolute_baseline.take(bb.pmax().row() - ref_line); + // Baseline (compute an absolute value, from the top left corner + // of the highest character bounding box, excluding + // punctuation). + baseline.take(bb.pmax().row() - ref_line); } // Finalization @@ -899,8 +901,8 @@ namespace scribo char_width_ = char_width.to_result(); mln::def::coord - absolute_baseline_r = absolute_baseline.to_result() + ref_line, - absolute_meanline_r = absolute_meanline.to_result() + ref_line; + absolute_baseline_r = baseline.to_result() + ref_line, + absolute_meanline_r = meanline.to_result() + ref_line; baseline_ = absolute_baseline_r; meanline_ = absolute_meanline_r; diff --git a/scribo/scribo/debug/usage.hh b/scribo/scribo/debug/usage.hh index 7a284e3..28ab145 100644 --- a/scribo/scribo/debug/usage.hh +++ b/scribo/scribo/debug/usage.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,7 +68,7 @@ namespace scribo << std::endl; std::cout << "-----------" << std::endl; - std::cout << "EPITA/LRDE - Scribo 2008-2010" << std::endl; + std::cout << "EPITA/LRDE - Scribo 2008-2011" << std::endl; return 1; } diff --git a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh index fdbee90..16e981d 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -132,7 +133,10 @@ namespace scribo text_in_doc_functor::operator()(const Image& input) { // Remove separators - mln_ch_value(I,bool) separators, input_cleaned; + mln_ch_value(I,bool) + separators, + input_cleaned = exact(input); + if (enable_line_seps) { on_new_progress_label("Find vertical separators..."); diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/tests/toolchain/nepomuk/text_extraction.cc index c475aa9..30051ae 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/tests/toolchain/nepomuk/text_extraction.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -43,6 +44,11 @@ int main() QSet<QString> words = scribo::toolchain::nepomuk::text_extraction(ima); mln_assertion(words.size() == 1); + +#ifndef HAVE_TESSERACT_3 mln_assertion(words.contains("Wildly")); +#else // HAVE_TESSERACT_2 + mln_assertion(words.contains("wildly")); +#endif // ! HAVE_TESSERACT_3 return 0; } -- 1.5.6.5

14 years

last-svn-commit-735-g89e985d Fix a serious bug with gcc 4.5 and later.

by Guillaume Lazzara

* mln/value/equiv.hh: Return values by copy. --- milena/ChangeLog | 8 +++++++- milena/mln/value/equiv.hh | 15 ++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0fb0b2b..76cf550 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2011-01-20 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a serious bug with gcc 4.5 and later. + + * mln/value/equiv.hh: Return values by copy. + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> Work around g++ 4.5 deficiencies to compile Milena. @@ -24,7 +30,7 @@ * mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_n_faces_piter.hh: - Here. + Here. 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/value/equiv.hh b/milena/mln/value/equiv.hh index 06919bd..23512ab 100644 --- a/milena/mln/value/equiv.hh +++ b/milena/mln/value/equiv.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,10 @@ /*! \file * * \brief The mln::equiv routine. + * + * Since g++ 4.5.x the returned value is returned by copy. If returned + * by reference the result was incorrect and the value lifetime was + * not extended correctly to other functions. */ # include <mln/core/concept/value.hh> @@ -78,13 +83,13 @@ namespace mln // Fwd decl. template <typename V> - const typename internal::equiv_<V>::ret& + typename internal::equiv_<V>::ret run_equiv_(const V& v); template <typename V, typename T> inline - const typename internal::equiv_<V>::ret& + typename internal::equiv_<V>::ret run_equiv_(const Value<V>* v, const T*) { return run_equiv_(exact(v)->to_equiv()); // Rec. @@ -92,7 +97,7 @@ namespace mln template <typename V> inline - const V& + V run_equiv_(const void*, const V* v) { return *v; // Stop rec. @@ -100,7 +105,7 @@ namespace mln template <typename V> inline - const typename internal::equiv_<V>::ret& + typename internal::equiv_<V>::ret run_equiv_(const V& v) { return run_equiv_(&v, &v); -- 1.5.6.5

14 years

[Olena] #242: Operator+(object, builtin) does not work as expected since g++ 4.5

by Olena Trac

#242: Operator+(object, builtin) does not work as expected since g++ 4.5 ----------------------+----------------------------------------------------- Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: critical | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Compiling this example with g++ 4.5 or later with optimization flags makes this program print '0' instead of '1'. {{{ #include <mln/value/int_u16.hh> int main() { mln::value::int_u16 v = 0; std::cout << v + 1 << std::endl; } }}} It seems that g++ is producing invalid optimized code. Without optimization, the printed result is valid. -- Ticket URL: <https://trac.lrde.org/olena/ticket/242> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

branch next-build-test updated: last-svn-commit-734-g213b9ca

by lazzara＠lrde.epita.fr

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-build-test has been updated via 213b9ca3cc09f7d79c5bdcc1d920a8ca1b954868 (commit) via 7d5ee4652f9971d532a090ea04b0b920648cd79a (commit) from 3e47b89684c5cb35acd14d8ac6204f90fb25cb21 (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 ----------------------------------------------------------------- 213b9ca demo/viewer/Makefile.am: Explicitly link to libtiff. 7d5ee46 configure.ac: Make Boost dependency optional. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 5 ++++- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/Makefile.am | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years

last-svn-commit-734-g213b9ca demo/viewer/Makefile.am: Explicitly link to libtiff.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4423f0b..7982a78 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/Makefile.am: Explicitly link to libtiff. + 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> Do not distribute files generated by Qt. diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 5033d9b..fa143c9 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -46,11 +46,13 @@ scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) \ -I$(top_srcdir)/scribo \ $(MAGICKXX_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ + $(TIFF_CPPFLAGS) \ -DNDEBUG -DMLN_WO_GLOBAL_VARS scribo_viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_viewer_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(MAGICKXX_LDFLAGS) \ - $(TESSERACT_LDFLAGS) + $(TESSERACT_LDFLAGS) \ + $(TIFF_LDFLAGS) scribo_viewer_LDADD = $(QT_LIBS) $(LDADD) BUILT_SOURCES = viewer.moc.cc \ -- 1.5.6.5

14 years

last-svn-commit-733-g7d5ee46 configure.ac: Make Boost dependency optional.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fe2371..686b84a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> Add generic symbolic links to the latest snapshot. diff --git a/configure.ac b/configure.ac index 639313f..d22f65f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -192,6 +192,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Boost. # # ------- # +# Check if Boost is available, if not just print a warning, otherwise +# look for boost:tuple. +BOOST_REQUIRE(1.3, [AC_DEFINE([HAVE_BOOST], [0])]) BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -- 1.5.6.5

14 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches