* src/debug/show_links_bottom_aligned.cc, * src/debug/show_links_top_aligned.cc, * src/misc/negate.cc, * src/misc/superpose.cc, * src/preprocessing/rotate_90.cc, * src/primitive/extract/lines_pattern.cc, * src/primitive/find/find_pattern_lines.cc, * src/table/extract.cc: Here. --- scribo/ChangeLog | 13 ++++++++++ scribo/src/debug/show_links_bottom_aligned.cc | 6 ++-- scribo/src/debug/show_links_top_aligned.cc | 12 +++++---- scribo/src/misc/negate.cc | 5 ++- scribo/src/misc/superpose.cc | 7 ++--- scribo/src/preprocessing/rotate_90.cc | 30 +++++++++++++++++++++- scribo/src/primitive/extract/lines_pattern.cc | 6 ++-- scribo/src/primitive/find/find_pattern_lines.cc | 9 ++++--- scribo/src/table/extract.cc | 7 ++--- 9 files changed, 68 insertions(+), 27 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a8bffd2..b186c47 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2010-08-09 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Catch up with the current interface of scribo::debug::usage. + + * src/debug/show_links_bottom_aligned.cc, + * src/debug/show_links_top_aligned.cc, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/preprocessing/rotate_90.cc, + * src/primitive/extract/lines_pattern.cc, + * src/primitive/find/find_pattern_lines.cc, + * src/table/extract.cc: Here. + +2010-08-09 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Replace the use of object_image with component_set. * core/erase_objects.hh, diff --git a/scribo/src/debug/show_links_bottom_aligned.cc b/scribo/src/debug/show_links_bottom_aligned.cc index 337032a..bf858dc 100644 --- a/scribo/src/debug/show_links_bottom_aligned.cc +++ b/scribo/src/debug/show_links_bottom_aligned.cc @@ -65,10 +65,10 @@ int main(int argc, char* argv[]) if (argc != 5) return scribo::debug::usage(argv, - "Show valid or invalid links according the horizontal alignment (based on bottom line).", + "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); 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..9efcb6d 100644 --- a/scribo/src/debug/show_links_top_aligned.cc +++ b/scribo/src/debug/show_links_top_aligned.cc @@ -1,4 +1,5 @@ -// 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. // @@ -48,7 +49,8 @@ const char *args_desc[][2] = { - { "input.pbm", "A binary image. True for objects and False for the background." }, + { "input.pbm", "A binary image. True for objects and False for the " + "background." }, { "max_dist", "Maximum distance lookup (common value 45)" }, { "max_alpha", "Max angle between two object tops. (common value : 5)" }, {0, 0} @@ -63,10 +65,10 @@ int main(int argc, char* argv[]) if (argc != 5) return scribo::debug::usage(argv, - "Show valid or invalid links according the horizontal alignment (based on top line).", + "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); 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..da6fad6 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.cc @@ -1,4 +1,5 @@ -// 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 +47,7 @@ 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); 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..6cb5e1d 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.cc @@ -1,4 +1,5 @@ -// 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 +50,7 @@ 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); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/preprocessing/rotate_90.cc b/scribo/src/preprocessing/rotate_90.cc index 3c4e84f..c5e9536 100644 --- a/scribo/src/preprocessing/rotate_90.cc +++ b/scribo/src/preprocessing/rotate_90.cc @@ -1,3 +1,28 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + #include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/io/magick/load.hh> @@ -13,7 +38,8 @@ const char *args_desc[][2] = { { "input.*", "An image." }, { "output.ppm", "A rotated image." }, - { "positive", "if set to 1, performs a +90 rotation; -90 otherwise. (default: 0)" }, + { "positive", "if set to 1, performs a +90 rotation; -90 otherwise. " + "(default: 0)" }, {0, 0} }; @@ -26,7 +52,7 @@ int main(int argc, char *argv[]) if (argc != 3 && argc != 4) return scribo::debug::usage(argv, "Fast +90/-90 rotation", - "input.* output.ppm", + "input.* output.ppm <positive>", args_desc); diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index d794c71..d2ad562 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -1,4 +1,5 @@ -// 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 +52,7 @@ 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); 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..540328b 100644 --- a/scribo/src/primitive/find/find_pattern_lines.cc +++ b/scribo/src/primitive/find/find_pattern_lines.cc @@ -1,4 +1,5 @@ -// 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. // @@ -52,10 +53,10 @@ int main(int argc, char *argv[]) if (argc != 4) return scribo::debug::usage(argv, - "Extract discontinued horizontal and vertical lines", + "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); trace::entering("main"); diff --git a/scribo/src/table/extract.cc b/scribo/src/table/extract.cc index c510753..c3a7271 100644 --- a/scribo/src/table/extract.cc +++ b/scribo/src/table/extract.cc @@ -1,4 +1,5 @@ -// 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. // @@ -55,9 +56,7 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Extract tables from a binary image.", "input.pbm output.dump output.ppm", - args_desc, - "A color images. 'White' color means \ -the background, other colors indicates cells."); + args_desc); trace::entering("main"); -- 1.5.6.5