[Olena-patches] olena-2.0-137-ge6e8cbb Use io::magick to save output.

* src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/wolf.cc: Here. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/binarization/niblack.cc | 9 ++++----- scribo/src/binarization/otsu.cc | 9 ++++----- scribo/src/binarization/sauvola.cc | 5 ++--- scribo/src/binarization/sauvola_ms.cc | 5 ++--- scribo/src/binarization/wolf.cc | 9 ++++----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d45b42..687f107 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2013-01-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Use io::magick to save output. + + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/wolf.cc: Here. + 2013-01-24 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Fix binarization programs. diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 7c14c45..047f5f6 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/arith/revert.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) arith::revert_inplace(input_1_gl); image2d<bool> out = scribo::binarization::niblack(input_1_gl, w, k); logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index dcdae1d..8fe4f04 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/arith/revert.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) if (options.is_enabled("negate-output")) logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index d03622d..4e059cf 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index f05186a..ebb2ba7 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,7 +29,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/util/timer.hh> diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index 4495f64..94456e8 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -100,7 +99,7 @@ int main(int argc, char *argv[]) image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } -- 1.7.2.5