- Olena-patches

branch stable/scribo created: last-svn-commit-762-ge5c41a6
by lazzara＠lrde.epita.fr 28 Mar '11

28 Mar '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 stable/scribo has been created at e5c41a61332676c03a8bf6771ddddddaa23a2654 (commit) - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-827-ge58bc06 demo/viewer/xml_widget.cc: Fix a warning.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/xml_widget.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 50ca1a6..e5f1ac0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/xml_widget.cc: Fix a warning. + +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Improve progress notification. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index 1f2bc83..57d171f 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -46,7 +46,7 @@ XmlWidget::XmlWidget() } void -XmlWidget::select(QString id, QString name) +XmlWidget::select(QString id, QString /*name*/) { QDomNode n = node_map_[item_map_[id]]; -- 1.5.6.5

1 0

last-svn-commit-827-g65ec591 demo/viewer/xml_widget.cc: Fix a warning.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/xml_widget.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 50ca1a6..e5f1ac0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/xml_widget.cc: Fix a warning. + +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Improve progress notification. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index 1f2bc83..57d171f 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -46,7 +46,7 @@ XmlWidget::XmlWidget() } void -XmlWidget::select(QString id, QString name) +XmlWidget::select(QString id, QString /*name*/) { QDomNode n = node_map_[item_map_[id]]; -- 1.5.6.5

1 0

last-svn-commit-828-g57a4952 demo/viewer/xml_widget.cc: Fix a warning.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/xml_widget.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 42c3314..048a289 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/xml_widget.cc: Fix a warning. + +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Improve progress notification. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index 1f2bc83..57d171f 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -46,7 +46,7 @@ XmlWidget::XmlWidget() } void -XmlWidget::select(QString id, QString name) +XmlWidget::select(QString id, QString /*name*/) { QDomNode n = node_map_[item_map_[id]]; -- 1.5.6.5

1 0

last-svn-commit-826-g41cec18 demo/viewer/runner.cc: Improve progress notification.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4ff4d27..50ca1a6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Improve progress notification. + 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation issues on MAC. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index e923db7..4f020ac 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -222,13 +222,19 @@ void runner::export_as() int rvalue = 0; if (f.suffix() == "pdf") + { + emit new_step("Exporting as PDF..."); rvalue = system(QString("%1/scribo-xml2doc --pdf %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else if (f.suffix() == "html" || f.suffix() == "htm") + { + emit new_step("Exporting as HTML..."); rvalue = system(QString("%1/scribo-xml2doc --html %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else QMessageBox::critical(0, "Fatal error", "Cannot export! Invalid output format!"); -- 1.5.6.5

1 0

last-svn-commit-826-gb1edf75 demo/viewer/runner.cc: Improve progress notification.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4ff4d27..50ca1a6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Improve progress notification. + 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation issues on MAC. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index e923db7..4f020ac 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -222,13 +222,19 @@ void runner::export_as() int rvalue = 0; if (f.suffix() == "pdf") + { + emit new_step("Exporting as PDF..."); rvalue = system(QString("%1/scribo-xml2doc --pdf %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else if (f.suffix() == "html" || f.suffix() == "htm") + { + emit new_step("Exporting as HTML..."); rvalue = system(QString("%1/scribo-xml2doc --html %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else QMessageBox::critical(0, "Fatal error", "Cannot export! Invalid output format!"); -- 1.5.6.5

1 0

last-svn-commit-827-g686c544 demo/viewer/runner.cc: Improve progress notification.
by Guillaume Lazzara 22 Mar '11

22 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ddb9868..42c3314 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Improve progress notification. + 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation issues on MAC. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index e923db7..4f020ac 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -222,13 +222,19 @@ void runner::export_as() int rvalue = 0; if (f.suffix() == "pdf") + { + emit new_step("Exporting as PDF..."); rvalue = system(QString("%1/scribo-xml2doc --pdf %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else if (f.suffix() == "html" || f.suffix() == "htm") + { + emit new_step("Exporting as HTML..."); rvalue = system(QString("%1/scribo-xml2doc --html %2 %3 %4") .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) .arg(args_.at(2)).toAscii().constData()); + } else QMessageBox::critical(0, "Fatal error", "Cannot export! Invalid output format!"); -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-825-g921edcc
by lazzara＠lrde.epita.fr 21 Mar '11

21 Mar '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-build-test has been updated via 921edcc8bda188c053965f067c4c425f35d6736a (commit) from 234857f163935061703e9a266f1d4819853784c2 (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 ----------------------------------------------------------------- 921edcc Fix compilation issues on MAC. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/line_info.hh | 3 ++- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/src/debug/show_groups_bboxes.cc | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-825-g921edcc Fix compilation issues on MAC.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

* scribo/core/line_info.hh: Explicitly call parent constructor. * scribo/primitive/extract/non_text.hh: Fix ambiguities on std::pow overloads. * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/line_info.hh | 3 ++- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/src/debug/show_groups_bboxes.cc | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a6c7806..4ff4d27 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation issues on MAC. + + * scribo/core/line_info.hh: Explicitly call parent constructor. + * scribo/primitive/extract/non_text.hh: Fix ambiguities on + std::pow overloads. + + * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 4def6fe..866e3f4 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -132,6 +132,7 @@ namespace scribo template <typename L> class line_info : public Serializable<line_info<L> > { + typedef Serializable<line_info<L> > parent_t; typedef internal::line_info_data<L> data_t; typedef mln::util::object_id<scribo::ComponentId, unsigned> component_id_t; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; @@ -352,7 +353,7 @@ namespace scribo template <typename L> line_info<L>::line_info() - : id_(0) + : parent_t(), id_(0) { } diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index a456270..cbc6ea2 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -116,8 +116,8 @@ namespace scribo } - const unsigned q_div = std::pow(2, 8 - nbits); - const unsigned q = unsigned(std::pow(2, nbits)); + const unsigned q_div = std::pow(2.f, (int)(8 - nbits)); + const unsigned q = unsigned(std::pow(2.f, (int)nbits)); const unsigned nelements = input.nelements(); diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index 58c45d0..b323976 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) if (argc != 3) { - std::cerr << "Usage : " << argv[0] << " input.* out.pbm" << std::endl; + std::cerr << "Usage : " << argv[0] << " input.pbm out.pbm" << std::endl; return 1; } @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), - link::internal::dmax_default(1), + primitive::link::internal::dmax_default(1), anchor::MassCenter); object_links<L> -- 1.5.6.5

1 0

last-svn-commit-825-g59c675b Fix compilation issues on MAC.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

* scribo/core/line_info.hh: Explicitly call parent constructor. * scribo/primitive/extract/non_text.hh: Fix ambiguities on std::pow overloads. * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/line_info.hh | 3 ++- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/src/debug/show_groups_bboxes.cc | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a6c7806..4ff4d27 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation issues on MAC. + + * scribo/core/line_info.hh: Explicitly call parent constructor. + * scribo/primitive/extract/non_text.hh: Fix ambiguities on + std::pow overloads. + + * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 4def6fe..866e3f4 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -132,6 +132,7 @@ namespace scribo template <typename L> class line_info : public Serializable<line_info<L> > { + typedef Serializable<line_info<L> > parent_t; typedef internal::line_info_data<L> data_t; typedef mln::util::object_id<scribo::ComponentId, unsigned> component_id_t; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; @@ -352,7 +353,7 @@ namespace scribo template <typename L> line_info<L>::line_info() - : id_(0) + : parent_t(), id_(0) { } diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index a456270..cbc6ea2 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -116,8 +116,8 @@ namespace scribo } - const unsigned q_div = std::pow(2, 8 - nbits); - const unsigned q = unsigned(std::pow(2, nbits)); + const unsigned q_div = std::pow(2.f, (int)(8 - nbits)); + const unsigned q = unsigned(std::pow(2.f, (int)nbits)); const unsigned nelements = input.nelements(); diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index 58c45d0..b323976 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) if (argc != 3) { - std::cerr << "Usage : " << argv[0] << " input.* out.pbm" << std::endl; + std::cerr << "Usage : " << argv[0] << " input.pbm out.pbm" << std::endl; return 1; } @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), - link::internal::dmax_default(1), + primitive::link::internal::dmax_default(1), anchor::MassCenter); object_links<L> -- 1.5.6.5

1 0