- Olena-patches

4485: debug/decision_image.hh: Fix an invalid precondition.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- scribo/ChangeLog | 4 ++++ scribo/debug/decision_image.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8bdadd9..7f504e6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * debug/decision_image.hh: Fix an invalid precondition. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve and add new examples in Scribo. * src/Makefile.am, diff --git a/scribo/debug/decision_image.hh b/scribo/debug/decision_image.hh index 1652f8e..447d3b0 100644 --- a/scribo/debug/decision_image.hh +++ b/scribo/debug/decision_image.hh @@ -136,7 +136,7 @@ namespace scribo mln_precondition(links.is_valid()); mln_precondition(filtered_links.is_valid()); mln_precondition(links.size() == filtered_links.size()); - mln_precondition(links.objects_id() != filtered_links.objects_id()); + mln_precondition(links.object_image_() != filtered_links.object_image_()); /// Fixme: check that objects has been computed from input. image2d<value::rgb8> -- 1.5.6.5

1 0

4484: Improve and add new examples in Scribo.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* src/Makefile.am, * src/extract/primitive/Makefile.am, * src/text/Makefile.am: Add new targets. * src/extract/primitive/find_thick_and_single_lines.cc, * src/text/cleantxt.cc, * src/text_in_photo_ppm.cc: New full examples. * src/extract/primitive/find_thick_lines.cc: Use the lines_*_thick routines. * src/text_in_doc.cc, * src/text_in_photo.cc: Improve outputs. --- scribo/ChangeLog | 18 ++ scribo/src/Makefile.am | 2 + scribo/src/extract/primitive/Makefile.am | 4 +- ...ick_lines.cc => find_thick_and_single_lines.cc} | 52 +--- scribo/src/extract/primitive/find_thick_lines.cc | 33 +-- scribo/src/text/Makefile.am | 28 ++ scribo/src/text/cleantxt.cc | 79 +++++ scribo/src/text_in_doc.cc | 104 ++++--- scribo/src/text_in_photo_ppm.cc | 318 ++++++++++++++++++++ 9 files changed, 536 insertions(+), 102 deletions(-) copy scribo/src/extract/primitive/{find_thick_lines.cc => find_thick_and_single_lines.cc} (70%) create mode 100644 scribo/src/text/cleantxt.cc create mode 100644 scribo/src/text_in_photo_ppm.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index af2f788..8bdadd9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,23 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve and add new examples in Scribo. + + * src/Makefile.am, + * src/extract/primitive/Makefile.am, + * src/text/Makefile.am: Add new targets. + + * src/extract/primitive/find_thick_and_single_lines.cc, + * src/text/cleantxt.cc, + * src/text_in_photo_ppm.cc: New full examples. + + * src/extract/primitive/find_thick_lines.cc: Use the lines_*_thick + routines. + + * src/text_in_doc.cc, + * src/text_in_photo.cc: Improve outputs. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Make text cleaning work. * text/clean.hh: Do not use the distance map anymore. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 3b6a435..de051a4 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -37,6 +37,7 @@ bin_PROGRAMS = \ table_rebuild_opening \ table_rebuild_rank \ text_in_photo \ + text_in_photo_ppm \ text_in_photo_invert \ thin_bboxes @@ -50,6 +51,7 @@ superpose_SOURCES = superpose.cc table_rebuild_opening_SOURCES = table_rebuild_opening.cc table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc +text_in_photo_ppm_SOURCES = text_in_photo_ppm.cc text_in_photo_invert_SOURCES = text_in_photo_invert.cc thin_bboxes_SOURCES = thin_bboxes.cc diff --git a/scribo/src/extract/primitive/Makefile.am b/scribo/src/extract/primitive/Makefile.am index 99be780..51850f6 100644 --- a/scribo/src/extract/primitive/Makefile.am +++ b/scribo/src/extract/primitive/Makefile.am @@ -28,7 +28,8 @@ bin_PROGRAMS = \ extract_thick_hlines \ find_discontinued_lines \ find_single_lines \ - find_thick_lines + find_thick_lines \ + find_thick_and_single_lines extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc @@ -38,5 +39,6 @@ extract_thick_hlines_SOURCES = extract_thick_hlines.cc find_discontinued_lines_SOURCES = find_discontinued_lines.cc find_single_lines_SOURCES = find_single_lines.cc find_thick_lines_SOURCES = find_thick_lines.cc +find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc diff --git a/scribo/src/extract/primitive/find_thick_lines.cc b/scribo/src/extract/primitive/find_thick_and_single_lines.cc similarity index 70% copy from scribo/src/extract/primitive/find_thick_lines.cc copy to scribo/src/extract/primitive/find_thick_and_single_lines.cc index 993bf42..fa66e29 100644 --- a/scribo/src/extract/primitive/find_thick_lines.cc +++ b/scribo/src/extract/primitive/find_thick_and_single_lines.cc @@ -35,13 +35,9 @@ #include <scribo/debug/usage.hh> #include <scribo/core/object_image.hh> -#include <scribo/primitive/extract/lines_h_thick.hh> -#include <scribo/primitive/extract/lines_v_thick.hh> -#include <scribo/primitive/extract/lines_h_single.hh> -#include <scribo/primitive/extract/lines_v_single.hh> - -#include <mln/util/timer.hh> +# include <scribo/primitive/extract/lines_v_thick_and_single.hh> +# include <scribo/primitive/extract/lines_h_thick_and_single.hh> const char *args_desc[][2] = { @@ -57,13 +53,14 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { using namespace mln; + using namespace scribo; if (argc != 7) return scribo::debug::usage(argv, "Extract thick horizontal and vertical lines.\ \n Common argument values: 150 10 150 10.", "<input.pbm> <vlength> <vratio> <hlength>\ - <hration> <output.ppm>", + <hratio> <output.ppm>", args_desc, "A color image. Horizontal lines are in red\ and vertical lines in green."); @@ -80,35 +77,20 @@ int main(int argc, char *argv[]) nhlines, nvlines; - util::timer t; - - t.start(); - object_image(L) - hlines = scribo::primitive::extract::lines_h_thick(input, c8(), - nhlines, atoi(argv[2])), - vlines = scribo::primitive::extract::lines_v_thick(input, c8(), - nvlines, atoi(argv[2])); - std::cout << "lines thick done" << std::endl; - std::cout << t << std::endl; - t.restart(); - - - hlines = scribo::primitive::extract::lines_h_single(hlines, - atoi(argv[2]), - 10); - - vlines = scribo::primitive::extract::lines_v_single(vlines, - atoi(argv[2]), - 10); - - std::cout << "lines single done" << std::endl; - std::cout << t << std::endl; - - image2d<value::rgb8> out = debug::superpose(input, hlines, literal::red); - out = debug::superpose(out, vlines, literal::green); - - io::ppm::save(out, argv[3]); + hlines = primitive::extract::lines_h_thick_and_single(input, c8(), + nhlines, + atoi(argv[2]), + atoi(argv[3])), + vlines = primitive::extract::lines_v_thick_and_single(input, c8(), + nvlines, + atoi(argv[4]), + atoi(argv[5])); + + image2d<value::rgb8> out = mln::debug::superpose(input, hlines, literal::red); + out = mln::debug::superpose(out, vlines, literal::green); + + io::ppm::save(out, argv[6]); trace::exiting("main"); } diff --git a/scribo/src/extract/primitive/find_thick_lines.cc b/scribo/src/extract/primitive/find_thick_lines.cc index 993bf42..045b34d 100644 --- a/scribo/src/extract/primitive/find_thick_lines.cc +++ b/scribo/src/extract/primitive/find_thick_lines.cc @@ -41,15 +41,12 @@ #include <scribo/primitive/extract/lines_h_single.hh> #include <scribo/primitive/extract/lines_v_single.hh> -#include <mln/util/timer.hh> const char *args_desc[][2] = { { "input.pbm", "A binary image. Objects are set to True." }, { "vlength ", "Minimum vertical line length." }, - { "vratio " "Minimum vertical ratio height/width." }, { "hlength ", "Minimum horizontal line length." }, - { "hratio " "Minimum horizontal ratio width/height." }, {0, 0} }; @@ -58,12 +55,11 @@ int main(int argc, char *argv[]) { using namespace mln; - if (argc != 7) + if (argc != 5) return scribo::debug::usage(argv, "Extract thick horizontal and vertical lines.\ -\n Common argument values: 150 10 150 10.", - "<input.pbm> <vlength> <vratio> <hlength>\ - <hration> <output.ppm>", +\n Common argument values: 150 150.", + "<input.pbm> <vlength> <hlength> <output.ppm>", args_desc, "A color image. Horizontal lines are in red\ and vertical lines in green."); @@ -80,35 +76,16 @@ int main(int argc, char *argv[]) nhlines, nvlines; - util::timer t; - - t.start(); - object_image(L) hlines = scribo::primitive::extract::lines_h_thick(input, c8(), nhlines, atoi(argv[2])), vlines = scribo::primitive::extract::lines_v_thick(input, c8(), - nvlines, atoi(argv[2])); - std::cout << "lines thick done" << std::endl; - std::cout << t << std::endl; - t.restart(); - - - hlines = scribo::primitive::extract::lines_h_single(hlines, - atoi(argv[2]), - 10); - - vlines = scribo::primitive::extract::lines_v_single(vlines, - atoi(argv[2]), - 10); - - std::cout << "lines single done" << std::endl; - std::cout << t << std::endl; + nvlines, atoi(argv[3])); image2d<value::rgb8> out = debug::superpose(input, hlines, literal::red); out = debug::superpose(out, vlines, literal::green); - io::ppm::save(out, argv[3]); + io::ppm::save(out, argv[4]); trace::exiting("main"); } diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index 5f5ed81..6b174ef 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -1 +1,29 @@ +# Copyright (C) 2009 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/>. +# + +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/scribo/scribo.mk + SUBDIRS = grouping + + +bin_PROGRAMS = \ + cleantxt + + +cleantxt_SOURCES = cleantxt.cc \ No newline at end of file diff --git a/scribo/src/text/cleantxt.cc b/scribo/src/text/cleantxt.cc new file mode 100644 index 0000000..f303448 --- /dev/null +++ b/scribo/src/text/cleantxt.cc @@ -0,0 +1,79 @@ +// Copyright (C) 2009 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 <iostream> + +#include <mln/core/image/image2d.hh> + +#include <mln/io/pbm/all.hh> + +#include <mln/logical/not.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/make/w_window2d_int.hh> + + +#include <scribo/text/clean.hh> +#include <scribo/debug/usage.hh> + + +const char *args_desc[][2] = +{ + { "input.pbm", "A binary image. 'True' for objects, 'False'\ +for the background." }, + { "out.pbm", "A cleaned up binary image." }, + {0, 0} +}; + + + +int main(int argc, char* argv[]) +{ + using namespace scribo; + using namespace mln; + + if (argc != 3) + return scribo::debug::usage(argv, + "Cleanup text areas.", + "input.pbm out.pbm", + args_desc, + ""); + + trace::entering("main"); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + int vals[] = { 0, 9, 0, 9, 0, + 9, 6, 4, 6, 9, + 0, 4, 0, 4, 0, + 9, 6, 4, 6, 9, + 0, 9, 0, 9, 0 }; + w_window2d_int dmap_win = mln::make::w_window2d_int(vals); + + io::pbm::save(scribo::text::clean(logical::not_(input), dmap_win), argv[2]); + + trace::exiting("main"); +} diff --git a/scribo/src/text_in_doc.cc b/scribo/src/text_in_doc.cc index 81219c4..cfca7d1 100644 --- a/scribo/src/text_in_doc.cc +++ b/scribo/src/text_in_doc.cc @@ -45,6 +45,8 @@ #include <mln/draw/box.hh> +#include <mln/extension/adjust.hh> + #include <scribo/table/erase.hh> #include <scribo/draw/bounding_boxes.hh> @@ -83,12 +85,12 @@ #include <scribo/make/debug_filename.hh> - const char *args_desc[][2] = { { "input.pbm", "A binary image. 'False' for objects, 'True'\ for the background." }, { "out.txt", "A text file with all the recognized text" }, + { "output_dir", "Output directory for debug image" }, {0, 0} }; @@ -98,14 +100,15 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - if (argc != 4) + if (argc != 3 && argc != 4) return scribo::debug::usage(argv, "Find text in a binarized photo.", - "input.pbm out.txt output_dir", + "input.pbm out.txt <output_dir>", args_desc, "Debug outputs. The recognized text is printed in the standard output."); - scribo::make::internal::debug_filename_prefix = argv[3]; + if (argc == 4) + scribo::make::internal::debug_filename_prefix = argv[3]; trace::entering("main"); @@ -115,9 +118,11 @@ int main(int argc, char* argv[]) logical::not_inplace(input); + typedef image2d<value::label_16> L; /// Extracting vertical and horizontal lines. + std::cout << "Extracting lines..." << std::endl; value::label_16 nhlines, nvlines; object_image(L) lbl_v = primitive::extract::lines_v_discontinued(input, c8(), @@ -125,12 +130,17 @@ int main(int argc, char* argv[]) object_image(L) lbl_h = primitive::extract::lines_h_discontinued(input, c8(), nhlines, 51, 6); + /// Reconstruct and erase tables. + std::cout << "Reconstructing and removing tables..." << std::endl; image2d<bool> input_notables = scribo::table::erase(input, lbl_h, lbl_v); + io::pbm::save(input_notables, "table_erased.ppm"); + /// Finding objects. + std::cout << "Finding objects..." << std::endl; value::label_16 nobjects; object_image(L) objects = scribo::primitive::extract::objects(input_notables, @@ -139,11 +149,12 @@ int main(int argc, char* argv[]) /// First filtering. + std::cout << "Filtering objects..." << std::endl; object_image(L) filtered_objects = scribo::filter::objects_small(objects, 6); filtered_objects - = scribo::filter::objects_thin(filtered_objects, 2); + = scribo::filter::objects_thin(filtered_objects, 1); // filtered_objects // = scribo::filter::objects_thick(filtered_objects, @@ -151,7 +162,8 @@ int main(int argc, char* argv[]) - /// Grouping potential objects + /// Linking potential objects + std::cout << "Linking objects..." << std::endl; object_links<L> left_link = primitive::link::with_single_left_link(filtered_objects, 30); object_links<L> right_link @@ -159,14 +171,17 @@ int main(int argc, char* argv[]) #ifndef NOUT - std::cout << "BEFORE - nobjects = " << nobjects << std::endl; - scribo::debug::save_linked_bboxes_image(input, - filtered_objects, - left_link, right_link, - literal::red, literal::cyan, - literal::yellow, - literal::green, - scribo::make::debug_filename("links.ppm")); + if (argc == 4) + { + std::cerr << "BEFORE - nobjects = " << nobjects << std::endl; + scribo::debug::save_linked_bboxes_image(input, + filtered_objects, + left_link, right_link, + literal::red, literal::cyan, + literal::yellow, + literal::green, + scribo::make::debug_filename("links.ppm")); + } #endif @@ -179,7 +194,8 @@ int main(int argc, char* argv[]) - // Remove links if bboxes have too different sizes. + // Remove links if bboxes are not aligned. + std::cout << "Filtering object links..." << std::endl; object_links<L> bottom_filtered_links = filter::object_links_bottom_aligned(filtered_objects, merged_links, @@ -188,13 +204,16 @@ int main(int argc, char* argv[]) #ifndef NOUT - image2d<value::rgb8> - bottom_decision_image = scribo::debug::decision_image(input, - merged_links, - bottom_filtered_links); - - io::ppm::save(bottom_decision_image, - scribo::make::debug_filename("bottom_links_decision_image.ppm")); + if (argc == 4) + { + image2d<value::rgb8> + bottom_decision_image = scribo::debug::decision_image(input, + merged_links, + bottom_filtered_links); + + io::ppm::save(bottom_decision_image, + scribo::make::debug_filename("bottom_links_decision_image.ppm")); + } #endif @@ -211,12 +230,15 @@ int main(int argc, char* argv[]) #ifndef NOUT - image2d<value::rgb8> - hratio_decision_image = scribo::debug::decision_image(input, - bottom_filtered_links, - hratio_filtered_links); - io::ppm::save(hratio_decision_image, - scribo::make::debug_filename("hratio_links_decision_image.ppm")); + if (argc == 4) + { + image2d<value::rgb8> + hratio_decision_image = scribo::debug::decision_image(input, + bottom_filtered_links, + hratio_filtered_links); + io::ppm::save(hratio_decision_image, + scribo::make::debug_filename("hratio_links_decision_image.ppm")); + } #endif @@ -232,12 +254,15 @@ int main(int argc, char* argv[]) #ifndef NOUT - image2d<value::rgb8> overlap_decision_image - = scribo::debug::decision_image(input, - hratio_filtered_links, - overlap_filtered_links); - io::ppm::save(overlap_decision_image, - scribo::make::debug_filename("overlap_links_decision_image.ppm")); + if (argc == 4) + { + image2d<value::rgb8> overlap_decision_image + = scribo::debug::decision_image(input, + hratio_filtered_links, + overlap_filtered_links); + io::ppm::save(overlap_decision_image, + scribo::make::debug_filename("overlap_links_decision_image.ppm")); + } #endif @@ -258,18 +283,21 @@ int main(int argc, char* argv[]) // groups, filtered_groups); // #endif + std::cout << "Grouping objects..." << std::endl; object_image(L) grouped_objects = primitive::group::apply(filtered_objects, groups); #ifndef NOUT - io::ppm::save(mln::labeling::colorize(value::rgb8(), - grouped_objects, - grouped_objects.nlabels()), - scribo::make::debug_filename("out.ppm")); + if (argc == 4) + io::ppm::save(mln::labeling::colorize(value::rgb8(), + grouped_objects, + grouped_objects.nlabels()), + scribo::make::debug_filename("out.ppm")); #endif + std::cout << "Text recognition..." << std::endl; text::recognition(grouped_objects, "fra", argv[2]); trace::exiting("main"); diff --git a/scribo/src/text_in_photo_ppm.cc b/scribo/src/text_in_photo_ppm.cc new file mode 100644 index 0000000..4cb5631 --- /dev/null +++ b/scribo/src/text_in_photo_ppm.cc @@ -0,0 +1,318 @@ +// Copyright (C) 2009 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 <libgen.h> +#include <iostream> + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/labeling/colorize.hh> + +#include <mln/io/pbm/all.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/math/min.hh> + +#include <mln/logical/not.hh> + +#include <mln/literal/colors.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/label_16.hh> + +#include <mln/draw/box.hh> + +#include <scribo/binarization/sauvola.hh> + +#include <scribo/draw/bounding_boxes.hh> + +#include <scribo/primitive/extract/objects.hh> + +#include <scribo/primitive/link/merge_double_link.hh> +#include <scribo/primitive/link/with_single_left_link.hh> +#include <scribo/primitive/link/with_single_right_link.hh> + +#include <scribo/primitive/group/apply.hh> +#include <scribo/primitive/group/from_double_link.hh> +#include <scribo/primitive/group/from_single_link.hh> + +#include <scribo/filter/object_links_bbox_h_ratio.hh> +#include <scribo/filter/object_links_bbox_overlap.hh> + +#include <scribo/filter/common/objects_photo.hh> + +#include <scribo/filter/object_groups_small.hh> +#include <scribo/filter/object_groups_v_thickness.hh> + +#include <scribo/debug/decision_image.hh> +#include <scribo/debug/save_bboxes_image.hh> +#include <scribo/debug/save_bboxes_image.hh> +#include <scribo/debug/save_linked_bboxes_image.hh> + +#include <scribo/debug/usage.hh> + +#include <scribo/preprocessing/split_bg_fg.hh> + +#include <scribo/make/debug_filename.hh> + +const char *args_desc[][2] = +{ + { "input.ppm", "A color image." }, + { "debug_output_dir", "Directory were debug images will be saved" }, + { "lambda", "Lambda value used for foreground extraction" }, + {0, 0} +}; + + +int main(int argc, char* argv[]) +{ + using namespace scribo; + using namespace mln; + + if (argc != 3 && argc != 4 && argc != 5) + return scribo::debug::usage(argv, + "Find text in a photo.", + "input.ppm output.ppm [debug_output_dir] [lambda]", + args_desc, + "A color image where the text is highlighted."); + + if (argc > 3) + scribo::make::internal::debug_filename_prefix = argv[3]; + + trace::entering("main"); + + image2d<value::rgb8> input_rgb; + io::ppm::load(input_rgb, argv[1]); + + + unsigned lambda; + if (argc == 5) + lambda = atoi(argv[4]); + else + lambda = 1.2 * (input_rgb.nrows() + input_rgb.ncols()); + + + // Extract foreground + std::cout << "Extracting foreground..." << std::endl; + image2d<value::rgb8> + fg = preprocessing::split_bg_fg(input_rgb, + lambda, + 32).second(); + + // Binarize foreground to use it in the processing chain. + std::cout << "Binarizing foreground..." << std::endl; + image2d<bool> input = binarization::sauvola(fg); + + + + typedef image2d<value::label_16> L; + + /// Finding objects. + std::cout << "Extracting objects..." << std::endl; + value::label_16 nobjects; + object_image(L) + objects = scribo::primitive::extract::objects(input, c8(), nobjects); + + + /// First filtering. + std::cout << "Filtering objects..." << std::endl; + object_image(L) filtered_objects = filter::common::objects_photo(objects); + + + + /// linking potential objects + std::cout << "Linking objects..." << std::endl; + object_links<L> left_link + = primitive::link::with_single_left_link(filtered_objects, 30); + object_links<L> right_link + = primitive::link::with_single_right_link(filtered_objects, 30); + + + + + +#ifndef NOUT + if (argc > 3) + { + std::cerr << "BEFORE - nobjects = " << nobjects << std::endl; + scribo::debug::save_linked_bboxes_image(input, + filtered_objects, + left_link, right_link, + literal::red, literal::cyan, + literal::yellow, + literal::green, + scribo::make::debug_filename("links.ppm")); + } +#endif + + + + // Validating left and right links. + object_links<L> + merged_links = primitive::link::merge_double_link(filtered_objects, + left_link, + right_link); + // Remove links if bboxes have too different sizes. + std::cout << "Filtering object links..." << std::endl; + object_links<L> + hratio_filtered_links = filter::object_links_bbox_h_ratio(filtered_objects, + merged_links, + 0.7f); + + + + +#ifndef NOUT + if (argc > 3) + { + image2d<value::rgb8> + hratio_decision_image = scribo::debug::decision_image(input, + merged_links, + hratio_filtered_links); + io::ppm::save(hratio_decision_image, + scribo::make::debug_filename("hratio_links_decision_image.ppm")); + } +#endif + + + + + //Remove links if bboxes overlap too much. + object_links<L> overlap_filtered_links + = filter::object_links_bbox_overlap(filtered_objects, + hratio_filtered_links, + 0.80f); + + + + +#ifndef NOUT + if (argc > 3) + { + image2d<value::rgb8> overlap_decision_image + = scribo::debug::decision_image(input, + hratio_filtered_links, + overlap_filtered_links); + io::ppm::save(overlap_decision_image, + scribo::make::debug_filename("overlap_links_decision_image.ppm")); + } +#endif + + + + std::cout << "Grouping objects..." << std::endl; + object_groups<L> + groups = primitive::group::from_single_link(filtered_objects, + overlap_filtered_links); + + + + /// Apply grouping in a temporary image (for debug purpose). + object_image(L) + raw_group_image = primitive::group::apply(filtered_objects, + filter::object_groups_small(groups, 2)); + + std::cout << "Filtering groups..." << std::endl; + + // Remove objects part of groups with strictly less than 3 objects. + object_groups<L> + filtered_small_groups = filter::object_groups_small(groups, 3); + + +#ifndef NOUT + image2d<value::rgb8> decision_image; + if (argc > 3) + { + decision_image = scribo::debug::decision_image(input, + groups, + filtered_small_groups); + io::ppm::save(decision_image, + scribo::make::debug_filename("small_groups_filter.ppm")); + } +#endif + + + + // Remove objects part of groups having a mean thickness lower than 8. + object_groups<L> filtered_thin_groups + = filter::object_groups_v_thickness(filtered_small_groups, 8); + + +#ifndef NOUT + if (argc > 3) + { + decision_image = scribo::debug::decision_image(input, + groups, + filtered_thin_groups); + + io::ppm::save(decision_image, + scribo::make::debug_filename("thin_groups_filter.ppm")); + } +#endif + + + + /// Apply grouping in the object image. + object_image(L) + grouped_objects = primitive::group::apply(filtered_objects, + filtered_thin_groups); + + + /// Objects have been grouped. We try to link groups together. + /// This time a single link is enough since non-wanted objects have + /// been removed. + left_link + = primitive::link::with_single_left_link(grouped_objects, 30); + + /// Grouping groups. + groups = primitive::group::from_single_link(grouped_objects, left_link); + + + grouped_objects = primitive::group::apply(grouped_objects, groups); + + + + +#ifndef NOUT + if (argc > 3) + { + scribo::draw::bounding_boxes(decision_image, raw_group_image, literal::yellow); + scribo::draw::bounding_boxes(decision_image, grouped_objects, literal::blue); + io::ppm::save(decision_image, scribo::make::debug_filename("decision_image.ppm")); + + std::cerr << "AFTER - nobjects = " << grouped_objects.nlabels() << std::endl; + } +#endif + + + std::cout << "Saving result..." << std::endl; + io::ppm::save(mln::labeling::colorize(value::rgb8(), + grouped_objects, + grouped_objects.nlabels()), + argv[2]); + + + trace::exiting("main"); +} -- 1.5.6.5

1 0

4483: Make text cleaning work.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* text/clean.hh: Do not use the distance map anymore. * text/recognition.hh: Do not return an image of char anymore. Enlarge the temporary image domain. --- scribo/ChangeLog | 9 +++++ scribo/text/clean.hh | 73 ++++++++++++++++++++++++------------------- scribo/text/recognition.hh | 39 ++++++++++++++--------- 3 files changed, 74 insertions(+), 47 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 15ea49e..af2f788 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Make text cleaning work. + + * text/clean.hh: Do not use the distance map anymore. + + * text/recognition.hh: Do not return an image of char anymore. + Enlarge the temporary image domain. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new filters in Scribo. * filter/common/objects_photo.hh, diff --git a/scribo/text/clean.hh b/scribo/text/clean.hh index 0f87139..e934241 100644 --- a/scribo/text/clean.hh +++ b/scribo/text/clean.hh @@ -41,7 +41,7 @@ # include <mln/logical/not.hh> -# include <mln/world/binary_2d/enlarge.hh> +//# include <mln/world/binary_2d/enlarge.hh> # include <mln/debug/filename.hh> # include <mln/io/pbm/save.hh> @@ -58,6 +58,15 @@ #include <mln/value/int_u8.hh> +#include <mln/fun/v2b/threshold.hh> +#include <mln/binarization/threshold.hh> +#include <mln/data/convert.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/pgm/all.hh> + +#include <sandbox/inim/2009/ocr/resize.hh> +#include <sandbox/fabien/mln/upsampling/hq4x.hh> + namespace scribo { @@ -70,7 +79,8 @@ namespace scribo /// Improve quality of an image with text. /// - /// \param[in] input_ A binary image. + /// \param[in] input_ A binary image. Object are set to 'false' + /// and backgroud to 'true'. /// \param[in] dmap_win_ A weighted window. /// /// \return An image. The text have better quality. @@ -83,8 +93,6 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY -// static int plop = 0; - template <typename I, typename W> mln_concrete(I) clean(const Image<I>& input_, const Weighted_Window<W>& dmap_win_) @@ -98,43 +106,44 @@ namespace scribo mln_precondition(input.is_valid()); mln_precondition(dmap_win.is_valid()); -// I input_large = world::binary_2d::enlarge(input, 2); -// image2d<bool> blur = linear::gaussian(input_large, 2); -// image2d<value::int_u8> blur = linear::gaussian(level::convert(value::int_u8(), input_large), 2); -// image2d<bool> blur = level::transform(linear::gaussian(level::convert(value::int_u8(), input_large), 2), fun::v2b::threshold<value::int_u8>(100)); + // Resize + typedef image2d<value::rgb8> J; + J tmp = data::convert(value::rgb8(), input); + J clarge = mln::upsampling::hq4x(tmp); + + //FIXME: not generic! + if (input.domain().pmax()[0] - input.domain().pmin()[0] <= 10) + clarge = mln::upsampling::hq4x(clarge); -// mln_ch_value(I,unsigned) -// dmap = transform::distance_front(logical::not_(input_large), c8(), -// dmap_win, -// mln_max(unsigned)); -// io::pgm::save(labeling::wrap(dmap), mln::debug::filename("dmap.pgm")); + I input_large = data::convert(bool(), clarge); -// I skeleton = topo::skeleton::crest(input_large, dmap, c8()); -// I constraint = topo::skeleton::crest(input_large, dmap, c8()); -// mln_postcondition(constraint.is_valid()); + // Blur + image2d<value::int_u8> + blur = linear::gaussian(data::convert(value::int_u8(), input_large), 2); -// io::pgm::save(labeling::wrap(constraint), mln::debug::filename("constraint.pgm")); + // Skeleton constraint + I K = topo::skeleton::crest(input_large, blur, c8()); -// I skeleton = -// morpho::skeleton_constrained(input_large, c8(), -// topo::skeleton::is_simple_point<I,neighb2d>, -// extend(constraint, false), arith::revert(dmap)); + // Skeleton + I skel_on_gaussian = + morpho::skeleton_constrained(input_large, c8(), + topo::skeleton::is_simple_point<I,neighb2d>, + extend(K, false), arith::revert(blur)); -// win::octagon2d disk(7); -// I output = morpho::dilation(skeleton, disk); + // Dilation + win::octagon2d oct(7); + I dilate_on_gaussian = morpho::dilation(skel_on_gaussian, oct); -// if (plop > 20 && plop < 50) - { -// io::pbm::save(input, mln::debug::filename("input.pbm")); -// io::pbm::save(input_large, mln::debug::filename("input_large_4x.pbm")); -// io::pbm::save(skeleton, mln::debug::filename("skeleton.pbm")); -// io::pbm::save(output, mln::debug::filename("dil_skel.pbm")); - } +// io::pgm::save(arith::revert(blur), "blur_revert.pgm"); +// io::pgm::save(blur, "gaussian.pgm"); +// io::pbm::save(input_large, mln::debug::filename("input_large_4x.pbm")); +// io::pbm::save(K, mln::debug::filename("K.pbm")); +// io::pbm::save(skel_on_gaussian, mln::debug::filename("skeleton_on_gaussian.pbm")); +// io::pbm::save(dilate_on_gaussian, mln::debug::filename("dilation_on_gaussian.pbm")); -// ++plop; trace::exiting("scribo::text::clean"); - return input; + return dilate_on_gaussian; } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index 6293e28..bd9f89b 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -68,6 +68,8 @@ # include <tesseract/baseapi.h> +#include <mln/labeling/colorize.hh> + namespace scribo { @@ -83,11 +85,9 @@ namespace scribo /// Tesseract. (fra, en, ...) /// \param[in] output_file If set, store the recognized text in /// this file. - /// - /// \return An image of characters. // template <typename L> - mln_ch_value(L,char) + void recognition(const object_image(L)& objects, const char *language, const char *output_file); @@ -98,7 +98,7 @@ namespace scribo template <typename L> - mln_ch_value(L,char) + void recognition(const object_image(L)& objects, const char *language, const char *output_file) @@ -110,9 +110,6 @@ namespace scribo // Initialize Tesseract. TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); - mln_ch_value(L,char) txt(objects.domain()); - data::fill(txt, ' '); - typedef mln_ch_value(L,bool) I; int vals[] = { 0, 9, 0, 9, 0, 9, 6, 4, 6, 9, @@ -128,17 +125,31 @@ namespace scribo /// Use text bboxes with Tesseract for_all_ncomponents(i, objects.nlabels()) { - I text_ima(objects.bbox(i)); - data::fill(text_ima, false); - data::fill((text_ima | (pw::value(objects) == pw::cst(i))).rw(), - true); + std::cout << "Text recognition... (" + << i << "/" << objects.nlabels() << ")" << std::endl; + + mln_domain(I) box = objects.bbox(i); + // Make sure characters are isolated from the borders. + // Help Tesseract. + box.enlarge(2); + I text_ima(box); + data::fill(text_ima, true); + + // Careful : background is set to 'False' + data::fill((text_ima | (pw::value(objects) == pw::cst(i))).rw(), + false); /// Improve text quality. /// text_ima_cleand domain is larger than text_ima's. I text_ima_cleaned = text::clean(text_ima, dmap_win); - border::resize(text_ima_cleaned, 0); // Make sure there is no border. + + // Setting objects to 'True' + logical::not_inplace(text_ima_cleaned); + + // Make sure there is no border. + border::resize(text_ima_cleaned, 0); // Recognize characters. char* s = TessBaseAPI::TesseractRect( @@ -157,10 +168,9 @@ namespace scribo - objects.bbox(i).pmin().col()) / 2; if (s != 0) { - std::cout << s << std::endl; + std::cerr << s << std::endl; if (output_file != 0) file << s << std::endl; - mln::debug::put_word(txt, p, s); } // The string has been allocated by Tesseract. We must free it. @@ -171,7 +181,6 @@ namespace scribo file.close(); trace::exiting("scribo::text::recognition"); - return txt; } -- 1.5.6.5

