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

Remove deprecated references to object_image.

	* core/object_image.hh: Remove.

	* filter/object_groups_size_ratio.hh,
	* filter/object_links_bbox_w_ratio.hh,
	* filter/object_links_left_aligned.hh,
	* filter/object_links_right_aligned.hh,
	* primitive/extract/lines_h_thick_and_single.hh,
	* primitive/extract/lines_v_thick_and_single.hh,
	* primitive/link/internal/find_several_links.hh,
	* primitive/link/internal/link_several_dmax_base.hh,
	* primitive/link/with_single_up_link.hh,
	* src/debug/show_links_left_right_links_validation.cc,
	* src/primitive/find/find_discontinued_lines.cc,
	* src/primitive/find/find_pattern_lines.cc,
	* tests/filter/small_and_large_bboxes.cc,
	* src/primitive/group/group_from_double_link_filter_non_aligned.cc:
	Remove include of object_image.hh.
parent 4aec8b7d
2010-08-09 Guillaume Lazzara <z@lrde.epita.fr>
Remove deprecated references to object_image.
* core/object_image.hh: Remove.
* filter/object_groups_size_ratio.hh,
* filter/object_links_bbox_w_ratio.hh,
* filter/object_links_left_aligned.hh,
* filter/object_links_right_aligned.hh,
* primitive/extract/lines_h_thick_and_single.hh,
* primitive/extract/lines_v_thick_and_single.hh,
* primitive/link/internal/find_several_links.hh,
* primitive/link/internal/link_several_dmax_base.hh,
* primitive/link/with_single_up_link.hh,
* src/debug/show_links_left_right_links_validation.cc,
* src/primitive/find/find_discontinued_lines.cc,
* src/primitive/find/find_pattern_lines.cc,
* tests/filter/small_and_large_bboxes.cc,
* src/primitive/group/group_from_double_link_filter_non_aligned.cc:
Remove include of object_image.hh.
2010-08-09 Guillaume Lazzara <z@lrde.epita.fr> 2010-08-09 Guillaume Lazzara <z@lrde.epita.fr>
Cleanup Makefiles. Cleanup Makefiles.
......
// 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_CORE_OBJECT_IMAGE_HH
# define SCRIBO_CORE_OBJECT_IMAGE_HH
/// \file
///
/// FIXME.
# include <mln/core/image/imorph/labeled_image.hh>
# define object_image(L) \
mln::labeled_image<L>
#endif // ! SCRIBO_CORE_OBJECT_IMAGE_HH
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/object_groups.hh> # include <scribo/core/object_groups.hh>
# include <scribo/core/object_image.hh>
namespace scribo namespace scribo
{ {
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
# include <scribo/core/object_image.hh>
# include <scribo/filter/object_links_bbox_ratio.hh> # include <scribo/filter/object_links_bbox_ratio.hh>
namespace scribo namespace scribo
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
# include <scribo/core/object_image.hh>
# include <scribo/filter/object_links_non_aligned_simple.hh> # include <scribo/filter/object_links_non_aligned_simple.hh>
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
# include <scribo/core/object_image.hh>
# include <scribo/filter/object_links_non_aligned_simple.hh> # include <scribo/filter/object_links_non_aligned_simple.hh>
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
# include <mln/morpho/opening/structural.hh> # include <mln/morpho/opening/structural.hh>
# include <scribo/core/object_image.hh>
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/primitive/extract/lines_h_thick.hh> # include <scribo/primitive/extract/lines_h_thick.hh>
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
# include <mln/morpho/opening/structural.hh> # include <mln/morpho/opening/structural.hh>
# include <scribo/core/object_image.hh>
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/primitive/extract/lines_v_thick.hh> # include <scribo/primitive/extract/lines_v_thick.hh>
......
// 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. // This file is part of Olena.
// //
...@@ -42,7 +43,6 @@ ...@@ -42,7 +43,6 @@
# include <scribo/core/concept/link_functor.hh> # include <scribo/core/concept/link_functor.hh>
# include <scribo/core/tag/anchor.hh> # include <scribo/core/tag/anchor.hh>
# include <scribo/core/object_image.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/tag/anchor.hh> # include <scribo/core/tag/anchor.hh>
# include <scribo/core/object_image.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
# include <scribo/primitive/link/internal/find_link.hh> # include <scribo/primitive/link/internal/find_link.hh>
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
# include <scribo/core/macros.hh> # include <scribo/core/macros.hh>
# include <scribo/core/object_image.hh>
# include <scribo/core/object_links.hh> # include <scribo/core/object_links.hh>
# include <scribo/primitive/link/internal/find_link.hh> # include <scribo/primitive/link/internal/find_link.hh>
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <mln/value/label_16.hh> #include <mln/value/label_16.hh>
#include <scribo/core/object_links.hh> #include <scribo/core/object_links.hh>
#include <scribo/core/object_image.hh>
#include <scribo/primitive/extract/components.hh> #include <scribo/primitive/extract/components.hh>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <scribo/debug/usage.hh> #include <scribo/debug/usage.hh>
#include <scribo/core/object_image.hh>
#include <scribo/primitive/extract/lines_h_discontinued.hh> #include <scribo/primitive/extract/lines_h_discontinued.hh>
#include <scribo/primitive/extract/lines_v_discontinued.hh> #include <scribo/primitive/extract/lines_v_discontinued.hh>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <scribo/debug/usage.hh> #include <scribo/debug/usage.hh>
#include <scribo/core/object_image.hh>
#include <scribo/primitive/extract/lines_h_pattern.hh> #include <scribo/primitive/extract/lines_h_pattern.hh>
#include <scribo/primitive/extract/lines_v_pattern.hh> #include <scribo/primitive/extract/lines_v_pattern.hh>
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <mln/value/label_16.hh> #include <mln/value/label_16.hh>
#include <scribo/core/object_links.hh> #include <scribo/core/object_links.hh>
#include <scribo/core/object_image.hh>
#include <scribo/primitive/extract/components.hh> #include <scribo/primitive/extract/components.hh>
#include <scribo/primitive/group/apply.hh> #include <scribo/primitive/group/apply.hh>
......
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
#include <mln/value/label_16.hh> #include <mln/value/label_16.hh>
#include <mln/io/pbm/load.hh> #include <mln/io/pbm/load.hh>
#include <mln/literal/colors.hh> #include <mln/literal/colors.hh>
#include <scribo/core/object_image.hh>
#include <scribo/primitive/extract/components.hh> #include <scribo/primitive/extract/components.hh>
#include <scribo/primitive/group/apply.hh> #include <scribo/primitive/group/apply.hh>
#include <scribo/primitive/link/with_single_left_link.hh> #include <scribo/primitive/link/with_single_left_link.hh>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment