Commit 40eaf23f authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Remove references to InitializeMagick().

	* scribo/demo/viewer/main.cc,
	* scribo/demo/xml2doc/main.cc,
	* scribo/core/document.hh,
	* scribo/debug/logger.hh,
	* src/binarization/global_threshold.cc,
	* src/binarization/kim.cc,
	* src/binarization/niblack.cc,
	* src/binarization/otsu.cc,
	* src/binarization/sauvola.cc,
	* src/binarization/sauvola_ms.cc,
	* src/binarization/sauvola_ms_debug.cc,
	* src/binarization/sauvola_ms_fg.cc,
	* src/binarization/sauvola_ms_split.cc,
	* src/binarization/singh.cc,
	* src/binarization/wolf.cc,
	* src/content_in_doc.cc,
	* src/content_in_hdoc.cc,
	* src/contest/DAE-2011/content_in_doc_dae.cc,
	* src/contest/DAE-2011/content_in_hdoc_dae.cc,
	* src/contest/hdlac-2011/content_in_hdoc_hdlac.cc,
	* src/debug/show_components_boldness.cc,
	* src/debug/show_components_color.cc,
	* src/non_text_components.cc,
	* src/preprocessing/rotate.cc,
	* src/preprocessing/rotate_90.cc,
	* src/preprocessing/split_bg_fg.cc,
	* src/text_in_doc_preprocess.cc,
	* src/text_in_picture.cc,
	* src/text_in_picture_dual.cc,
	* src/text_recognition_in_picture.cc: Here.
parent 65886835
2013-03-15 Guillaume Lazzara <z@lrde.epita.fr>
Remove references to InitializeMagick().
* demo/viewer/main.cc,
* demo/xml2doc/main.cc,
* core/document.hh,
* debug/logger.hh,
* src/binarization/global_threshold.cc,
* src/binarization/kim.cc,
* src/binarization/niblack.cc,
* src/binarization/otsu.cc,
* src/binarization/sauvola.cc,
* src/binarization/sauvola_ms.cc,
* src/binarization/sauvola_ms_debug.cc,
* src/binarization/sauvola_ms_fg.cc,
* src/binarization/sauvola_ms_split.cc,
* src/binarization/singh.cc,
* src/binarization/wolf.cc,
* src/content_in_doc.cc,
* src/content_in_hdoc.cc,
* src/contest/DAE-2011/content_in_doc_dae.cc,
* src/contest/DAE-2011/content_in_hdoc_dae.cc,
* src/contest/hdlac-2011/content_in_hdoc_hdlac.cc,
* src/debug/show_components_boldness.cc,
* src/debug/show_components_color.cc,
* src/non_text_components.cc,
* src/preprocessing/rotate.cc,
* src/preprocessing/rotate_90.cc,
* src/preprocessing/split_bg_fg.cc,
* src/text_in_doc_preprocess.cc,
* src/text_in_picture.cc,
* src/text_in_picture_dual.cc,
* src/text_recognition_in_picture.cc: Here.
2013-03-08 Guillaume Lazzara <z@lrde.epita.fr>
Fix namespace ambiguities.
......
......@@ -39,8 +39,6 @@ int main(int argc, char** argv)
return 0;
}
Magick::InitializeMagick(*argv);
Viewer* viewer = Viewer::Instance(argc, argv);
if (!viewer)
......
// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -89,8 +90,6 @@ int svg_base64(const QString& xml, const QString& svg)
int main(int argc, char **argv)
{
Magick::InitializeMagick(argv[0]);
QString man = \
"xml_transform\n"
"OPTIONS:\n\n"
......
// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory
// (LRDE)
// Copyright (C) 2010, 2011, 2013 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -237,7 +237,6 @@ namespace scribo
void
document<L>::open()
{
Magick::InitializeMagick(0);
mln::io::magick::load(data_->image_, data_->filename_);
}
......
......@@ -254,7 +254,6 @@ namespace scribo
verbose_prefix_("LOG: "),
stream_(std::cerr)
{
// Magick::InitializeMagick(0);
}
......
// 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.
//
......@@ -81,8 +81,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
unsigned threshold = atoi(options.arg("threshold_value"));
......
// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -82,8 +83,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
......
......@@ -83,8 +83,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
unsigned w = atoi(options.opt_value("win-size").c_str());
......
......@@ -83,8 +83,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
bool verbose = options.is_set("verbose");
......
......@@ -81,8 +81,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
unsigned w = atoi(options.opt_value("win-size").c_str());
......
......@@ -99,8 +99,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
......
// 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.
//
......@@ -127,8 +127,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
......
// 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.
//
......@@ -126,8 +126,6 @@ int main(int argc, char *argv[])
<< " - k4=" << binarization::internal::k4
<< std::endl;
Magick::InitializeMagick(0);
// Load
image2d<value::rgb8> input_1;
io::magick::load(input_1, options.arg("input.*"));
......
// Copyright (C) 2009, 2010, 2012 EPITA Research and Development
// Copyright (C) 2009, 2010, 2012, 2013 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
......@@ -121,8 +121,6 @@ int main(int argc, char *argv[])
<< " - k4=" << binarization::internal::k4
<< std::endl;
Magick::InitializeMagick(0);
image2d<value::rgb8> input_1;
io::magick::load(input_1, options.arg("input.*"));
......
// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -81,8 +82,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
unsigned w = atoi(options.opt_value("win-size").c_str());
......
......@@ -81,8 +81,6 @@ int main(int argc, char *argv[])
scribo::debug::logger().set_level(scribo::debug::All);
}
Magick::InitializeMagick(*argv);
trace::entering("main");
unsigned w = atoi(options.opt_value("win-size").c_str());
......
......@@ -120,8 +120,6 @@ int main(int argc, char* argv[])
trace::entering("main");
Magick::InitializeMagick(*argv);
typedef image2d<scribo::def::lbl_type> L;
image2d<value::rgb8> input;
mln::io::magick::load(input, options.arg("input.*"));
......
......@@ -96,8 +96,6 @@ int main(int argc, char* argv[])
trace::entering("main");
Magick::InitializeMagick(*argv);
mln::util::timer t;
t.start();
......
// 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.
//
......@@ -72,8 +72,6 @@ int main(int argc, char* argv[])
trace::entering("main");
Magick::InitializeMagick(*argv);
typedef image2d<scribo::def::lbl_type> L;
image2d<value::rgb8> input;
mln::io::magick::load(input, argv[1]);
......
// 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.
//
......@@ -79,8 +79,6 @@ int main(int argc, char* argv[])
trace::entering("main");
Magick::InitializeMagick(*argv);
mln::util::timer t;
t.start();
......
Markdown is supported
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