1 0

4482: Add new filters in Scribo.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* filter/common/objects_photo.hh, * filter/object_groups_v_thickness.hh: New. --- scribo/ChangeLog | 7 ++ scribo/filter/common/objects_photo.hh | 98 ++++++++++++++++++++++++++++ scribo/filter/object_groups_v_thickness.hh | 97 +++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 0 deletions(-) create mode 100644 scribo/filter/common/objects_photo.hh create mode 100644 scribo/filter/object_groups_v_thickness.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 53bec20..15ea49e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new filters in Scribo. + + * filter/common/objects_photo.hh, + * filter/object_groups_v_thickness.hh: New. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * estim/object_groups_v_thickness.hh: New routine. Estimate object group thickness. diff --git a/scribo/filter/common/objects_photo.hh b/scribo/filter/common/objects_photo.hh new file mode 100644 index 0000000..53da0a8 --- /dev/null +++ b/scribo/filter/common/objects_photo.hh @@ -0,0 +1,98 @@ +// Copyright (C) 2009 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. + +#ifndef SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH +# define SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH + +/// \file +/// +/// \brief Common objects filters to use in photos. + + +# include <scribo/core/object_image.hh> + +# include <scribo/filter/objects_small.hh> +# include <scribo/filter/objects_thin.hh> +# include <scribo/filter/objects_thick.hh> + + +namespace scribo +{ + + namespace filter + { + + namespace common + { + + + /*! \brief Common objects filters to use in photos. + + \param[in] objects An object image. + + \return A filtered object image. + */ + template <typename L> + object_image(L) + objects_photo(const object_image(L)& objects); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + object_image(L) + objects_photo(const object_image(L)& objects) + { + trace::entering("scribo::filter::common::objects_photo"); + + mln_precondition(objects.is_valid()); + + + object_image(L) filtered_objects + = scribo::filter::objects_small(objects, 6); + + filtered_objects + = scribo::filter::objects_thin(filtered_objects, 1); + +// filtered_objects +// = scribo::filter::objects_thick(filtered_objects, +// math::min(input.ncols(), +// input.nrows()) / 5); + + trace::exiting("scribo::filter::common::objects_photo"); + return filtered_objects; + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::filter::common + + } // end of namespace scribo::filter + +} // end of namespace scribo + + +#endif // ! SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH diff --git a/scribo/filter/object_groups_v_thickness.hh b/scribo/filter/object_groups_v_thickness.hh new file mode 100644 index 0000000..f16f1db --- /dev/null +++ b/scribo/filter/object_groups_v_thickness.hh @@ -0,0 +1,97 @@ +// Copyright (C) 2009 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. + +#ifndef SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH +# define SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH + +/// \file +/// +/// \brief Filter groups having their object mean thickness too low. + + +# include <mln/util/array.hh> + +# include <scribo/core/object_groups.hh> +# include <scribo/estim/object_groups_v_thickness.hh> + + +namespace scribo +{ + + namespace filter + { + + using namespace mln; + + + /*! \brief Filter groups having their object mean thickness too low. + + \param[in] groups Object group information. + \param[in] thickness Object group mean thickness must be greater + or equal to this value. + + \return Filtered object group information. + + */ + template <typename L> + object_groups<L> + object_groups_v_thickness(const object_groups<L>& groups, float thickness); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + object_groups<L> + object_groups_v_thickness(const object_groups<L>& groups, float thickness) + { + trace::entering("scribo::filter::object_groups_v_thickness"); + + mln_precondition(groups.is_valid()); + mln_precondition(thickness >= 0); + + mln::util::array<float> + group_thickness = estim::object_groups_v_thickness(groups); + + object_groups<L> output(groups); + output(0) = 0; + for (unsigned i = 1; i < output.size(); ++i) + if (group_thickness[groups[i]] < thickness) + output(i) = 0; + + trace::exiting("scribo::filter::object_groups_v_thickness"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::filter + +} // end of namespace scribo + + +#endif // ! SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH -- 1.5.6.5

1 0

4481: estim/object_groups_v_thickness.hh: New routine. Estimate object group thickness.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- scribo/ChangeLog | 5 ++ scribo/estim/object_groups_v_thickness.hh | 102 +++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 scribo/estim/object_groups_v_thickness.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e8bbe11..53bec20 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * estim/object_groups_v_thickness.hh: New routine. Estimate + object group thickness. + 2009-08-31 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix compilation issues in Scribo. diff --git a/scribo/estim/object_groups_v_thickness.hh b/scribo/estim/object_groups_v_thickness.hh new file mode 100644 index 0000000..6453a1a --- /dev/null +++ b/scribo/estim/object_groups_v_thickness.hh @@ -0,0 +1,102 @@ +// Copyright (C) 2009 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. + +#ifndef SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH +# define SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH + + +/// \file +/// +/// \brief Estimate the mean object thickness for each group. + + +# include <mln/util/array.hh> +# include <scribo/core/object_groups.hh> +# include <scribo/core/macros.hh> + + +namespace scribo +{ + + namespace estim + { + + using namespace mln; + + /*! \brief Estimate the mean object thickness for each group. + + \param[in] groups Object groups information. + + \return An array of mean object thickness. + + */ + template <typename L> + mln::util::array<float> + object_groups_v_thickness(const object_groups<L>& groups); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + util::array<float> + object_groups_v_thickness(const object_groups<L>& groups) + { + trace::entering("scribo::estim::object_groups_v_thickness"); + + mln_precondition(groups.is_valid()); + + const object_image(L)& objects = groups.object_image_(); + + //FIXME: remove when object_groups will store the number of + //elements per group. + mln::util::array<unsigned> group_card(groups.size(), 0.0); + + mln::util::array<float> output(groups.size(), 0.0); + for_all_components(i, objects.bboxes()) + { + output[groups[i]] += objects.bbox(i).pmax().row() + - objects.bbox(i).pmin().row(); + ++group_card[groups[i]]; + } + + output(0) = 0; + for_all_components(i, output) + output(i) /= static_cast<float>(group_card[i]); + + trace::exiting("scribo::estim::object_groups_v_thickness"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::estim + +} // end of namespace scribo + +#endif // ! SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH -- 1.5.6.5

