[Olena-patches] last-svn-commit-825-g59c675b 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. --- 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 &lt;z(a)lrde.epita.fr&gt; + 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 &lt;z(a)lrde.epita.fr&gt; + * 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