* tests/unit_test/Makefile.am
	(regen-am): Update the use of build_unit_test.sh.
	(EXTRA_DIST): Add cond_tests_* files.

	* tests/unit_test/cond_tests_cfitsio,
	* tests/unit_test/cond_tests_gdcm,
	* tests/unit_test/cond_tests_magickxx,
	* tests/unit_test/cond_tests_tiff: New.

	* tests/unit_test/disabled_tests: Remove some conditional tests.

	* tests/unit_test/unit-tests.mk: Regen.

	* src/preprocessing/Makefile.am: Add a new target.

	* src/preprocessing/rotate.cc: New.

	* 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.

	* src/Makefile.am: Disable tests and remove deprecated ones.

	* src/preprocessing/Makefile.am: Use MAGICKXX_* flags.

	* src/text_recognition_in_picture.cc: Use new routines. Cleanup
	useless comments. Use a height ratio filter to improve OCR
	results.

	* src/text_in_picture.cc: Here.

	* filter/internal/compute.hh,
	* filter/objects_small.hh,
	* filter/objects_thick.hh,
	* filter/objects_thin.hh,
	* primitive/group/from_double_link.hh,
	* primitive/link/compute_several.hh,
	* table/align_lines_horizontaly.hh,
	* table/erase.hh,
	* table/extract.hh: Here.

	* src/debug/show_links_bbox_overlap.cc,
	* src/debug/show_links_center_aligned.cc,
	* src/debug/show_links_non_h_aligned.cc,
	* src/debug/show_links_several_right.cc,
	* src/debug/show_links_several_right_overlap.cc,
	* src/debug/show_links_single_down.cc,
	* src/debug/show_links_single_down_left_aligned.cc,
	* src/debug/show_links_single_down_right_aligned.cc,
	* src/debug/show_links_single_left.cc,
	* src/debug/show_links_single_left_dmax_ratio.cc,
	* src/debug/show_links_single_right.cc,
	* src/debug/show_links_single_right_dmax_ratio.cc,
	* src/debug/show_links_single_up.cc,
	* src/debug/show_links_single_up_left_aligned.cc,
	* src/debug/show_links_single_up_right_aligned.cc,
	* src/debug/show_objects_large.cc,
	* src/debug/show_objects_large_small.cc,
	* src/debug/show_objects_small.cc,
	* src/debug/show_objects_thick.cc,
	* src/debug/show_objects_thin.cc,
	* src/filter/objects_large.cc,
	* src/filter/objects_small.cc,
	* src/filter/objects_thick.cc,
	* src/filter/objects_thin.cc,
	* src/filter/objects_with_holes.cc,
	* src/filter/objects_with_holes_pgm.cc,
	* src/preprocessing/preprocess.cc,
	* src/preprocessing/split_bg_fg.cc,
	* src/preprocessing/unskew.cc,
	* src/primitive/extract/extract_discontinued_hlines.cc,
	* src/primitive/extract/extract_discontinued_lines.cc,
	* src/primitive/extract/extract_discontinued_vlines.cc,
	* src/primitive/extract/extract_thick_hlines.cc,
	* src/primitive/extract/extract_thick_vlines.cc,
	* src/primitive/find/find_discontinued_lines.cc,
	* src/primitive/find/find_single_lines.cc,
	* src/primitive/find/find_thick_and_single_lines.cc,
	* src/primitive/find/find_thick_lines.cc,
	* src/primitive/group/Makefile.am,
	* src/primitive/group/group_from_double_link.cc,
	* src/primitive/group/group_from_double_several_links.cc,
	* src/primitive/group/group_from_several_left_links.cc,
	* src/primitive/group/group_from_single_link.cc,
	* src/table/erase.cc,
	* src/text/cleantxt.cc: Here.

	* 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.

	* core/erase_objects.hh,
	* debug/several_links_decision_image.hh,
	* filter/object_groups_size_ratio.hh,
	* filter/object_links_bbox_w_ratio.hh,
	* filter/object_links_center_aligned.hh,
	* filter/object_links_left_aligned.hh,
	* filter/object_links_right_aligned.hh,
	* filter/objects_h_thick.hh,
	* filter/objects_h_thin.hh,
	* filter/objects_size_ratio.hh,
	* filter/objects_v_thick.hh,
	* filter/objects_v_thin.hh,
	* primitive/extract/lines_h_thick_and_single.hh,
	* primitive/extract/lines_v_thick_and_single.hh,
	* primitive/group/from_graph.hh,
	* primitive/internal/find_graph_link.hh,
	* primitive/link/with_graph.hh,
	* primitive/link/with_rag.hh,
	* primitive/link/with_several_graphes.hh,
	* primitive/link/with_several_left_links.hh,
	* primitive/link/with_several_right_closest_links.hh,
	* primitive/link/with_several_right_links.hh,
	* primitive/link/with_single_down_link.hh,
	* primitive/link/with_single_up_link.hh: Replace the use of
	object_image with component_set.

	* core/component_info.hh (is_valid): Check the bounding box
	validity.

	* core/macros.hh: Add a new macro.

	* debug/decision_image.hh: Remove deprecated preconditions and add
	missing includes.

	* debug/save_linked_bboxes_image.hh: Add the anchor type as
	argument.

	* draw/bounding_box_links.hh: Add the anchor type as argument and
	make use of component information.

	* draw/bounding_boxes.hh: Check the component validity.

	* filter/object_links_non_aligned_simple.hh: Update doc.

	* filter/objects_with_holes.hh: Remove debug and timers. Add
	missing includes.

	* primitive/extract/lines_pattern.hh: Use the window template
	parameter instead of an exact window type.

	* primitive/link/internal/find_several_links.hh: Update code with
	new interfaces.

	* primitive/link/internal/link_functor_base.hh
	(nanchors()): Remove this method.
	(labeled_image()): Add a const version.

	* primitive/link/internal/link_several_dmax_base.hh
	(nanchors(), anchors()): New methods.
	Introduce 'direction_' attribute.

	* debug/several_links_decision_image.hh: Remove deprecated
	preconditions.

	* src/debug/show_links_single_left.cc: Update include.

	* table/internal/align_lines.hh,
	* table/rebuild.hh: Make use of component_set structure.

	* debug/text_areas_image.hh,
	* primitive/regroup/from_single_left_link_wrt_h_ratio.hh: Add
	missing includes.

	* src/contest/hdibco-2010/Makefile.am: Do not consider this tool
	as a test anymore.

	* src/afp/components.hh,
	* src/afp/link.hh,
	* src/afp/regroup.hh: Add missing includes and headers.

	* debug/highlight_text_area.hh,
	* debug/save_bboxes_image.hh: Add a new overload.

	* debug/save_comp_diff.hh,
	* debug/text_areas_image.hh,
	* primitive/regroup/from_single_left_link_wrt_h_ratio.hh: New.

	* core/internal/link_functor_base.hh,
	* debug/save_object_diff.hh,
	* make/text.hh,
	* primitive/internal/update_link_array.hh,
	* primitive/link/internal/anchors_3.hh,
	* primitive/link/internal/link_ms_dmax_base.hh,
	* primitive/link/internal/link_ms_dmax_ratio_base.hh,
	* src/pbm_lines_in_doc.cc: Remove.

	* mln/accu/internal/base.hh,
	* mln/accu/math/sum.hh: Aesthetic changes.

	* mln/data/paste_without_localization.hh: Add a missing include.

	* mln/geom/rotate.hh: Add a new overload taking a box as argument.

	* all.hh,
	* binarization/all.hh,
	* binarization/internal/first_pass_functor.hh,
	* convert/from_qimage.hh,
	* core/tag/component.hh,
	* core/tag/line.hh,
	* debug/links_decision_image.hh,
	* debug/mean_and_base_lines_image.hh,
	* filter/object_groups_with_holes.hh,
	* io/xml/save.hh,
	* make/all.hh,
	* postprocessing/all.hh,
	* postprocessing/fill_object_holes.hh,
	* preprocessing/all.hh,
	* preprocessing/crop_without_localization.hh,
	* preprocessing/denoise_bg.hh,
	* preprocessing/denoise_fg.hh,
	* preprocessing/deskew.hh,
	* preprocessing/deskew_crop.hh,
	* preprocessing/split_bg_fg.hh,
	* primitive/extract/all.hh,
	* primitive/extract/lines_h_single.hh,
	* primitive/extract/lines_pattern.hh,
	* primitive/extract/lines_v_single.hh,
	* primitive/group/all.hh,
	* primitive/internal/all.hh,
	* primitive/internal/is_link_valid.hh,
	* primitive/link/all.hh,
	* primitive/link/internal/compute_anchor.hh,
	* primitive/link/internal/dmax_functor_base.hh,
	* primitive/regroup/from_single_left_link.hh,
	* primitive/remove/separators.hh,
	* subsampling/bilinear.hh,
	* text/merging.hh,
	* toolchain/nepomuk/text_extraction.hh,
	* upsampling/eagle.hh: Add missing headers in order to fix
	unit-tests.

	* tests/Makefile.am: Disable "table" directory's tests.

	* tests/core/Makefile.am: Remove object_image test.

	* tests/core/object_image.cc: Remove. Deprecated.

	* tests/filter/objects_with_holes.cc,
	* tests/filter/small_and_large_bboxes.cc: Write a real test.

	* tests/unit_test/Makefile.am: Add specific flags for unit-tests
	using tesseract and image magick.

Roland Levillain authored Jul 21, 2010 and Guillaume Lazzara committed Aug 04, 2010

	* scribo/debug/bboxes_enlarged_image.hh,
	* scribo/debug/looks_like_a_text_line_image.hh,
	* scribo/debug/mean_and_base_lines_image.hh,
	* scribo/debug/save_bboxes_image.hh:
	Catch up with scribo::line_info<L>'s current interface.
	Reported by Olivier Grisel <ogrisel@nuxeo.com>.

	* mln/geom/max_col.hh,
	* mln/geom/max_row.hh,
	* mln/geom/min_col.hh,
	* mln/geom/min_row.hh: Replace deduced type 'point' by 'site'.

filter/object_groups_with_holes.hh: Fix an invalid mismatch between groups ids and their related component ids and add more comments.

	* configure.ac: Use PKG_* macros to find Magick++ path and
	libraries.

	* m4/pkg.m4: New macros to use pkg-config.

	* doc/figures/ima2d-rot-2.ppm: Update generated output.

	* mln/core/alias/window2d.hh: Aesthetic changes in the header.

	* mln/core/point.hh: Add mln:: prefix.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Regen.

	* core/line_info.hh: Rename hidden as is_hidden.

	* core/object_links.hh: Add duplicate().

	* filter/object_links_bbox_ratio.hh: Use object_links::duplicate.

	* debug/links_decision_image.hh,
	* src/debug/show_info_median_inter_characters.cc,
	* src/debug/show_info_x_height.cc,
	* src/debug/show_links_bbox_h_ratio.cc,
	* src/debug/show_links_left_right_links_validation.cc: Make
	compile again.

	* tests/unit_test/unit-tests.mk: Regen.

	* text/extract_lines.hh: Update with latest changes.

	* text/recognition.hh: Check whether a line is hidden or not.

	* debug/char_space_image.hh,
	* debug/line_info_image.hh: New.

	* text/clean_inplace.hh,
	* text/recognition.hh: Disable some debug output.

	scribo/src/Makefile.am: Add a new rule.

	scribo/src/text_recognition_in_picture.cc: New.

	* scribo/text/look_like_text_lines.hh: New.

	* scribo/text/merging.hh: Make use of
	text::look_like_text_lines.

Conflicts:
	milena/ChangeLog
	milena/mln/core/point.hh
	milena/tests/io/magick/save.cc
	scribo/Makefile.am
	scribo/core/def/lbl_type.hh
	scribo/core/object_image.hh
	scribo/demo/Makefile.am
	scribo/src/binarization/sauvola_ms.cc
	scribo/src/debug/Makefile.am
	scribo/table/internal/connect_lines.hh
	scribo/test.cc
	scribo/tests/toolchain/Makefile.am
	scribo/text/clean.hh

	* tests/core/other/box_runstart_piter.cc,
	* tests/geom/translate.cc: Fix test.

	* doc/figures/fill-subdomain-3.ppm,
	* doc/figures/ima2d-rot-2.ppm,
	* doc/figures/labeling-compute-2.ppm,
	* doc/figures/tuto3_colorize-2.ppm,
	* doc/figures/tuto4_genericity_and_algorithms-5.ppm: Update
	generated images.

	* mln/convert/from_to.hxx: Add new prototypes.

	* mln/core/point.hh: Add new from_to overloads. Remove specialized
	constructors causing ambiguities.

	* test_labelling_2.cc: New file.
	* test_labelling_3.cc: New file.

	Implement the first version with vectors and matrices.

	* mln/clustering/k_mean.hh: New library component.

	* use/clustering/k_mean: New directory.
	* use/clustering/k_mean/Makefile.am: New makefile.
	* use/clustering/k_mean/k_mean.cc: New source file.

	* tests/clustering/k_mean: New directory.
	* tests/clustering/k_mean/Makefile.am: New makefile.
	* tests/clustering/k_mean/k_mean.cc: New source file.

	Implement the second version with image and working in 1d.

	* mln/clustering/kmean1d.hh: New library component.

	* use/clustering/kmean1d: New directory.
	* use/clustering/kmean1d/Makefile.am: New makefile.
	* use/clustering/kmean1d/kmean1d.cc: New source file.

	* demo/clustering/kmean1d: New directory.
	* demo/clustering/kmean1d/Makefile.am: New makefile.
	* demo/clustering/kmean1d/kmean1d.cc: New source file.

	Implement transformation between RG space and RGB space.

	* mln/fun/v2v/rg_to_rgb.hh: New library component.
	* use/fun/v2v/rg_to_rgb: New directory.
	* use/fun/v2v/rg_to_rgb/Makefile.am: New makefile.
	* use/fun/v2v/rg_to_rgb/rg_to_rgb.cc: New source file.

	Implement the third version working in 2d (r/g).

	* mln/clustering/kmean2d.hh: New library component.

	* use/clustering/kmean2d: New directory.
	* use/clustering/kmean2d/Makefile.am: New makefile.
	* use/clustering/kmean2d/kmean2d.cc: New source file.

	* demo/clustering/kmean2d: New directory.
	* demo/clustering/kmean2d/Makefile.am: New makefile.
	* demo/clustering/kmean2d/kmean2d.cc: New source file.

	Implement the fourth version working in 3d (rgb).

	* mln/clustering/kmean3d.hh: New library component.

	* use/clustering/kmean3d: New directory.
	* use/clustering/kmean3d/Makefile.am: New makefile.
	* use/clustering/kmean3d/kmean3d.cc: New source file.

	* demo/clustering/kmean3d: New directory.
	* demo/clustering/kmean3d/Makefile.am: New makefile.
	* demo/clustering/kmean3d/kmean3d.cc: New source file.

	Implement the fith version as a function (working in rgb space).

	* mln/clustering/kmean_rgb.hh: New library component.

	* use/clustering/kmean_rgb: New directory.
	* use/clustering/kmean_rgb/Makefile.am: New makefile.
	* use/clustering/kmean_rgb/kmean_rgb.cc: New source file.

	* demo/clustering/kmean_rgb: New directory.
	* demo/clustering/kmean_rgb/Makefile.am: New makefile.
	* demo/clustering/kmean_rgb/kmean_rgb.cc: New source file.

	Benchmark distance algorithm for the kmean algorithm.

	* bench/clustering/distance: New directory.
	* bench/clustering/distance/Makefile.am: New makefile.
	* bench/clustering/distance/distance.cc: New source file.

	* mln/accu/stat/histo1d.hh: New header file.
	* mln/accu/stat/histo2d.hh: New header file.
	* mln/accu/stat/histo3d_hsl.hh: New header file.
	* mln/accu/stat/histo3d_rgb.hh: New header file.
	* mln/clustering/k_mean.hh: New header file.
	* mln/clustering/kmean1d.hh: New header file.
	* mln/clustering/kmean2d.hh: New header file.
	* mln/clustering/kmean3d.hh: New header file.
	* mln/clustering/kmean_rgb.hh: New header file.
	* mln/display/display_histo.hh: New header file.
	* mln/display/project_histo.hh: New header file.
	* mln/fun/p2b/achromatic.hh: New header file.
	* mln/fun/p2b/component_equals.hh: New header file.
	* mln/fun/v2v/achromatism.hh: New header file.
	* mln/fun/v2v/hue_concentration.hh: New header file.
	* mln/fun/v2v/int_u16_to_int_u14.hh: New header file.
	* mln/fun/v2v/int_u16_to_int_u14.hh: New header file.
	* mln/fun/v2v/log.hh: New header file.
	* mln/fun/v2v/rg_to_rgb.hh: New header file.
	* mln/fun/v2v/rgb8_to_int_u8: New header file.
	* mln/fun/v2v/rgb_to_achromastism_map.hh: New header file.
	* mln/fun/v2v/rgb_to_hsv.hh: New header file.
	* mln/fun/v2v/rgb_to_hue_map.hh: New header file.
	* mln/fun/v2v/rgb_to_saturation_map.hh: New header file.
	* mln/fun/v2v/rgb_to_value_map.hh: New header file.
	* mln/img_path.hh: New header file.
	* mln/io/plot/save_image_sh.hh: New header file.
	* mln/math/cell.hh: New header file.
	* mln/math/floor.hh: New header file.
	* tests/accu/stat/histo1d/Makefile.am: New makefile.
	* tests/accu/stat/histo1d/histo1d.cc: New source.
	* tests/accu/stat/histo2d/Makefile.am: New makefile.
	* tests/accu/stat/histo2d/histo2d.cc: New source.

	* ok/mln/img_path.hh: New header file.
	* ok/mln/accu/histo/histo1d.hh: New header file.
	* ok/mln/accu/histo/histo2d.hh: New header file.
	* ok/mln/accu/histo/histo3d.hh: New header file.
	* ok/test/accu/histo/gaussian.sh: New gnuplot script file.
	* ok/test/accu/histo/histo1d.cc: New source file.