1 0

4480: Make hq*x algorithms more generic and handle image extensions.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* fabien/mln/upsampling/hq2x.hh, * fabien/mln/upsampling/hq3x.hh, * fabien/mln/upsampling/hq4x.hh: Add support for image domains not starting from (0,0). Initialize image extension correctly --- milena/sandbox/ChangeLog | 30 +++++++++++++++++-------- milena/sandbox/fabien/mln/upsampling/hq2x.hh | 20 ++++++++++++----- milena/sandbox/fabien/mln/upsampling/hq3x.hh | 20 ++++++++++++----- milena/sandbox/fabien/mln/upsampling/hq4x.hh | 20 ++++++++++++----- 4 files changed, 62 insertions(+), 28 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index d76c826..caf71c7 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Make hq*x algorithms more generic and handle image extensions. + + * fabien/mln/upsampling/hq2x.hh, + * fabien/mln/upsampling/hq3x.hh, + * fabien/mln/upsampling/hq4x.hh: Add support for image domains not + starting from (0,0). + Initialize image extension correctly. + 2009-09-13 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Save work in progress for histo and hsl. Everything is updated. @@ -274,7 +284,7 @@ Finish the experiment for Laurent. * levillain/constrained-connectivity.cc: Complete the processing - chain. + chain. Add a copyright header. Translate the documentation into English. s/ima/input/g. @@ -394,7 +404,7 @@ (print_color), (fill_image_with_4colors), (is_equivalent), - (test_init_point), + (test_init_point), (is_equal), (is_center_initialized), (test_init_center) : New test functions. @@ -411,7 +421,7 @@ 2009-08-17 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Improve documentation. - + * green/histo1d/histo1d.hh : Improve documentation aspect. 2009-08-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -425,7 +435,7 @@ Some tries with segmentation using graph (still segfault).. * edwin/exec/score.hh: New. * edwin/exec/zi.cc, - * edwin/exec/zi.hh: + * edwin/exec/zi.hh: Use min-tree based method instead of WST to group components. 2009-08-17 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -505,7 +515,7 @@ * green/LearnMilena: Remove. * green/Otsu: Remove. * green/Stats: Remove. - + 2009-08-04 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Integrate LRDE code writting rules in the Stats code. @@ -513,7 +523,7 @@ * green/Stats/Makefile.am : Remove Makefile. * green/Stats/Stats.cc : Remove source. * green/Stats : Remove directory. - + * green/stats : New directory. * green/stats/Makefile.am : New Makefile. * green/stats/stats.cc : New source. @@ -525,7 +535,7 @@ * green/LearnMilena/Makefile.am : Remove Makefile. * green/LearnMilena/LearnMilena.cc : Remove source. * green/LearnMilena : Remove directory. - + * green/learn_milena : New directory. * green/learn_milena/Makefile.am : New Makefile. * green/learn_milena/learn_milena.cc : New source. @@ -537,7 +547,7 @@ * green/HelloMilena/Makefile.am : Remove Makefile. * green/HelloMilena/HelloMilena.cc : Remove source. * green/HelloMilena : Remove directory. - + * green/hello_milena : New directory. * green/hello_milena/Makefile.am : New Makefile. * green/hello_milena/hello_milena.cc : New source. @@ -550,7 +560,7 @@ * green/HelloWorld/HelloWorld.cc : Remove source. * green/HelloWorld/Print.cc : Remove source. * green/HelloWorld : Remove directory. - + * green/hello_world : New directory. * green/hello_world/Makefile.am : New Makefile. * green/hello_world/hello_world.cc : New source. @@ -631,7 +641,7 @@ * icdar/2009/pscomp: New directory. * icdar/2009/pscomp/iz.cc: New. - Compute an IZ image along with distances between objects. + Compute an IZ image along with distances between objects. * icdar/2009/pscomp/rect_filter.cc: New. Algebraic filtering with a combinaison of bounding box width and height. diff --git a/milena/sandbox/fabien/mln/upsampling/hq2x.hh b/milena/sandbox/fabien/mln/upsampling/hq2x.hh index e4d10d0..78ed271 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq2x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq2x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq2x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -224,7 +229,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -232,9 +237,9 @@ namespace mln { trace::entering("upsampling::impl::hq2x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 2, ncols * 2); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 4, + input.domain().pmax() * 4); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -264,9 +269,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -2965,6 +2970,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq2x_(exact(input)); trace::exiting("upsampling::hq2x"); diff --git a/milena/sandbox/fabien/mln/upsampling/hq3x.hh b/milena/sandbox/fabien/mln/upsampling/hq3x.hh index 603aec8..15c1e65 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq3x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq3x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq3x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -210,7 +215,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -218,9 +223,9 @@ namespace mln { trace::entering("upsampling::impl::hq3x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 3, ncols * 3); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 3, + input.domain().pmax() * 3); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -250,9 +255,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -3923,6 +3928,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq3x_(exact(input)); trace::exiting("upsampling::hq3x"); diff --git a/milena/sandbox/fabien/mln/upsampling/hq4x.hh b/milena/sandbox/fabien/mln/upsampling/hq4x.hh index d42fbe3..c77ef6a 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq4x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq4x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq4x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -330,7 +335,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -338,9 +343,9 @@ namespace mln { trace::entering("upsampling::impl::hq4x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 4, ncols * 4); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 4, + input.domain().pmax() * 4); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -370,9 +375,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -5403,6 +5408,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq4x_(exact(input)); trace::exiting("upsampling::hq4x"); -- 1.5.6.5

1 0

4479: mln/linear/gaussian.hh: Make linear::gaussian more generic.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- milena/ChangeLog | 4 ++++ milena/mln/linear/gaussian.hh | 33 ++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7e12744..ba5ebd3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * mln/linear/gaussian.hh: Make linear::gaussian more generic. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add geom::translate. * mln/geom/all.hh: Add new include. diff --git a/milena/mln/linear/gaussian.hh b/milena/mln/linear/gaussian.hh index 9fa96b1..50cb8bb 100644 --- a/milena/mln/linear/gaussian.hh +++ b/milena/mln/linear/gaussian.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009 EPITA +// Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,6 +44,12 @@ # include <mln/extension/adjust_fill.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_sli.hh> +# include <mln/geom/max_sli.hh> # include <mln/geom/ninds.hh> # include <mln/geom/nslis.hh> # include <mln/data/paste.hh> @@ -391,11 +398,11 @@ namespace mln if (dir == 0) { // Apply on rows. - for (unsigned j = 0; j < geom::ncols(img); ++j) + for (unsigned j = geom::min_col(img); j <= geom::max_col(img); ++j) recursivefilter_<mln_value(I)>(img, coef, - point2d(static_cast<def::coord>(-img.border()), + point2d(static_cast<def::coord>(geom::min_row(img) - img.border()), static_cast<def::coord>(j)), - point2d(static_cast<def::coord>(geom::nrows(img) - 1 + + point2d(static_cast<def::coord>(geom::max_row(img) + img.border()), static_cast<def::coord>(j)), geom::nrows(img) + 2 * img.border(), @@ -405,12 +412,12 @@ namespace mln if (dir == 1) { // Apply on columns. - for (unsigned i = 0; i < geom::nrows(img); ++i) + for (unsigned i = geom::min_row(img); i <= geom::max_row(img); ++i) recursivefilter_<mln_value(I)>(img, coef, point2d(static_cast<def::coord>(i), - static_cast<def::coord>(-img.border())), + static_cast<def::coord>(geom::min_col(img) - img.border())), point2d(static_cast<def::coord>(i), - static_cast<def::coord>(geom::ncols(img) - 1 + + static_cast<def::coord>(geom::max_col(img) + img.border())), geom::ncols(img) + 2 * img.border(), dpoint2d(0, 1)); @@ -429,8 +436,8 @@ namespace mln if (dir == 0) { // Apply on slices. - for (unsigned j = 0; j < geom::nrows(img); ++j) - for (unsigned k = 0; k < geom::ncols(img); ++k) + for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) + for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(-img.border()), static_cast<def::coord>(j), @@ -448,8 +455,8 @@ namespace mln if (dir == 1) { // Apply on rows. - for (unsigned i = 0; i < geom::nslis(img); ++i) - for (unsigned k = 0; k < geom::ncols(img); ++k) + for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(-img.border()), @@ -466,8 +473,8 @@ namespace mln if (dir == 2) { // Apply on columns. - for (unsigned i = 0; i < geom::nslis(img); ++i) - for (unsigned j = 0; j < geom::nrows(img); ++i) + for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(j), -- 1.5.6.5

1 0

4478: Add geom::translate.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* mln/geom/all.hh: Add new include. * mln/geom/translate.hh: New routine. * tests/geom/Makefile.am, * tests/geom/translate.cc: New test. --- milena/ChangeLog | 11 ++ milena/mln/geom/all.hh | 1 + milena/mln/geom/translate.hh | 159 ++++++++++++++++++++ milena/tests/geom/Makefile.am | 5 +- .../{mln/geom/all.hh => tests/geom/translate.cc} | 66 +++----- 5 files changed, 199 insertions(+), 43 deletions(-) create mode 100644 milena/mln/geom/translate.hh copy milena/{mln/geom/all.hh => tests/geom/translate.cc} (50%) diff --git a/milena/ChangeLog b/milena/ChangeLog index d2fb43a..7e12744 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add geom::translate. + + * mln/geom/all.hh: Add new include. + + * mln/geom/translate.hh: New routine. + + * tests/geom/Makefile.am, + * tests/geom/translate.cc: New test. + 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Disable tiled2d image support (still experimental). diff --git a/milena/mln/geom/all.hh b/milena/mln/geom/all.hh index f2d1fd3..813d164 100644 --- a/milena/mln/geom/all.hh +++ b/milena/mln/geom/all.hh @@ -68,6 +68,7 @@ namespace mln # include <mln/geom/size1d.hh> # include <mln/geom/size2d.hh> # include <mln/geom/size3d.hh> +# include <mln/geom/translate.hh> #endif // ! MLN_GEOM_ALL_HH diff --git a/milena/mln/geom/translate.hh b/milena/mln/geom/translate.hh new file mode 100644 index 0000000..334edc8 --- /dev/null +++ b/milena/mln/geom/translate.hh @@ -0,0 +1,159 @@ +// Copyright (C) 2009 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. + +/// \file +/// +/// Translate an image. + +#ifndef MLN_GEOM_TRANSLATE_HH +# define MLN_GEOM_TRANSLATE_HH + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/site_set.hh> +# include <mln/core/concept/box.hh> + +# include <mln/core/routine/extend.hh> + +# include <mln/core/image/imorph/tr_image.hh> + +# include <mln/data/paste.hh> + +# include <mln/fun/x2x/translation.hh> + +# include <mln/literal/zero.hh> + + +namespace mln +{ + + namespace geom + { + + /// Perform a translation from the center of an image. + /// + /// \param[in] input An image. + /// \param[in] ref The translation vector. + /// \param[in] extension Function, image or value which will be used + /// as extension. This extension allows to map + /// values to sites which where not part + /// of the domain before the translation. + /// \param[in] output_domain The domain of the output image. An + /// invalid domain, causes the routine + /// to use the translated input_ domain. + /// + /// \return An image with the same domain as \p input. + // + template <typename I, typename V, typename Ext, typename S> + mln_concrete(I) + translate(const Image<I>& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension, const Site_Set<S>& output_domain); + + + /// \overload + template <typename I, typename V, typename Ext> + mln_concrete(I) + translate(const Image<I>& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension); + + + /// \overload + /// Use literal::zero as default value for the extension. + template <typename I, typename V> + mln_concrete(I) + translate(const Image<I>& input, + const algebra::vec<mln_site_(I)::dim, V>& ref); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename V, typename Ext, typename S> + mln_concrete(I) + translate(const Image<I>& input_, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension_, const Site_Set<S>& output_domain_) + { + trace::entering("geom::translate"); + + const I& input = exact(input_); + const S& output_domain = exact(output_domain_); + const mln_exact(Ext)& extension = exact(extension_); + mlc_converts_to(mln_exact(Ext), mln_value(I))::check(); + + mln_precondition(input.is_valid()); + mln_precondition(output_domain.is_valid()); + + point2d c = geom::bbox(input).center(); + typedef fun::x2x::translation<2,double> trans_t; + trans_t + t(ref); + + tr_image<S,I,trans_t> tr_ima(output_domain, input, t); + + mln_concrete(I) output; + initialize(output, tr_ima); + + data::paste(extend(tr_ima, extension), output); + + trace::exiting("geom::translate"); + return output; + } + + + template <typename I, typename V, typename Ext> + mln_concrete(I) + translate(const Image<I>& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension) + { + // Old versions of GCC (including Apple GCC 4.0.1) do not parse + // correctly `mln_box(I)()'. Hence, we need to typedef + // `mln_box(I)' first. + typedef mln_domain(I) domain_t; + return translate(input, ref, extension, domain_t()); + } + + + template <typename I, typename V> + mln_concrete(I) + translate(const Image<I>& input, + const algebra::vec<mln_site_(I)::dim, V>& ref) + { + return translate(input, ref, literal::zero); + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::geom + +} // end of namespace mln + + +#endif // ! MLN_GEOM_TRANSLATE_HH diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 8572a6b..16600dd 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -37,7 +37,8 @@ nslis \ pmin_pmax \ rotate \ seed2tiling \ -seed2tiling_roundness +seed2tiling_roundness \ +translate bbox_SOURCES = bbox.cc @@ -58,6 +59,6 @@ pmin_pmax_SOURCES = pmin_pmax.cc rotate_SOURCES = rotate.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc - +translate_SOURCES = translate.cc TESTS = $(check_PROGRAMS) diff --git a/milena/mln/geom/all.hh b/milena/tests/geom/translate.cc similarity index 50% copy from milena/mln/geom/all.hh copy to milena/tests/geom/translate.cc index f2d1fd3..2efd753 100644 --- a/milena/mln/geom/all.hh +++ b/milena/tests/geom/translate.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,50 +23,35 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_GEOM_ALL_HH -# define MLN_GEOM_ALL_HH +# include <mln/core/image/image2d.hh> +# include <mln/geom/translate.hh> +# include <mln/make/image.hh> +# include <mln/data/compare.hh> -/// \file -/// -/// File that includes all geometry related things. +#include <mln/debug/println.hh> - -namespace mln +int main() { + using namespace mln; - /// Namespace of all things related to geometry. - namespace geom - { - /// Implementation namespace of geom namespace. - namespace impl {} - } + bool values[][5] = { { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 } }; -} + image2d<bool> ima = make::image(values); -# include <mln/geom/bbox.hh> -# include <mln/geom/chamfer.hh> -# include <mln/geom/complex_geometry.hh> -# include <mln/geom/delta.hh> -# include <mln/geom/max_col.hh> -# include <mln/geom/max_ind.hh> -# include <mln/geom/max_row.hh> -# include <mln/geom/max_sli.hh> -# include <mln/geom/min_col.hh> -# include <mln/geom/min_ind.hh> -# include <mln/geom/min_row.hh> -# include <mln/geom/min_sli.hh> -# include <mln/geom/ncols.hh> -# include <mln/geom/ninds.hh> -# include <mln/geom/nrows.hh> -# include <mln/geom/nsites.hh> -# include <mln/geom/nslis.hh> -# include <mln/geom/pmin_pmax.hh> -# include <mln/geom/rotate.hh> -# include <mln/geom/seeds2tiling.hh> -# include <mln/geom/seeds2tiling_roundness.hh> -# include <mln/geom/size1d.hh> -# include <mln/geom/size2d.hh> -# include <mln/geom/size3d.hh> + box2d b = make::box2d(-2, -2, 2, 2); + image2d<bool> + ima_rot = geom::translate(ima, + -1 * ima.domain().center().to_vec(), + literal::zero, b); + mln_piter_(image2d<bool>) + p1(ima.domain()), + p2(ima_rot.domain()); -#endif // ! MLN_GEOM_ALL_HH + for_all_2(p1,p2) + mln_assertion(ima(p1) == ima_rot(p2)); +} -- 1.5.6.5

1 0

Re: [Olena-patches] r4432: Implement HQ2x upscaling algorithm
by Alexandre Duret-Lutz 14 Sep '09

14 Sep '09

>>> "FF" == Fabien Freling <fabien.freling(a)lrde.epita.fr> writes: FF> URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox FF> ChangeLog: FF> 2009-09-04 Fabien Freling <fabien.freling(a)lrde.epita.fr> FF> Implement HQ2x upscaling algorithm. FF> * fabien/mln/upsampling/hq2x.hh: Implement HQ2x algorithm. FF> * fabien/mln/upsampling/hq3x.hh: Remove dead code. FF> * fabien/tests/upsampling/Makefile: Add `hq2x' target. FF> * fabien/tests/upsampling/hq2x.cc: New test file for HQ2x. Je suis assez choqué. Ce code est une adaptation d'un code de Maxim Stepin sous LGPL 2.1 : on reconnaît clairement la logique du code original, même si les accès à l'image ont changé. Cependant 1) le nom de l'auteur n'apparaît nul part 2) son copyright a été modifié en (c) LRDE 3) la license a été changée en GPL 2 + exception. Le dépôt SVN de milena est public. Tu ne peux pas prendre le code de quelqu'un et le redistribuer sous une autre license comme ça ! Et indépendamment du problème de copyright/license, quand on implémente un algo précis, c'est une bonne idée d'en donner les références (article, page web, ...) dans l'entête. FF> --- trunk/milena/sandbox/fabien/mln/upsampling/hq2x.hh (revision 0) FF> +++ trunk/milena/sandbox/fabien/mln/upsampling/hq2x.hh (revision 4432) FF> @@ -0,0 +1,2988 @@ FF> +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) FF> +// FF> +// This file is part of Olena. FF> +// FF> +// Olena is free software: you can redistribute it and/or modify it under FF> +// the terms of the GNU General Public License as published by the Free FF> +// Software Foundation, version 2 of the License. FF> +// FF> +// Olena is distributed in the hope that it will be useful, FF> +// but WITHOUT ANY WARRANTY; without even the implied warranty of FF> +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU FF> +// General Public License for more details. FF> +// FF> +// You should have received a copy of the GNU General Public License FF> +// along with Olena. If not, see <http://www.gnu.org/licenses/>. FF> +// FF> +// As a special exception, you may use this file as part of a free FF> +// software project without restriction. Specifically, if other files FF> +// instantiate templates or use macros or inline functions from this FF> +// file, or you compile this file and link it with other files to produce FF> +// an executable, this file does not by itself cause the resulting FF> +// executable to be covered by the GNU General Public License. This FF> +// exception does not however invalidate any other reasons why the FF> +// executable file might be covered by the GNU General Public License. -- Alexandre Duret-Lutz

3 3

milena r4477: Disable tiled2d image support (still experimental)
by Fabien Freling 14 Sep '09

14 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Disable tiled2d image support (still experimental). * mln/io/magick/save.hh: Disable tiled2d image support. --- save.hh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: trunk/milena/mln/io/magick/save.hh =================================================================== --- trunk/milena/mln/io/magick/save.hh (revision 4476) +++ trunk/milena/mln/io/magick/save.hh (revision 4477) @@ -63,9 +63,9 @@ * \param[out] ima A reference to the image to save. * \param[in] filename The output. */ - template <typename T> + /*template <typename T> void save(Image< tiled2d<T> >& ima, - const std::string& filename); + const std::string& filename);*/ # ifndef MLN_INCLUDE_ONLY @@ -73,7 +73,6 @@ inline Magick::Color get_color(bool value) { - std::cout << "bool color!" << std::endl; return Magick::ColorMono(value); } @@ -126,7 +125,7 @@ trace::exiting("mln::io::magick::save"); } - template <typename T> + /*template <typename T> void save(Image< tiled2d<T> >& ima_, const std::string& filename) { trace::entering("mln::io::magick::save"); @@ -136,7 +135,7 @@ ima.buffer().write(filename); trace::exiting("mln::io::magick::save"); - } + }*/ # endif // ! MLN_INCLUDE_ONLY

1 0