Commit a32de0fd authored by Roland Levillain's avatar Roland Levillain
Browse files

Have Scribo compile again.

	* core/object_image.hh (object_image): Add prefix `mln::'.
	* primitive/link/internal/anchors_3.hh: Include mln/util/array.hh.
	Add missing `mln::' prefixes.
	* src/binarization/sauvola_ms.cc:
	s/influence_zone_geodesic/influence_zone_geodesic_saturated/.
	* table/internal/connect_lines.hh: Likewise.
	Remove a duplicated header inclusion.
	* src/debug/Makefile.am
	(bin_PROGRAMS, show_links_several_right_overlap_SOURCES): Disable
	show_links_several_right_overlap.
	* src/primitive/group/Makefile.am
	(bin_PROGRAMS, group_from_rag_SOURCES): Disable group_from_rag.
parent e44073ea
2010-03-31 Roland Levillain <roland@lrde.epita.fr>
Have Scribo compile again.
* core/object_image.hh (object_image): Add prefix `mln::'.
* primitive/link/internal/anchors_3.hh: Include mln/util/array.hh.
Add missing `mln::' prefixes.
* src/binarization/sauvola_ms.cc:
s/influence_zone_geodesic/influence_zone_geodesic_saturated/.
* table/internal/connect_lines.hh: Likewise.
Remove a duplicated header inclusion.
* src/debug/Makefile.am
(bin_PROGRAMS, show_links_several_right_overlap_SOURCES): Disable
show_links_several_right_overlap.
* src/primitive/group/Makefile.am
(bin_PROGRAMS, group_from_rag_SOURCES): Disable group_from_rag.
2010-03-02 Roland Levillain <roland@lrde.epita.fr>
Regen SCRIBO's Makefile helpers.
......
......@@ -33,6 +33,6 @@
# include <mln/core/image/imorph/labeled_image.hh>
# define object_image(L) \
labeled_image<L>
mln::labeled_image<L>
#endif // ! SCRIBO_CORE_OBJECT_IMAGE_HH
......@@ -31,6 +31,7 @@
/// Routine providing 3 anchors for neighbor seeking.
# include <mln/math/min.hh>
# include <mln/util/array.hh>
# include <scribo/core/object_image.hh>
......@@ -94,7 +95,7 @@ namespace scribo
- objects.bbox(current_object).pmin().row();
mln_site(L) sp = objects.bbox(current_object).center();
def::coord r;
mln::def::coord r;
switch (anchor)
{
......@@ -102,10 +103,10 @@ namespace scribo
case 0:
if (h < 30)
r = objects.bbox(current_object).pmin().row()
+ math::min(2u, (h + 1) / 2 - 1);
+ mln::math::min(2u, (h + 1) / 2 - 1);
else
r = objects.bbox(current_object).pmin().row()
- math::min(10u, h /10);
- mln::math::min(10u, h /10);
break;
......@@ -118,14 +119,14 @@ namespace scribo
case 2:
if (h < 30)
r = objects.bbox(current_object).pmax().row()
+ math::min(2u, (h + 1) / 2 - 1);
+ mln::math::min(2u, (h + 1) / 2 - 1);
else
r = objects.bbox(current_object).pmax().row()
- math::min(10u, h /10);
- mln::math::min(10u, h /10);
break;
default:
trace::warning("Non handled anchor");
mln::trace::warning("Non handled anchor");
mln_assertion(anchor > 2);
}
......
......@@ -33,7 +33,7 @@
#include <mln/literal/colors.hh>
#include <mln/math/sqr.hh>
#include <mln/subsampling/subsampling.hh>
#include <mln/transform/influence_zone_geodesic.hh>
#include <mln/transform/influence_zone_geodesic_saturated.hh>
#include <mln/util/timer.hh>
#include <mln/value/int_u16.hh>
#include <mln/value/int_u8.hh>
......@@ -359,8 +359,8 @@ int main(int argc, char *argv[])
/// Saving influence zone scale image.
image2d<int_u8>
e_ext = transform::influence_zone_geodesic(e, c8(), mln_max(unsigned));
image2d<int_u8> e_ext =
transform::influence_zone_geodesic_saturated(e, c8(), mln_max(unsigned));
io::pgm::save(e_ext, "e_ext.pgm");
......
......@@ -27,7 +27,6 @@ bin_PROGRAMS = \
show_links_center_aligned \
show_links_non_h_aligned \
show_links_several_right \
show_links_several_right_overlap \
show_links_single_left \
show_links_single_left_dmax_ratio \
show_links_single_right \
......@@ -39,7 +38,6 @@ bin_PROGRAMS = \
show_objects_thick \
show_objects_thin
show_left_right_links_validation_SOURCES = show_left_right_links_validation.cc
show_links_bbox_h_ratio_SOURCES = show_links_bbox_h_ratio.cc
show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc
......@@ -47,7 +45,6 @@ show_links_bottom_aligned_SOURCES = show_links_bottom_aligned.cc
show_links_center_aligned_SOURCES = show_links_center_aligned.cc
show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc
show_links_several_right_SOURCES = show_links_several_right.cc
show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc
show_links_single_left_SOURCES = show_links_single_left.cc
show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc
show_links_single_right_SOURCES = show_links_single_right.cc
......@@ -58,3 +55,7 @@ show_objects_large_small_SOURCES = show_objects_large_small.cc
show_objects_small_SOURCES = show_objects_small.cc
show_objects_thick_SOURCES = show_objects_thick.cc
show_objects_thin_SOURCES = show_objects_thin.cc
## FIXME: Does not compile.
## bin_PROGRAMS += show_links_several_right_overlap
## show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc
......@@ -24,7 +24,6 @@ bin_PROGRAMS = \
group_from_double_link_filter_non_aligned \
group_from_double_several_links \
group_from_graph \
group_from_rag \
group_from_several_graph \
group_from_several_left_links \
group_from_single_link
......@@ -33,8 +32,10 @@ group_from_double_link_SOURCES = group_from_double_link.cc
group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc
group_from_double_several_links_SOURCES = group_from_double_several_links.cc
group_from_graph_SOURCES = group_from_graph.cc
group_from_rag_SOURCES = group_from_rag.cc
group_from_several_graph_SOURCES = group_from_several_graph.cc
group_from_several_left_links_SOURCES = group_from_several_left_links.cc
group_from_single_link_SOURCES = group_from_single_link.cc
## FIXME: Does not compile.
## bin_PROGRAMS += group_from_rag
## group_from_rag_SOURCES = group_from_rag.cc
......@@ -35,7 +35,7 @@
# include <mln/data/fill.hh>
# include <mln/transform/influence_zone_geodesic.hh>
# include <mln/transform/influence_zone_geodesic_saturated.hh>
# include <mln/morpho/elementary/dilation.hh>
# include <mln/util/array.hh>
......@@ -43,8 +43,6 @@
# include <mln/opt/at.hh>
# include <mln/transform/influence_zone_geodesic.hh>
# include <scribo/core/macros.hh>
# include <scribo/core/central_sites.hh>
......@@ -96,7 +94,8 @@ namespace scribo
for_all_elements(i, aligned_lines)
opt::at(l, aligned_lines[i]) = aligned_lines[i];
l = transform::influence_zone_geodesic(l, c2(), max_distance, -1);
l = transform::influence_zone_geodesic_saturated(l, c2(),
max_distance, -1);
for_all_components(i, boxes)
{
......
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