Commits · e2b7e14d957230d71d886bc0756758564d137d34 · Olena / olena

11 Jun, 2009 2 commits

Fix Scribo · e2b7e14d

Guillaume Lazzara authored Jun 11, 2009

	* core/all.hh
	* debug/all.hh
	* text/all.hh
	* filter/all.hh
	* table/all.hh

	* demo/Makefile.am
	* src/Makefile.am
	* src/extract/primitive/Makefile.am

	* core/erase_bboxes.hh: move...
	* core/erase_objects.hh: ...here.

	* debug/save_textbboxes_image.hh: move...
	* debug/save_bboxes_image.hh: ...here.

	* debug/save_label_image.hh,
	* debug/save_linked_bboxes_image.hh,
	* debug/save_linked_textbboxes_image.hh,
	* debug/usage.hh,
	* extract/lines_discontinued.hh,
	* extract/primitive/canvas.hh,
	* extract/primitive/cells.hh,
	* extract/primitive/lines_discontinued.hh,
	* filter/small_objects.hh,
	* filter/thin_objects.hh,
	* make/influence_zone_graph.hh,
	* src/binarization/simple.cc,
	* src/extract/primitive/extract_discontinued_hlines.cc,
	* src/extract/primitive/extract_discontinued_lines.cc,
	* src/extract/primitive/extract_discontinued_vlines.cc,
	* src/extract/primitive/extract_thick_hlines.cc,
	* src/extract/primitive/extract_thick_vlines.cc,
	* src/extract/primitive/find_discontinued_lines.cc,
	* src/extract_text_double_link.cc,
	* src/extract_text_double_several_links.cc,
	* src/extract_text_graph.cc,
	* src/extract_text_several_graph.cc,
	* src/extract_text_several_left_links.cc,
	* src/extract_text_single_link.cc,
	* src/morpho.cc,
	* src/negate.cc,
	* src/preprocess.cc,
	* src/preprocessing/unskew.cc,
	* src/recognition.cc,
	* src/superpose.cc,
	* src/table/erase.cc,
	* src/table/extract.cc,
	* src/table_rebuild_opening.cc,
	* src/table_rebuild_rank.cc,
	* src/text_in_photo.cc,
	* src/thin_bboxes.cc,
	* table/align_lines_horizontaly.hh,
	* table/align_lines_verticaly.hh,
	* table/connect_horizontal_lines.hh,
	* table/connect_vertical_lines.hh,
	* table/erase.hh,
	* table/extract.hh,
	* table/internal/align_lines.hh,
	* table/internal/connect_lines.hh,
	* table/internal/repair_lines.hh,
	* table/rebuild.hh,
	* table/repair_horizontal_lines.hh,
	* table/repair_vertical_lines.hh,
	* tests/filter/small_and_large_bboxes.cc,
	* tests/preprocessing/unskew.cc,
	* tests/table/extract_lines_with_rank.cc,
	* tests/table/repair_lines.cc,
	* text/clean.hh,
	* text/extract_lines.hh,
	* text/grouping/group_from_double_link.hh,
	* text/grouping/group_from_graph.hh,
	* text/grouping/group_from_single_link.hh,
	* text/grouping/group_with_graph.hh,
	* text/grouping/group_with_several_graphes.hh,
	* text/grouping/group_with_several_right_links.hh,
	* text/grouping/internal/find_graph_link.hh,
	* text/grouping/internal/find_right_link.hh,
	* text/grouping/internal/update_graph_link.hh,
	* text/grouping/internal/update_link_array.hh: fix compilation.
	  - Add missing includes.
	  - Use object image.

	* tests/unit_test/build_unit_test.sh: do not use some files for unit
	tests.

	* tests/unit_test/unit-tests.mk: update list.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4098 4aad255d-cdde-0310-9447-f3009e2ae8c0

e2b7e14d

Add Scribo's demo GUI. · 03b88fdc

Guillaume Lazzara authored Jun 11, 2009

	* demo/Makefile.am,
	* demo/demo.pro,
	* demo/demo.qrc: build system based on qmake-qt4.

	* demo/icons/document-open.png,
	* demo/icons/edit-find.png,
	* demo/icons/format-indent-more.png,
	* demo/icons/go-next.png,
	* demo/icons/image-x-generic.png,
	* demo/icons/list-add.png,
	* demo/icons/ocr.png,
	* demo/icons/text-x-generic.png,
	* demo/icons/view-refresh.png,
	* demo/icons/x-office-spreadsheet.png: icon set.

	* demo/src/main.cc,
	* demo/src/mainwindow.cc,
	* demo/src/mainwindow.hh,
	* demo/ui/mainwindow.ui: main classes.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4097 4aad255d-cdde-0310-9447-f3009e2ae8c0

03b88fdc

10 Jun, 2009 38 commits

Add scribo to SUBDIRS. · 3061459a

Roland Levillain authored Jun 10, 2009

	* Makefile.am (SUBDIRS) [ENABLE_SCRIBO]: Add scribo.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4096 4aad255d-cdde-0310-9447-f3009e2ae8c0

3061459a

Have SCRIBO compile. · e1a329b0

Roland Levillain authored Jun 10, 2009

	* binarization/simple.hh,
	* debug/save_linked_textbboxes_image.hh,
	* debug/save_table_image.hh,
	* debug/save_textbboxes_image.hh,
	* src/morpho.cc,
	* src/table_rebuild_rank.cc,
	* src/thin_bboxes.cc,
	* table/internal/align_lines.hh,
	* table/internal/repair_lines.hh,
	* text/extract_lines.hh,
	* text/recognition.hh:
	Adjust paths and names.
	* text/grouping/group_from_single_link.hh:
	Include scribo/make/text.hh.
	* src/Makefile.am (bin_PROGRAMS): Move
	extract_text_double_link,
	extract_text_double_several_links,
	extract_text_graph,
	extract_text_several_graph,
	extract_text_several_left_links,
	extract_text_single_link,
	recognition,
	table_rebuild_opening,
	table_rebuild_rank and
	thin_bboxes...
	(EXTRA_DIST): ...here.
	(extract_text_double_link_SOURCES)
	(extract_text_double_several_links_SOURCES)
	(extract_text_graph_SOURCES)
	(extract_text_several_graph_SOURCES)
	(extract_text_several_left_links_SOURCES)
	(extract_text_single_link_SOURCES)
	(recognition_SOURCES)
	(recognition_CXXFLAGS)
	(recognition_LDFLAGS)
	(table_rebuild_opening_SOURCES)
	(table_rebuild_rank_SOURCES)
	(thin_bboxes_SOURCES):
	Disable.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4095 4aad255d-cdde-0310-9447-f3009e2ae8c0

e1a329b0

Distribute tests/ properly. · bce19e6d

Roland Levillain authored Jun 10, 2009

	* tests/Makefile.am (SUBDIRS): Add extract.
	(EXTRA_DIST): Add tools/pretty_check.sh.
	* tests/unit_test/Makefile.am (EXTRA_DIST): Add build_unit_test.sh.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4094 4aad255d-cdde-0310-9447-f3009e2ae8c0

bce19e6d

Distribute doc/ properly. · f026c6f5

Roland Levillain authored Jun 10, 2009

	* doc/Makefile.am (SUBDIRS): Add ref_guide and tutorial.
	(EXTRA_DIST): Add generate_dist_files.sh.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4093 4aad255d-cdde-0310-9447-f3009e2ae8c0

f026c6f5

Makefile.am (wrappers): Add config.i. · 5235748a

Roland Levillain authored Jun 10, 2009

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4092 4aad255d-cdde-0310-9447-f3009e2ae8c0

5235748a

Distribute apps/statues properly. · d998a14f

Roland Levillain authored Jun 10, 2009

	* apps/statues/Makefile.am (mesh_complex_skel_SOURCES):
	Add save_bin_alt.hh.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4091 4aad255d-cdde-0310-9447-f3009e2ae8c0

d998a14f

Regen some reference images of the documentation. · 50c63527

Roland Levillain authored Jun 10, 2009

	* doc/figures/fill-subdomain-2.ppm,
	* doc/figures/fill-subdomain-3.ppm,
	* doc/figures/labeling-compute-2.ppm,
	* doc/figures/tuto3_colorize-2.ppm,
	* doc/figures/tuto4_genericity_and_algorithms-5.ppm:
	Regen.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4090 4aad255d-cdde-0310-9447-f3009e2ae8c0

50c63527

doc/tutorial/tutorial.tex: Disable FIXMEs (\tofix commands). · 76e2095b
Roland Levillain authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4089 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
76e2095b

Fix the generation of the tutorial. · 6c1e4697

Roland Levillain authored Jun 10, 2009

	* doc/tutorial/tutorial.tex: Use \color instead of \colortext.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4088 4aad255d-cdde-0310-9447-f3009e2ae8c0

6c1e4697

Disable very long tests in apps/statues. · b6c0d713

Roland Levillain authored Jun 10, 2009

	* apps/statues/test-mesh-complex-max-curv-segm.in,
	* apps/statues/test-mesh-complex-segm.in,
	* apps/statues/test-mesh-complex-skel.in,
	* apps/statues/test-mesh-segm.in:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4087 4aad255d-cdde-0310-9447-f3009e2ae8c0

b6c0d713

tests/labeling/colorize.cc: Remove non-deterministic assertion. · becdcfcf
Roland Levillain authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4086 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
becdcfcf

Fix reference guide. · 9a518adf

Fabien Freling authored Jun 10, 2009

	* doc/ref_guide/ref_guide.tex: Fix some errors and remove missing
	parts.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4085 4aad255d-cdde-0310-9447-f3009e2ae8c0

9a518adf

Correct errors in tutorial. · 5b41d043

Edwin Carlinet authored Jun 10, 2009

	* tutorial.tex: Correct errors.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4084 4aad255d-cdde-0310-9447-f3009e2ae8c0

5b41d043

Set flags for optional dependencies in tests. · 34d345b7

Roland Levillain authored Jun 10, 2009

	* tests/tests.mk
	(GDCM_CPPFLAGS, GDCM_LDFLAGS)
	(CFITSIO_CPPFLAGS, CFITSIO_LDFLAGS)
	(MAGICKXX_CPPFLAGS, MAGICKXX_LDFLAGS)
	(TIFF_CPPFLAGS, TIFF_LDFLAGS):
	New variables.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4083 4aad255d-cdde-0310-9447-f3009e2ae8c0

34d345b7

Fix Automake macro OLN_WITH_LIB (again). · 95689f73

Roland Levillain authored Jun 10, 2009

	* m4/oln-with-lib.m4 (_OLN_WITH_LIB): Set $5_CPPFLAGS instead of
	$5_CXXFLAGS.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4082 4aad255d-cdde-0310-9447-f3009e2ae8c0

95689f73

Update copyright headers in Swilena/Python. · dd624519

Roland Levillain authored Jun 10, 2009

	* python/box2d-misc.py,
	* python/data.py,
	* python/dynamic-image2d-misc.py,
	* python/image2d-misc.py,
	* python/morpho-fun.py,
	* python/morpho-segm.py,
	* python/sps-common.in,
	* python/sps.py,
	* python/swilena.py:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4081 4aad255d-cdde-0310-9447-f3009e2ae8c0

dd624519

Update copyright headers in Swilena. · fb765d3d

Roland Levillain authored Jun 10, 2009

	* box.ixx,
	* box2d.i,
	* box2d_piter.i,
	* box_piter.ixx,
	* ch_value.ixx,
	* concat.ixx,
	* concrete.ixx,
	* config.i,
	* coord.ixx,
	* dpoint2d.i,
	* dynamic_image2d.i,
	* fill.ixx,
	* image2d.ixx,
	* image2d_int.i,
	* image2d_int_u8.i,
	* int_u.ixx,
	* int_u32.i,
	* int_u8.i,
	* intp.ixx,
	* morpho.ixx,
	* neighb2d.i,
	* pgm.ixx,
	* point2d.i,
	* println.ixx,
	* python-utils.ixx,
	* window2d.i:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4080 4aad255d-cdde-0310-9447-f3009e2ae8c0

fb765d3d

Aestetic changes and cleanup in documentation and comments. · 59031866

Roland Levillain authored Jun 10, 2009

	* mln/core/image/complex_image.hh,
	* mln/core/var.hh,
	* mln/util/line_graph.hh:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4079 4aad255d-cdde-0310-9447-f3009e2ae8c0

59031866

Stop using \arg instead of \param or \tparam in documentation (cont). · 07c1a4b8

Roland Levillain authored Jun 10, 2009

	* sandbox/abraham/mln/transform/fft.hh,
	* sandbox/nivault/dmap.hh:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4078 4aad255d-cdde-0310-9447-f3009e2ae8c0

07c1a4b8

Stop using \arg instead of \param or \tparam in documentation. · f33aa024

Roland Levillain authored Jun 10, 2009

	* mln/core/faces_psite.hh,
	* mln/core/image/complex_image.hh,
	* mln/core/internal/p_complex_piter_base.hh,
	* mln/core/internal/site_set_base.hh,
	* mln/core/site_set/complex_psite.hh,
	* mln/core/site_set/p_complex.hh,
	* mln/geom/complex_geometry.hh,
	* mln/topo/adj_higher_dim_connected_n_face_iter.hh,
	* mln/topo/adj_higher_face_iter.hh,
	* mln/topo/adj_lower_dim_connected_n_face_iter.hh,
	* mln/topo/adj_lower_face_iter.hh,
	* mln/topo/adj_lower_higher_face_iter.hh,
	* mln/topo/attic/faces_iter.hh,
	* mln/topo/center_only_iter.hh,
	* mln/topo/centered_iter_adapter.hh,
	* mln/topo/face_iter.hh,
	* mln/topo/internal/complex_iterator_base.hh,
	* mln/topo/internal/complex_relative_iterator_base.hh,
	* mln/topo/internal/complex_relative_iterator_sequence.hh,
	* mln/topo/internal/complex_set_iterator_base.hh,
	* mln/topo/n_face_iter.hh,
	* mln/topo/static_n_face_iter.hh:
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4077 4aad255d-cdde-0310-9447-f3009e2ae8c0

f33aa024

Typos in comments. · 9e562533

Roland Levillain authored Jun 10, 2009

	* mln/core/image/complex_image.hh (complex_image<D, G, V>::lvalue)
	* trash/bgraph_image.hh (bgraph_image<P, V>::lvalue)
	* trash/graph_image.hh (graph_image<P, V>::lvalue)
	* trash/line_graph_image.hh (line_graph_image<P, V>::lvalue):
	Here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4076 4aad255d-cdde-0310-9447-f3009e2ae8c0

9e562533

Use \tparam properly. · 1c4a86a7

Roland Levillain authored Jun 10, 2009

	* milena/mln/core/image/complex_image.hh,
	* milena/mln/core/site_set/p_complex.hh,
	* milena/mln/util/line_graph.hh,
	* milena/trash/bgraph_image.hh,
	* milena/trash/graph_image.hh,
	* milena/trash/line_graph_image.hh:
	Use \p instead of \tparam when highlighting a template parameter
	within a sentence.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4075 4aad255d-cdde-0310-9447-f3009e2ae8c0

1c4a86a7

Fix mln::io::abort(). · 25f37cec

Roland Levillain authored Jun 10, 2009

	* mln/io/abort.hh (mln::io::abort): Delegate to std::abort instead
	of std::exit.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4074 4aad255d-cdde-0310-9447-f3009e2ae8c0

25f37cec

tests/unit_test/unit-tests.mk: Regen. · c22b5421

Roland Levillain authored Jun 10, 2009

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4073 4aad255d-cdde-0310-9447-f3009e2ae8c0

c22b5421

Regen Makefile helpers. · 26821df9

Roland Levillain authored Jun 10, 2009

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

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4072 4aad255d-cdde-0310-9447-f3009e2ae8c0

26821df9

Complete the installation of the Make rule `tests' in Olena. · 1ae316e8

Roland Levillain authored Jun 10, 2009

	* Makefile.am (LOCAL_RECURSIVE_TARGETS): Add tests.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4071 4aad255d-cdde-0310-9447-f3009e2ae8c0

1ae316e8

Complete the installation of the Make rule `tests' in Milena. · b1ad1efc

Roland Levillain authored Jun 10, 2009

	* Makefile.am (tests): New phony target.
	* tests/world/Makefile.am: Include milena/tests/tests.mk.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4070 4aad255d-cdde-0310-9447-f3009e2ae8c0

b1ad1efc

Set missing flags in Makefiles. · 657b8b3d

Roland Levillain authored Jun 10, 2009

	* tests/Makefile.am (all_headers_CPPFLAGS, all_headers_LDFLAGS)
	* tests/io/dicom/Makefile.am (AM_CPPFLAGS, AM_LDFLAGS):
	New.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4069 4aad255d-cdde-0310-9447-f3009e2ae8c0

657b8b3d

Do not exercise parts depening on optional dependencies. · 16b18563

Roland Levillain authored Jun 10, 2009

	* tests/unit_test/build_unit_test.sh (HEADERS): Ignore files
	depending on optional packages (GDCM, CFITSIO, Magick++, TIFF).

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4068 4aad255d-cdde-0310-9447-f3009e2ae8c0

16b18563

mln/io/ppms/load.hh: Repair copyright header. · 0f5562b0
Roland Levillain authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4067 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
0f5562b0

Simplify all_headers tests: keep a single one at the top-level. · 3b9fd0f1

Roland Levillain authored Jun 10, 2009

	* milena/tests/arith/all_headers.cc,
	* milena/tests/border/all_headers.cc,
	* milena/tests/display/all_headers.cc,
	* milena/tests/draw/all_headers.cc,
	* milena/tests/logical/all_headers.cc,
	* milena/tests/util/all_headers.cc:
	Remove.
	* milena/tests/arith/Makefile.am,
	* milena/tests/border/Makefile.am,
	* milena/tests/data/Makefile.am,
	* milena/tests/draw/Makefile.am,
	* milena/tests/logical/Makefile.am
	(check_PROGRAM): Remove all_headers.
	(all_headers_SOURCES): Remove.
	* milena/tests/all_headers.cc,
	* milena/tests/display/Makefile.am:
	Clean up.
	Aesthetic changes.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4066 4aad255d-cdde-0310-9447-f3009e2ae8c0

3b9fd0f1

6Update generated files. · a31dad67

Guillaume Lazzara authored Jun 10, 2009

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

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4065 4aad255d-cdde-0310-9447-f3009e2ae8c0

a31dad67

mln/io/ppms/load.hh: fix copyright header. · 6441f0ae
Guillaume Lazzara authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4064 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
6441f0ae
tests/data/Makefile.am: Remove transform from xfail_tests. · c2415c72
Guillaume Lazzara authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4063 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
c2415c72

Add new distance and minor updates. · ccb8dc88

Fabien Freling authored Jun 10, 2009

	* fabien/igr/Makefile.rules: Remove Mac OS X specific framework.
	* fabien/igr/Makefile: Small update.
	* fabien/igr/check_dist.sh: Add new distance.
	* fabien/igr/check_edges.sh: Add new distance.
	* fabien/igr/crop.cc: Small update.
	* fabien/igr/dist_edges.cc: Add new distance.
	* fabien/igr/filter.cc: Small update.
	* fabien/igr/mean_median_label.cc: Small update.
	* fabien/igr/wst_edges.cc: Small update.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4062 4aad255d-cdde-0310-9447-f3009e2ae8c0

ccb8dc88

Repair more copyright headers. · e8dc4fe7

Guillaume Lazzara authored Jun 10, 2009

	* tests/core/image/edge_image.cc,
	* tests/core/image/graph_image.cc,
	* tests/core/image/line_graph_image.cc,
	* tests/core/image/vertex_image.cc,
	* tests/io/plot/load.cc,
	* tests/io/tiff/tiff2pbm.cc,
	* tests/util/line_graph.cc,
	* tests/world/binary_2d/enlarge.cc: repair copyright headers.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4061 4aad255d-cdde-0310-9447-f3009e2ae8c0

e8dc4fe7

mln/geom/seeds2tiling.hh: fix an invalid reference. · 3cfd04cd
Guillaume Lazzara authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4060 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
3cfd04cd
tests/fun/v2v/Makefile.am: remove hsl_to_rgb from xfail_tests. · e91ac4ec
Guillaume Lazzara authored Jun 10, 2009
```
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4059 4aad255d-cdde-0310-9447-f3009e2ae8c0
```
e91ac4ec