* scribo/core/component_features_data.hh, * scribo/core/group_info.hh, * scribo/io/xml/internal/compute_text_colour.hh, * scribo/io/xml/internal/time_info.hh, * scribo/util/color_to_hex.hh, * scribo/util/component_precise_outline.hh: Add missing inline. * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh: Add a missing include. --- scribo/ChangeLog | 14 ++++++++++++++ scribo/scribo/core/component_features_data.hh | 1 + scribo/scribo/core/group_info.hh | 11 +++++++++++ .../scribo/io/xml/internal/compute_text_colour.hh | 1 + scribo/scribo/io/xml/internal/time_info.hh | 1 + .../internal/text_in_doc_preprocess_functor.hh | 2 ++ scribo/scribo/util/color_to_hex.hh | 1 + scribo/scribo/util/component_precise_outline.hh | 5 +++++ 8 files changed, 36 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d1678c5..248e856 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2011-06-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation issues. + + * scribo/core/component_features_data.hh, + * scribo/core/group_info.hh, + * scribo/io/xml/internal/compute_text_colour.hh, + * scribo/io/xml/internal/time_info.hh, + * scribo/util/color_to_hex.hh, + * scribo/util/component_precise_outline.hh: Add missing inline. + + * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh: Add + a missing include. + 2011-06-20 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Make different algorithms for doc and hdoc use cases. diff --git a/scribo/scribo/core/component_features_data.hh b/scribo/scribo/core/component_features_data.hh index b0a4e47..6064a0f 100644 --- a/scribo/scribo/core/component_features_data.hh +++ b/scribo/scribo/core/component_features_data.hh @@ -75,6 +75,7 @@ namespace scribo } + inline bool operator==(const component_features_data& lhs, const component_features_data& rhs) diff --git a/scribo/scribo/core/group_info.hh b/scribo/scribo/core/group_info.hh index 19a8ecc..05d5aae 100644 --- a/scribo/scribo/core/group_info.hh +++ b/scribo/scribo/core/group_info.hh @@ -80,11 +80,13 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline group_info::group_info() : valid_(false) { } + inline group_info::group_info(unsigned id, const mln::util::array<component_id_t>& comps, unsigned pixel_area, const box2d& bbox) : id_(id), comps_(comps), valid_(true), @@ -92,53 +94,62 @@ namespace scribo { } + inline group_info::group_info(unsigned id, unsigned pixel_area, const box2d& bbox, bool valid) : id_(id), valid_(valid), pixel_area_(pixel_area), bbox_(bbox) { } + inline const mln::util::array<component_id_t>& group_info::component_ids() const { return comps_; } + inline mln::util::array<component_id_t>& group_info::component_ids_() { return comps_; } + inline bool group_info::is_valid() const { return valid_; } + inline void group_info::invalidate() { valid_ = false; } + inline unsigned group_info::card() const { return comps_.nelements(); } + inline unsigned group_info::id() const { return id_; } + inline unsigned group_info::pixel_area() const { return pixel_area_; } + inline const box2d& group_info::bbox() const { diff --git a/scribo/scribo/io/xml/internal/compute_text_colour.hh b/scribo/scribo/io/xml/internal/compute_text_colour.hh index 86fe454..f592c08 100644 --- a/scribo/scribo/io/xml/internal/compute_text_colour.hh +++ b/scribo/scribo/io/xml/internal/compute_text_colour.hh @@ -62,6 +62,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline const char * compute_text_colour(const value::rgb8& v) { diff --git a/scribo/scribo/io/xml/internal/time_info.hh b/scribo/scribo/io/xml/internal/time_info.hh index 6adc49a..760e856 100644 --- a/scribo/scribo/io/xml/internal/time_info.hh +++ b/scribo/scribo/io/xml/internal/time_info.hh @@ -48,6 +48,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline std::string time_info() { time_t cur_time = time(NULL); diff --git a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh index 484e28e..d58b4b2 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh @@ -33,6 +33,8 @@ #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/subsampling/antialiased.hh> +#include <mln/util/timer.hh> + #include <scribo/binarization/sauvola.hh> #include <scribo/binarization/sauvola_ms.hh> diff --git a/scribo/scribo/util/color_to_hex.hh b/scribo/scribo/util/color_to_hex.hh index e0ee33f..63dc81e 100644 --- a/scribo/scribo/util/color_to_hex.hh +++ b/scribo/scribo/util/color_to_hex.hh @@ -48,6 +48,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline std::string color_to_hex(const value::rgb8& v) { std::string result = "#"; diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index 175160c..5c87fb4 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -122,6 +122,7 @@ namespace scribo } } + inline void left_up_after(int& direction, const unsigned i) @@ -155,6 +156,7 @@ namespace scribo } } + inline void right_up_after(int& direction, const unsigned i) @@ -186,6 +188,7 @@ namespace scribo } } + inline void right_down_after(int& direction, const unsigned i) @@ -219,6 +222,7 @@ namespace scribo } } + inline void left_down_after(int& direction, const unsigned i) @@ -274,6 +278,7 @@ namespace scribo cur_pt = tmp; } + inline void filter_points(const mln::p_array<point2d>& points, mln::p_array<point2d>& waypoints) -- 1.5.6.5