* scribo/binarization/global_threshold.hh: Here.
* scribo/binarization/sauvola_ms_split.hh,
* scribo/text/clean.hh,
* scribo/text/clean_inplace.hh: Remove useless include.
---
scribo/ChangeLog | 10 ++++++++++
scribo/scribo/binarization/global_threshold.hh | 4 ++--
scribo/scribo/binarization/sauvola_ms_split.hh | 5 ++---
scribo/scribo/text/clean.hh | 7 ++-----
scribo/scribo/text/clean_inplace.hh | 6 ++----
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index ccabd9d..42f6910 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-22 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Update use of the threshold function.
+
+ * scribo/binarization/global_threshold.hh: Here.
+
+ * scribo/binarization/sauvola_ms_split.hh,
+ * scribo/text/clean.hh,
+ * scribo/text/clean_inplace.hh: Remove useless include.
+
2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr>
* README: update requirements information.
diff --git a/scribo/scribo/binarization/global_threshold.hh
b/scribo/scribo/binarization/global_threshold.hh
index b90d6df..aefbe00 100644
--- a/scribo/scribo/binarization/global_threshold.hh
+++ b/scribo/scribo/binarization/global_threshold.hh
@@ -28,7 +28,7 @@
# include <mln/core/concept/image.hh>
# include <mln/value/concept/vectorial.hh>
-# include <mln/fun/v2b/threshold.hh>
+# include <mln/fun/v2b/threshold_le.hh>
# include <mln/data/transform.hh>
/// \file
@@ -77,7 +77,7 @@ namespace scribo
mln_precondition(exact(input).is_valid());
mlc_is_not_a(mln_value(I), value::Vectorial)::check();
- mln::fun::v2b::threshold<mln_value(I)> f(threshold);
+ mln::fun::v2b::threshold_le<mln_value(I)> f(threshold);
mln_ch_value(I, bool) output = data::transform(input, f);
trace::exiting("scribo::binarization::global_threshold");
diff --git a/scribo/scribo/binarization/sauvola_ms_split.hh
b/scribo/scribo/binarization/sauvola_ms_split.hh
index ac06a39..cbef524 100644
--- a/scribo/scribo/binarization/sauvola_ms_split.hh
+++ b/scribo/scribo/binarization/sauvola_ms_split.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of Olena.
//
@@ -30,8 +31,6 @@
# include <mln/border/resize.hh>
-# include <mln/fun/v2b/threshold.hh>
-
# include <mln/data/transform.hh>
# include <mln/data/split.hh>
diff --git a/scribo/scribo/text/clean.hh b/scribo/scribo/text/clean.hh
index 208fe8e..7911852 100644
--- a/scribo/scribo/text/clean.hh
+++ b/scribo/scribo/text/clean.hh
@@ -1,5 +1,5 @@
-// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
-// (LRDE)
+// Copyright (C) 2009, 2010, 2011 EPITA Research and Development
+// Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -59,9 +59,6 @@
#include <mln/linear/gaussian.hh>
#include <mln/value/int_u8.hh>
-
-#include <mln/fun/v2b/threshold.hh>
-#include <mln/binarization/threshold.hh>
#include <mln/data/convert.hh>
#include <mln/value/rgb8.hh>
#include <mln/io/pgm/all.hh>
diff --git a/scribo/scribo/text/clean_inplace.hh b/scribo/scribo/text/clean_inplace.hh
index fe96ff7..d217aa5 100644
--- a/scribo/scribo/text/clean_inplace.hh
+++ b/scribo/scribo/text/clean_inplace.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of Olena.
//
@@ -58,9 +59,6 @@
#include <mln/linear/gaussian.hh>
#include <mln/value/int_u8.hh>
-
-#include <mln/fun/v2b/threshold.hh>
-#include <mln/binarization/threshold.hh>
#include <mln/data/convert.hh>
#include <mln/value/rgb8.hh>
#include <mln/io/pgm/all.hh>
--
1.7.2.5
Show replies by date