* scribo/src/debug/show_links_bottom_aligned.cc, * scribo/src/debug/show_links_top_aligned.cc, * scribo/src/misc/negate.cc, * scribo/src/misc/superpose.cc, * scribo/src/preprocessing/split_bg_fg.cc, * scribo/src/primitive/extract/lines_pattern.cc, * scribo/src/primitive/find/find_pattern_lines.cc: Here. --- scribo/ChangeLog | 13 +++++++++++++ scribo/src/debug/show_links_bottom_aligned.cc | 13 ++++++++++--- scribo/src/debug/show_links_top_aligned.cc | 13 ++++++++++--- scribo/src/misc/negate.cc | 12 ++++++++++-- scribo/src/misc/superpose.cc | 15 +++++++++++---- scribo/src/preprocessing/split_bg_fg.cc | 12 ++++++++++-- scribo/src/primitive/extract/lines_pattern.cc | 13 ++++++++++--- scribo/src/primitive/find/find_pattern_lines.cc | 13 ++++++++++--- 8 files changed, 84 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 066501b..7edc90f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2010-07-21 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Catch up with the current interface of scribo::debug::usage. + + * scribo/src/debug/show_links_bottom_aligned.cc, + * scribo/src/debug/show_links_top_aligned.cc, + * scribo/src/misc/negate.cc, + * scribo/src/misc/superpose.cc, + * scribo/src/preprocessing/split_bg_fg.cc, + * scribo/src/primitive/extract/lines_pattern.cc, + * scribo/src/primitive/find/find_pattern_lines.cc: + Here. + +2010-07-21 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Disable programs still using object_image instead of component_set. * scribo/src/Makefile.am, diff --git a/scribo/src/debug/show_links_bottom_aligned.cc b/scribo/src/debug/show_links_bottom_aligned.cc index 337032a..4054d66 100644 --- a/scribo/src/debug/show_links_bottom_aligned.cc +++ b/scribo/src/debug/show_links_bottom_aligned.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -67,8 +67,15 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Show valid or invalid links according the horizontal alignment (based on bottom line).", "input.pbm max_dist max_alpha output.ppm", - args_desc, - "A color image. Valid links are drawn in green, invalid ones in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Valid links are drawn in green, invalid ones in red." +#endif +); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_links_top_aligned.cc b/scribo/src/debug/show_links_top_aligned.cc index ff01221..6f1d28a 100644 --- a/scribo/src/debug/show_links_top_aligned.cc +++ b/scribo/src/debug/show_links_top_aligned.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -65,8 +65,15 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Show valid or invalid links according the horizontal alignment (based on top line).", "input.pbm max_dist max_alpha output.ppm", - args_desc, - "A color image. Valid links are drawn in green, invalid ones in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Valid links are drawn in green, invalid ones in red." +#endif +); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/misc/negate.cc b/scribo/src/misc/negate.cc index 9c35f1c..a807d95 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -46,7 +46,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Negate a binary image", "input.pbm output.pbm", - args_desc, "A binary image."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A binary image." +#endif + ); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/misc/superpose.cc b/scribo/src/misc/superpose.cc index 8449987..0307fa2 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -49,9 +49,16 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Superpose two binary images", "input.pbm data.pbm output.ppm", - args_desc, - "A color image. Data from 'data.pbm' is \ -colored in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Data from 'data.pbm' is " + "colored in red." +#endif + ); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index de7bd02..aa75758 100644 --- a/scribo/src/preprocessing/split_bg_fg.cc +++ b/scribo/src/preprocessing/split_bg_fg.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -51,7 +51,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Split background and foreground.", "input.pbm lambda delta fg.ppm bg.ppm", - args_desc, "The foreground image."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "The foreground image." +#endif + ); typedef image2d<value::rgb8> I; I input; diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index d794c71..1eabacb 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -51,8 +51,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Extract horizontal lines patterns", "input.pbm length delta output.pbm", - args_desc, - "A binary image of lines."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A binary image of lines." +#endif + ); trace::entering("main"); diff --git a/scribo/src/primitive/find/find_pattern_lines.cc b/scribo/src/primitive/find/find_pattern_lines.cc index 3d8a98f..152d16a 100644 --- a/scribo/src/primitive/find/find_pattern_lines.cc +++ b/scribo/src/primitive/find/find_pattern_lines.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -54,8 +54,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Extract discontinued horizontal and vertical lines", "input.pbm length output.ppm", - args_desc, - "A color image. Horizontal lines are in red and vertical lines in green."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Horizontal lines are in red and vertical lines in green." +#endif + ); trace::entering("main"); -- 1.5.6.5