[Olena-patches] olena-2.0-429-g62fccd1 Fix some preconditions.

* scribo/core/document.hh: Relax some preconditions. * scribo/primitive/extract/alignments.hh: New precondition. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/core/document.hh | 6 +++--- scribo/scribo/primitive/extract/alignments.hh | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f73238c..5cb86af 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2013-03-25 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix some preconditions. + + * scribo/core/document.hh: Relax some preconditions. + + * scribo/primitive/extract/alignments.hh: New precondition. + +2013-03-25 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/binarization/sauvola_ms.hh: Add overloads. 2013-03-25 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 7ca7a23..1250dcb 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -221,7 +221,7 @@ namespace scribo const char * document<L>::filename() const { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); return data_->filename_.c_str(); } @@ -239,7 +239,7 @@ namespace scribo void document<L>::open() { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); mln::io::magick::load(data_->image_, data_->filename_); } @@ -248,7 +248,7 @@ namespace scribo bool document<L>::is_open() const { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); return data_->image_.is_valid(); } diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 27e2ad6..7bd9b94 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -575,6 +575,7 @@ namespace scribo mln_precondition(doc.is_valid()); mln_precondition(doc.has_text()); const mln_ch_value(L,bool)& input = doc.binary_image(); + mln_assertion(input.is_valid()); unsigned min_card = 3; unsigned delta = 5; -- 1.7.2.5