* scribo/debug/option_check.hh, * scribo/debug/option_parser.hh: Add missing includes. * scribo/estim/components_features.hh: Add preconditions. --- scribo/ChangeLog | 9 +++++++++ scribo/scribo/debug/option_check.hh | 3 +++ scribo/scribo/debug/option_parser.hh | 1 + scribo/scribo/estim/components_features.hh | 8 +++++++- 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 37b4d0d..3472f2c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-09-06 Guillaume Lazzara <z@lrde.epita.fr> + + Small fixes in Scribo. + + * scribo/debug/option_check.hh, + * scribo/debug/option_parser.hh: Add missing includes. + + * scribo/estim/components_features.hh: Add preconditions. + 2011-09-02 Guillaume Lazzara <z@lrde.epita.fr> Fix Makefiles in Scribo. diff --git a/scribo/scribo/debug/option_check.hh b/scribo/scribo/debug/option_check.hh index a466b4b..4a0acd1 100644 --- a/scribo/scribo/debug/option_check.hh +++ b/scribo/scribo/debug/option_check.hh @@ -26,7 +26,10 @@ #ifndef SCRIBO_DEBUG_OPTION_CHECK_HH # define SCRIBO_DEBUG_OPTION_CHECK_HH +# include <string.h> +# include <cstdlib> # include <vector> +# include <iostream> # include <mln/core/contract.hh> namespace scribo diff --git a/scribo/scribo/debug/option_parser.hh b/scribo/scribo/debug/option_parser.hh index 4299723..9795a78 100644 --- a/scribo/scribo/debug/option_parser.hh +++ b/scribo/scribo/debug/option_parser.hh @@ -26,6 +26,7 @@ #ifndef SCRIBO_DEBUG_OPTION_PARSER_HH # define SCRIBO_DEBUG_OPTION_PARSER_HH +# include <map> # include <scribo/debug/option_check.hh> namespace scribo diff --git a/scribo/scribo/estim/components_features.hh b/scribo/scribo/estim/components_features.hh index b85dd00..4db21e2 100644 --- a/scribo/scribo/estim/components_features.hh +++ b/scribo/scribo/estim/components_features.hh @@ -77,11 +77,17 @@ namespace scribo template <typename I, typename J, typename L> component_set<L> - components_features(const Image<I>& input, const Image<J>& bin_input, + components_features(const Image<I>& input_, const Image<J>& bin_input_, const component_set<L>& components) { trace::entering("scribo::estim::components_features"); + const I& input = exact(input_); + const J& bin_input = exact(bin_input_); + + mln_precondition(input.is_valid()); + mln_precondition(bin_input.is_valid()); + component_set<L> output = components.duplicate(); component_features_data features; -- 1.7.2.5