Commit b05f4e5c authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

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.
parent d4370554
2013-01-28 Guillaume Lazzara <z@lrde.epita.fr>
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 <z@lrde.epita.fr> 2013-01-24 Guillaume Lazzara <z@lrde.epita.fr>
Fix binarization programs. Fix binarization programs.
......
// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory // Copyright (C) 2011, 2012, 2013 EPITA Research and Development
// (LRDE) // Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
#include <mln/core/image/image2d.hh> #include <mln/core/image/image2d.hh>
#include <mln/value/int_u8.hh> #include <mln/value/int_u8.hh>
#include <mln/io/magick/load.hh> #include <mln/io/magick/all.hh>
#include <mln/io/pbm/save.hh>
#include <mln/data/transform.hh> #include <mln/data/transform.hh>
#include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/fun/v2v/rgb_to_luma.hh>
#include <mln/arith/revert.hh> #include <mln/arith/revert.hh>
...@@ -103,7 +102,7 @@ int main(int argc, char *argv[]) ...@@ -103,7 +102,7 @@ int main(int argc, char *argv[])
arith::revert_inplace(input_1_gl); arith::revert_inplace(input_1_gl);
image2d<bool> out = scribo::binarization::niblack(input_1_gl, w, k); image2d<bool> out = scribo::binarization::niblack(input_1_gl, w, k);
logical::not_inplace(out); logical::not_inplace(out);
io::pbm::save(out, options.arg("output.pbm")); io::magick::save(out, options.arg("output.pbm"));
trace::exiting("main"); trace::exiting("main");
} }
// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory // Copyright (C) 2011, 2012, 2013 EPITA Research and Development
// (LRDE) // Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
#include <mln/core/image/image2d.hh> #include <mln/core/image/image2d.hh>
#include <mln/value/int_u8.hh> #include <mln/value/int_u8.hh>
#include <mln/io/magick/load.hh> #include <mln/io/magick/all.hh>
#include <mln/io/pbm/save.hh>
#include <mln/data/transform.hh> #include <mln/data/transform.hh>
#include <mln/arith/revert.hh> #include <mln/arith/revert.hh>
#include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/fun/v2v/rgb_to_luma.hh>
...@@ -103,7 +102,7 @@ int main(int argc, char *argv[]) ...@@ -103,7 +102,7 @@ int main(int argc, char *argv[])
if (options.is_enabled("negate-output")) if (options.is_enabled("negate-output"))
logical::not_inplace(out); logical::not_inplace(out);
io::pbm::save(out, options.arg("output.pbm")); io::magick::save(out, options.arg("output.pbm"));
trace::exiting("main"); trace::exiting("main");
} }
// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and
// Laboratory (LRDE) // Development Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <mln/core/image/image2d.hh> #include <mln/core/image/image2d.hh>
#include <mln/value/int_u8.hh> #include <mln/value/int_u8.hh>
#include <mln/io/magick/all.hh> #include <mln/io/magick/all.hh>
#include <mln/io/pbm/save.hh>
#include <mln/data/transform.hh> #include <mln/data/transform.hh>
#include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/fun/v2v/rgb_to_luma.hh>
......
// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and
// Laboratory (LRDE) // Development Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <mln/core/image/image2d.hh> #include <mln/core/image/image2d.hh>
#include <mln/value/int_u8.hh> #include <mln/value/int_u8.hh>
#include <mln/io/magick/all.hh> #include <mln/io/magick/all.hh>
#include <mln/io/pbm/save.hh>
#include <mln/data/transform.hh> #include <mln/data/transform.hh>
#include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/fun/v2v/rgb_to_luma.hh>
#include <mln/util/timer.hh> #include <mln/util/timer.hh>
......
// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and
// Laboratory (LRDE) // Development Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
#include <mln/core/image/image2d.hh> #include <mln/core/image/image2d.hh>
#include <mln/value/int_u8.hh> #include <mln/value/int_u8.hh>
#include <mln/io/magick/load.hh> #include <mln/io/magick/all.hh>
#include <mln/io/pbm/save.hh>
#include <mln/data/transform.hh> #include <mln/data/transform.hh>
#include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/fun/v2v/rgb_to_luma.hh>
...@@ -100,7 +99,7 @@ int main(int argc, char *argv[]) ...@@ -100,7 +99,7 @@ int main(int argc, char *argv[])
image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); 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"); trace::exiting("main");
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment