- Olena-patches

last-svn-commit-168-g5758dd7 configure.ac: Clean up a bit.
by Roland Levillain 03 Jun '10

03 Jun '10

--- external/trimesh/ChangeLog | 4 ++++ external/trimesh/configure.ac | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 8e79d5d..d105ff4 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -1,3 +1,7 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Clean up a bit. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Remove improper copyright headers in Trimesh. diff --git a/external/trimesh/configure.ac b/external/trimesh/configure.ac index 5ba80ce..27152d2 100644 --- a/external/trimesh/configure.ac +++ b/external/trimesh/configure.ac @@ -1,6 +1,3 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - AC_PREREQ([2.61]) AC_INIT([trimesh2], [2.8], [smr at princeton edu]) -- 1.5.6.5

1 0

last-svn-commit-167-ga32f582 Clean up a bit Scribo's Makefiles.
by Roland Levillain 03 Jun '10

03 Jun '10

* Makefile.am, * demo/Makefile.am, * src/Makefile.am, * src/binarization/Makefile.am, * src/debug/Makefile.am, * src/filter/Makefile.am, * src/misc/Makefile.am, * src/multi_scale/Makefile.am, * src/preprocessing/Makefile.am, * src/primitive/Makefile.am, * src/primitive/extract/Makefile.am, * src/primitive/find/Makefile.am, * src/primitive/group/Makefile.am, * src/table/Makefile.am, * src/text/Makefile.am, * tests/Makefile.am, * tests/filter/Makefile.am, * tests/preprocessing/Makefile.am, * tests/table/Makefile.am, * tests/text/Makefile.am, * tests/unit_test/Makefile.am: Here. --- scribo/ChangeLog | 27 +++++++++++++++++++++++++++ scribo/Makefile.am | 2 -- scribo/demo/Makefile.am | 2 -- scribo/src/Makefile.am | 3 --- scribo/src/binarization/Makefile.am | 4 ---- scribo/src/debug/Makefile.am | 3 --- scribo/src/filter/Makefile.am | 3 --- scribo/src/misc/Makefile.am | 4 ---- scribo/src/multi_scale/Makefile.am | 4 ---- scribo/src/preprocessing/Makefile.am | 3 --- scribo/src/primitive/Makefile.am | 3 --- scribo/src/primitive/extract/Makefile.am | 4 ---- scribo/src/primitive/find/Makefile.am | 5 ----- scribo/src/primitive/group/Makefile.am | 3 --- scribo/src/table/Makefile.am | 3 --- scribo/src/text/Makefile.am | 3 --- scribo/tests/Makefile.am | 2 -- scribo/tests/filter/Makefile.am | 3 --- scribo/tests/preprocessing/Makefile.am | 3 --- scribo/tests/table/Makefile.am | 3 --- scribo/tests/text/Makefile.am | 3 --- scribo/tests/unit_test/Makefile.am | 3 --- 22 files changed, 27 insertions(+), 66 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0627bc3..3c7fe21 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,30 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Scribo's Makefiles. + + * Makefile.am, + * demo/Makefile.am, + * src/Makefile.am, + * src/binarization/Makefile.am, + * src/debug/Makefile.am, + * src/filter/Makefile.am, + * src/misc/Makefile.am, + * src/multi_scale/Makefile.am, + * src/preprocessing/Makefile.am, + * src/primitive/Makefile.am, + * src/primitive/extract/Makefile.am, + * src/primitive/find/Makefile.am, + * src/primitive/group/Makefile.am, + * src/table/Makefile.am, + * src/text/Makefile.am, + * tests/Makefile.am, + * tests/filter/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/table/Makefile.am, + * tests/text/Makefile.am, + * tests/unit_test/Makefile.am: + Here. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Add missing copyright headers in Scribo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 3fb05fd..0f98de6 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -14,8 +14,6 @@ # 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. - SUBDIRS = tests src .PHONY: bin diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index bab9f0f..9fcd083 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -14,8 +14,6 @@ # 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 .PHONY : demo diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6cc4229..5f2367f 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 531d4cf..4adf1a6 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -13,9 +13,6 @@ # # 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 @@ -29,4 +26,3 @@ sauvola_SOURCES = sauvola.cc sauvola_ms_SOURCES = sauvola_ms.cc sauvola_pgm_SOURCES = sauvola_pgm.cc simple_SOURCES = simple.cc - diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 36bbfcb..7ec5669 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index e8a2b9c..5074b49 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am index dc64bb9..693b579 100644 --- a/scribo/src/misc/Makefile.am +++ b/scribo/src/misc/Makefile.am @@ -13,9 +13,6 @@ # # 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 @@ -31,4 +28,3 @@ morpho_SOURCES = morpho.cc negate_SOURCES = negate.cc rectangularity_SOURCES = rectangularity.cc superpose_SOURCES = superpose.cc - diff --git a/scribo/src/multi_scale/Makefile.am b/scribo/src/multi_scale/Makefile.am index f3dfb42..9964153 100644 --- a/scribo/src/multi_scale/Makefile.am +++ b/scribo/src/multi_scale/Makefile.am @@ -13,9 +13,6 @@ # # 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 @@ -23,4 +20,3 @@ bin_PROGRAMS = \ find_lines find_lines_SOURCES = find_lines.cc - diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8c1cd80..4f1195d 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am index 44d9434..7e46a66 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 7e1ea78..6f20ea3 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -13,9 +13,6 @@ # # 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 @@ -34,4 +31,3 @@ extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc extract_thick_vlines_SOURCES = extract_thick_vlines.cc extract_thick_hlines_SOURCES = extract_thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc - diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 93a3920..3b5dbd2 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -13,9 +13,6 @@ # # 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 @@ -32,5 +29,3 @@ find_pattern_lines_SOURCES = find_pattern_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/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index e52e373..92a81fc 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 334d5f9..7fc7008 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index b84e0dd..39c7811 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -13,9 +13,6 @@ # # 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 diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index e36d250..163ecae 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -16,8 +16,6 @@ include $(srcdir)/tests.mk -## Process this file through Automake to create Makefile.in. - SUBDIRS = \ filter \ preprocessing \ diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index fd3299e..e466523 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -13,9 +13,6 @@ # # 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/tests/tests.mk diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index 5182bc0..dc139fa 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # 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/tests/tests.mk diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 0c15a63..3427e6b 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -13,9 +13,6 @@ # # 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/tests/tests.mk diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am index f6cb0e5..0d48025 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/text/Makefile.am @@ -13,9 +13,6 @@ # # 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/tests/tests.mk diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 0d3a591..8b3e47f 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -13,9 +13,6 @@ # # 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/tests/tests.mk -- 1.5.6.5

1 0

last-svn-commit-166-g635ff15 Clean up a bit Swilena's Makefiles.
by Roland Levillain 03 Jun '10

03 Jun '10

* Makefile.am, python/Makefile.am: Here. --- swilena/ChangeLog | 6 ++++++ swilena/Makefile.am | 3 --- swilena/python/Makefile.am | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..6a4269c 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Swilena's Makefiles. + + * Makefile.am, python/Makefile.am: Here. + 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> * neighb2d.i: Aesthetic changes. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index c6fd023..109fb2e 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -14,9 +14,6 @@ # 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 produce Makefile.in. - SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..dee4255 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -13,9 +13,6 @@ # # 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 produce Makefile.in. ## ------------------ ## ## Generic material. ## -- 1.5.6.5

1 0

last-svn-commit-165-g70dedf8 Clean up a bit Milena's Makefiles.
by Roland Levillain 03 Jun '10

03 Jun '10

* Makefile.am, * apps/mesh-segm-skel/Makefile.am, * mesh/Makefile.am, * tests/Makefile.am, * tests/accu/Makefile.am, * tests/accu/image/Makefile.am, * tests/accu/math/Makefile.am, * tests/accu/shape/Makefile.am, * tests/accu/site_set/Makefile.am, * tests/accu/stat/Makefile.am, * tests/algebra/Makefile.am, * tests/arith/Makefile.am, * tests/binarization/Makefile.am, * tests/border/Makefile.am, * tests/canvas/Makefile.am, * tests/canvas/browsing/Makefile.am, * tests/canvas/morpho/Makefile.am, * tests/convert/Makefile.am, * tests/convert/impl/Makefile.am, * tests/core/Makefile.am, * tests/core/alias/Makefile.am, * tests/core/image/Makefile.am, * tests/core/image/dmorph/Makefile.am, * tests/core/image/imorph/Makefile.am, * tests/core/image/vmorph/Makefile.am, * tests/core/other/Makefile.am, * tests/core/routine/Makefile.am, * tests/core/site_set/Makefile.am, * tests/data/Makefile.am, * tests/data/approx/Makefile.am, * tests/data/naive/Makefile.am, * tests/debug/Makefile.am, * tests/display/Makefile.am, * tests/draw/Makefile.am, * tests/estim/Makefile.am, * tests/extension/Makefile.am, * tests/extract/Makefile.am, * tests/fun/Makefile.am, * tests/fun/i2v/Makefile.am, * tests/fun/p2b/Makefile.am, * tests/fun/p2p/Makefile.am, * tests/fun/p2v/Makefile.am, * tests/fun/stat/Makefile.am, * tests/fun/v2i/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/fun/vv2v/Makefile.am, * tests/fun/x2x/Makefile.am, * tests/geom/Makefile.am, * tests/graph/Makefile.am, * tests/graph/attribute/Makefile.am, * tests/histo/Makefile.am, * tests/io/Makefile.am, * tests/io/dicom/Makefile.am, * tests/io/dump/Makefile.am, * tests/io/fits/Makefile.am, * tests/io/fld/Makefile.am, * tests/io/magick/Makefile.am, * tests/io/off/Makefile.am, * tests/io/pbm/Makefile.am, * tests/io/pbms/Makefile.am, * tests/io/pfm/Makefile.am, * tests/io/pgm/Makefile.am, * tests/io/pgms/Makefile.am, * tests/io/pnm/Makefile.am, * tests/io/ppm/Makefile.am, * tests/io/ppms/Makefile.am, * tests/io/tiff/Makefile.am, * tests/labeling/Makefile.am, * tests/linear/Makefile.am, * tests/linear/gaussian/Makefile.am, * tests/linear/local/Makefile.am, * tests/literal/Makefile.am, * tests/logical/Makefile.am, * tests/make/Makefile.am, * tests/math/Makefile.am, * tests/metal/Makefile.am, * tests/metal/make/Makefile.am, * tests/metal/math/Makefile.am, * tests/morpho/Makefile.am, * tests/morpho/approx/Makefile.am, * tests/morpho/attribute/Makefile.am, * tests/morpho/closing/Makefile.am, * tests/morpho/closing/approx/Makefile.am, * tests/morpho/elementary/Makefile.am, * tests/morpho/opening/Makefile.am, * tests/morpho/opening/approx/Makefile.am, * tests/morpho/reconstruction/Makefile.am, * tests/morpho/reconstruction/by_dilation/Makefile.am, * tests/morpho/reconstruction/by_erosion/Makefile.am, * tests/morpho/tree/Makefile.am, * tests/morpho/tree/filter/Makefile.am, * tests/morpho/watershed/Makefile.am, * tests/norm/Makefile.am, * tests/opt/Makefile.am, * tests/pw/Makefile.am, * tests/registration/Makefile.am, * tests/set/Makefile.am, * tests/subsampling/Makefile.am, * tests/tag/Makefile.am, * tests/test/Makefile.am, * tests/topo/Makefile.am, * tests/topo/skeleton/Makefile.am, * tests/trace/Makefile.am, * tests/trait/Makefile.am, * tests/trait/image/Makefile.am, * tests/trait/op/Makefile.am, * tests/trait/value/Makefile.am, * tests/transform/Makefile.am, * tests/unit_test/Makefile.am, * tests/upscaling/Makefile.am, * tests/upscaling/art/Makefile.am, * tests/util/Makefile.am, * tests/value/Makefile.am, * tests/value/builtin/Makefile.am, * tests/value/concept/Makefile.am, * tests/win/Makefile.am, * tests/world/Makefile.am, * tests/world/binary_2d/Makefile.am, * tests/world/inter_pixel/Makefile.am, * tests/world/inter_pixel/dim2/Makefile.am, * tools/Makefile.am: Here. --- milena/ChangeLog | 127 ++++++++++++++++++++ milena/Makefile.am | 3 - milena/apps/mesh-segm-skel/Makefile.am | 3 - milena/mesh/Makefile.am | 3 - milena/tests/Makefile.am | 3 - milena/tests/accu/Makefile.am | 6 +- milena/tests/accu/image/Makefile.am | 3 - milena/tests/accu/math/Makefile.am | 3 - milena/tests/accu/shape/Makefile.am | 3 - milena/tests/accu/site_set/Makefile.am | 3 - milena/tests/accu/stat/Makefile.am | 3 - milena/tests/algebra/Makefile.am | 3 - milena/tests/arith/Makefile.am | 6 +- milena/tests/binarization/Makefile.am | 3 - milena/tests/border/Makefile.am | 6 +- milena/tests/canvas/Makefile.am | 7 +- milena/tests/canvas/browsing/Makefile.am | 6 +- milena/tests/canvas/morpho/Makefile.am | 3 - milena/tests/convert/Makefile.am | 3 - milena/tests/convert/impl/Makefile.am | 3 - milena/tests/core/Makefile.am | 6 +- milena/tests/core/alias/Makefile.am | 3 - milena/tests/core/image/Makefile.am | 3 - milena/tests/core/image/dmorph/Makefile.am | 3 - milena/tests/core/image/imorph/Makefile.am | 3 - milena/tests/core/image/vmorph/Makefile.am | 3 - milena/tests/core/other/Makefile.am | 3 - milena/tests/core/routine/Makefile.am | 3 - milena/tests/core/site_set/Makefile.am | 3 - milena/tests/data/Makefile.am | 3 - milena/tests/data/approx/Makefile.am | 3 - milena/tests/data/naive/Makefile.am | 3 - milena/tests/debug/Makefile.am | 3 - milena/tests/display/Makefile.am | 6 +- milena/tests/draw/Makefile.am | 6 +- milena/tests/estim/Makefile.am | 6 +- milena/tests/extension/Makefile.am | 3 - milena/tests/extract/Makefile.am | 3 - milena/tests/fun/Makefile.am | 3 - milena/tests/fun/i2v/Makefile.am | 3 - milena/tests/fun/p2b/Makefile.am | 3 - milena/tests/fun/p2p/Makefile.am | 3 - milena/tests/fun/p2v/Makefile.am | 3 - milena/tests/fun/stat/Makefile.am | 3 - milena/tests/fun/v2i/Makefile.am | 3 - milena/tests/fun/v2v/Makefile.am | 3 - milena/tests/fun/vv2v/Makefile.am | 3 - milena/tests/fun/x2x/Makefile.am | 6 +- milena/tests/geom/Makefile.am | 6 +- milena/tests/graph/Makefile.am | 3 - milena/tests/graph/attribute/Makefile.am | 3 - milena/tests/histo/Makefile.am | 6 +- milena/tests/io/Makefile.am | 6 +- milena/tests/io/dicom/Makefile.am | 3 - milena/tests/io/dump/Makefile.am | 5 +- milena/tests/io/fits/Makefile.am | 3 - milena/tests/io/fld/Makefile.am | 5 +- milena/tests/io/magick/Makefile.am | 3 - milena/tests/io/off/Makefile.am | 3 - milena/tests/io/pbm/Makefile.am | 5 +- milena/tests/io/pbms/Makefile.am | 5 +- milena/tests/io/pfm/Makefile.am | 3 - milena/tests/io/pgm/Makefile.am | 3 - milena/tests/io/pgms/Makefile.am | 5 +- milena/tests/io/pnm/Makefile.am | 3 - milena/tests/io/ppm/Makefile.am | 3 - milena/tests/io/ppms/Makefile.am | 5 +- milena/tests/io/tiff/Makefile.am | 3 - milena/tests/labeling/Makefile.am | 6 +- milena/tests/linear/Makefile.am | 5 +- milena/tests/linear/gaussian/Makefile.am | 3 - milena/tests/linear/local/Makefile.am | 6 +- milena/tests/literal/Makefile.am | 6 +- milena/tests/logical/Makefile.am | 6 +- milena/tests/make/Makefile.am | 6 +- milena/tests/math/Makefile.am | 3 - milena/tests/metal/Makefile.am | 6 +- milena/tests/metal/make/Makefile.am | 3 - milena/tests/metal/math/Makefile.am | 6 +- milena/tests/morpho/Makefile.am | 6 +- milena/tests/morpho/approx/Makefile.am | 4 - milena/tests/morpho/attribute/Makefile.am | 3 - milena/tests/morpho/closing/Makefile.am | 3 - milena/tests/morpho/closing/approx/Makefile.am | 3 - milena/tests/morpho/elementary/Makefile.am | 3 - milena/tests/morpho/opening/Makefile.am | 3 - milena/tests/morpho/opening/approx/Makefile.am | 3 - milena/tests/morpho/reconstruction/Makefile.am | 5 - .../morpho/reconstruction/by_dilation/Makefile.am | 5 - .../morpho/reconstruction/by_erosion/Makefile.am | 5 - milena/tests/morpho/tree/Makefile.am | 5 +- milena/tests/morpho/tree/filter/Makefile.am | 3 - milena/tests/morpho/watershed/Makefile.am | 3 - milena/tests/norm/Makefile.am | 3 - milena/tests/opt/Makefile.am | 3 - milena/tests/pw/Makefile.am | 6 +- milena/tests/registration/Makefile.am | 3 - milena/tests/set/Makefile.am | 6 +- milena/tests/subsampling/Makefile.am | 3 - milena/tests/tag/Makefile.am | 3 - milena/tests/test/Makefile.am | 3 - milena/tests/topo/Makefile.am | 3 - milena/tests/topo/skeleton/Makefile.am | 3 - milena/tests/trace/Makefile.am | 3 - milena/tests/trait/Makefile.am | 6 +- milena/tests/trait/image/Makefile.am | 6 +- milena/tests/trait/op/Makefile.am | 6 +- milena/tests/trait/value/Makefile.am | 6 +- milena/tests/transform/Makefile.am | 3 - milena/tests/unit_test/Makefile.am | 3 - milena/tests/upscaling/Makefile.am | 4 - milena/tests/upscaling/art/Makefile.am | 3 - milena/tests/util/Makefile.am | 7 +- milena/tests/value/Makefile.am | 3 - milena/tests/value/builtin/Makefile.am | 6 +- milena/tests/value/concept/Makefile.am | 3 - milena/tests/win/Makefile.am | 6 +- milena/tests/world/Makefile.am | 3 - milena/tests/world/binary_2d/Makefile.am | 3 - milena/tests/world/inter_pixel/Makefile.am | 3 - milena/tests/world/inter_pixel/dim2/Makefile.am | 3 - milena/tools/Makefile.am | 3 - 122 files changed, 195 insertions(+), 411 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3355da2..929c182 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,130 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Milena's Makefiles. + + * Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * mesh/Makefile.am, + * tests/Makefile.am, + * tests/accu/Makefile.am, + * tests/accu/image/Makefile.am, + * tests/accu/math/Makefile.am, + * tests/accu/shape/Makefile.am, + * tests/accu/site_set/Makefile.am, + * tests/accu/stat/Makefile.am, + * tests/algebra/Makefile.am, + * tests/arith/Makefile.am, + * tests/binarization/Makefile.am, + * tests/border/Makefile.am, + * tests/canvas/Makefile.am, + * tests/canvas/browsing/Makefile.am, + * tests/canvas/morpho/Makefile.am, + * tests/convert/Makefile.am, + * tests/convert/impl/Makefile.am, + * tests/core/Makefile.am, + * tests/core/alias/Makefile.am, + * tests/core/image/Makefile.am, + * tests/core/image/dmorph/Makefile.am, + * tests/core/image/imorph/Makefile.am, + * tests/core/image/vmorph/Makefile.am, + * tests/core/other/Makefile.am, + * tests/core/routine/Makefile.am, + * tests/core/site_set/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/debug/Makefile.am, + * tests/display/Makefile.am, + * tests/draw/Makefile.am, + * tests/estim/Makefile.am, + * tests/extension/Makefile.am, + * tests/extract/Makefile.am, + * tests/fun/Makefile.am, + * tests/fun/i2v/Makefile.am, + * tests/fun/p2b/Makefile.am, + * tests/fun/p2p/Makefile.am, + * tests/fun/p2v/Makefile.am, + * tests/fun/stat/Makefile.am, + * tests/fun/v2i/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/fun/vv2v/Makefile.am, + * tests/fun/x2x/Makefile.am, + * tests/geom/Makefile.am, + * tests/graph/Makefile.am, + * tests/graph/attribute/Makefile.am, + * tests/histo/Makefile.am, + * tests/io/Makefile.am, + * tests/io/dicom/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/Makefile.am, + * tests/io/fld/Makefile.am, + * tests/io/magick/Makefile.am, + * tests/io/off/Makefile.am, + * tests/io/pbm/Makefile.am, + * tests/io/pbms/Makefile.am, + * tests/io/pfm/Makefile.am, + * tests/io/pgm/Makefile.am, + * tests/io/pgms/Makefile.am, + * tests/io/pnm/Makefile.am, + * tests/io/ppm/Makefile.am, + * tests/io/ppms/Makefile.am, + * tests/io/tiff/Makefile.am, + * tests/labeling/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/linear/local/Makefile.am, + * tests/literal/Makefile.am, + * tests/logical/Makefile.am, + * tests/make/Makefile.am, + * tests/math/Makefile.am, + * tests/metal/Makefile.am, + * tests/metal/make/Makefile.am, + * tests/metal/math/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/attribute/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/approx/Makefile.am, + * tests/morpho/elementary/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/approx/Makefile.am, + * tests/morpho/reconstruction/Makefile.am, + * tests/morpho/reconstruction/by_dilation/Makefile.am, + * tests/morpho/reconstruction/by_erosion/Makefile.am, + * tests/morpho/tree/Makefile.am, + * tests/morpho/tree/filter/Makefile.am, + * tests/morpho/watershed/Makefile.am, + * tests/norm/Makefile.am, + * tests/opt/Makefile.am, + * tests/pw/Makefile.am, + * tests/registration/Makefile.am, + * tests/set/Makefile.am, + * tests/subsampling/Makefile.am, + * tests/tag/Makefile.am, + * tests/test/Makefile.am, + * tests/topo/Makefile.am, + * tests/topo/skeleton/Makefile.am, + * tests/trace/Makefile.am, + * tests/trait/Makefile.am, + * tests/trait/image/Makefile.am, + * tests/trait/op/Makefile.am, + * tests/trait/value/Makefile.am, + * tests/transform/Makefile.am, + * tests/unit_test/Makefile.am, + * tests/upscaling/Makefile.am, + * tests/upscaling/art/Makefile.am, + * tests/util/Makefile.am, + * tests/value/Makefile.am, + * tests/value/builtin/Makefile.am, + * tests/value/concept/Makefile.am, + * tests/win/Makefile.am, + * tests/world/Makefile.am, + * tests/world/binary_2d/Makefile.am, + * tests/world/inter_pixel/Makefile.am, + * tests/world/inter_pixel/dim2/Makefile.am, + * tools/Makefile.am: + Here. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Add missing copyright headers in Milena. diff --git a/milena/Makefile.am b/milena/Makefile.am index 6c6a420..bac240d 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -14,9 +14,6 @@ # # 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. SUBDIRS = \ doc \ diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 0185535..5852011 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -13,9 +13,6 @@ # # 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 produce Makefile.in. # Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/external/trimesh/gluit diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index ad91888..eebfaab 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -13,9 +13,6 @@ # # 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. ## This Makefile makes use of GNU Make extensions (%-patterns, ## patsubst). We might want to turn it into something more portable diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 562078e..83f946e 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 5e8fb52..60beb52 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am index 903f0eb..141300f 100644 --- a/milena/tests/accu/image/Makefile.am +++ b/milena/tests/accu/image/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am index 14f863b..ca5358b 100644 --- a/milena/tests/accu/math/Makefile.am +++ b/milena/tests/accu/math/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am index 4677fc6..374ce89 100644 --- a/milena/tests/accu/shape/Makefile.am +++ b/milena/tests/accu/shape/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am index 6319f07..a44676e 100644 --- a/milena/tests/accu/site_set/Makefile.am +++ b/milena/tests/accu/site_set/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index ab7e52e..c331db0 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am index a954f1b..471389e 100644 --- a/milena/tests/algebra/Makefile.am +++ b/milena/tests/algebra/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index c7539a7..89dfc9e 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index 3a258fd..5ef0e81 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 9337423..80241ad 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am index 57a60c8..d8db016 100644 --- a/milena/tests/canvas/Makefile.am +++ b/milena/tests/canvas/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk @@ -25,4 +23,3 @@ check_PROGRAMS = \ chamfer chamfer_SOURCES = chamfer.cc - diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am index e5c4a19..66b5b44 100644 --- a/milena/tests/canvas/browsing/Makefile.am +++ b/milena/tests/canvas/browsing/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am index 7909349..0504c8e 100644 --- a/milena/tests/canvas/morpho/Makefile.am +++ b/milena/tests/canvas/morpho/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index ab369d9..856c143 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am index 79f9727..a7cb10c 100644 --- a/milena/tests/convert/impl/Makefile.am +++ b/milena/tests/convert/impl/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am index 81cc72b..ba4b041 100644 --- a/milena/tests/core/Makefile.am +++ b/milena/tests/core/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am index dff2fce..9c47da2 100644 --- a/milena/tests/core/alias/Makefile.am +++ b/milena/tests/core/alias/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 0bfff01..5ac8889 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am index 28445e9..3faee32 100644 --- a/milena/tests/core/image/dmorph/Makefile.am +++ b/milena/tests/core/image/dmorph/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am index aa0ccfc..b019f1c 100644 --- a/milena/tests/core/image/imorph/Makefile.am +++ b/milena/tests/core/image/imorph/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am index 40e190b..5f7eb98 100644 --- a/milena/tests/core/image/vmorph/Makefile.am +++ b/milena/tests/core/image/vmorph/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am index 9443837..85ce865 100644 --- a/milena/tests/core/other/Makefile.am +++ b/milena/tests/core/other/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am index da4d50b..2640c47 100644 --- a/milena/tests/core/routine/Makefile.am +++ b/milena/tests/core/routine/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index a67544a..8d7c317 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 213cdbe..931c980 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am index 0c33433..7ca6b8f 100644 --- a/milena/tests/data/approx/Makefile.am +++ b/milena/tests/data/approx/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am index 7a9da64..575e1fe 100644 --- a/milena/tests/data/naive/Makefile.am +++ b/milena/tests/data/naive/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am index cc44bc1..0346f1a 100644 --- a/milena/tests/debug/Makefile.am +++ b/milena/tests/debug/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am index 40752fe..bdd6d0f 100644 --- a/milena/tests/display/Makefile.am +++ b/milena/tests/display/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index 3cb7692..c823cfb 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am index d0c5bcf..2490ef9 100644 --- a/milena/tests/estim/Makefile.am +++ b/milena/tests/estim/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am index 890dff7..85f9835 100644 --- a/milena/tests/extension/Makefile.am +++ b/milena/tests/extension/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index f7b0c1c..2168f8d 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index a39cf27..82d6e89 100644 --- a/milena/tests/fun/Makefile.am +++ b/milena/tests/fun/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am index 0b33406..a3de8f9 100644 --- a/milena/tests/fun/i2v/Makefile.am +++ b/milena/tests/fun/i2v/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/fun/p2b/Makefile.am +++ b/milena/tests/fun/p2b/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am index 12ecb5d..862c78b 100644 --- a/milena/tests/fun/p2p/Makefile.am +++ b/milena/tests/fun/p2p/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/fun/p2v/Makefile.am +++ b/milena/tests/fun/p2v/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am index bda940a..aac5327 100644 --- a/milena/tests/fun/stat/Makefile.am +++ b/milena/tests/fun/stat/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am index a3dbd4e..e67e7d0 100644 --- a/milena/tests/fun/v2i/Makefile.am +++ b/milena/tests/fun/v2i/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index 872c7a5..d45fc4c 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am index 7cb53fd..d180e3d 100644 --- a/milena/tests/fun/vv2v/Makefile.am +++ b/milena/tests/fun/vv2v/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am index a7293e1..6ac5c22 100644 --- a/milena/tests/fun/x2x/Makefile.am +++ b/milena/tests/fun/x2x/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 16600dd..91fac5c 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am index 0e1349a..608b6d9 100644 --- a/milena/tests/graph/Makefile.am +++ b/milena/tests/graph/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am index b5f900b..cb07318 100644 --- a/milena/tests/graph/attribute/Makefile.am +++ b/milena/tests/graph/attribute/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am index 3bb2752..b5f7e7e 100644 --- a/milena/tests/histo/Makefile.am +++ b/milena/tests/histo/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index a069ca8..bd6c0a4 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am index da98219..d8a4ea8 100644 --- a/milena/tests/io/dicom/Makefile.am +++ b/milena/tests/io/dicom/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index cad3d5b..6ffe8cd 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -29,4 +26,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = pic.dump \ No newline at end of file +CLEANFILES = pic.dump diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index 77770ce..dd8b9d1 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am index 776526d..7cbe50b 100644 --- a/milena/tests/io/fld/Makefile.am +++ b/milena/tests/io/fld/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -28,4 +25,4 @@ fld2d_SOURCES = fld2d.cc fld3d_SOURCES = fld3d.cc fld1d_SOURCES = fld1d.cc -TESTS = $(check_PROGRAMS) \ No newline at end of file +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 0e1d9db..adb9274 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index 2ed2594..91908a0 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index 351207d..6a4fbea 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -31,4 +28,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = out.pbm \ No newline at end of file +CLEANFILES = out.pbm diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am index 1a3fc5c..81ad41b 100644 --- a/milena/tests/io/pbms/Makefile.am +++ b/milena/tests/io/pbms/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -28,4 +25,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = out.pbm \ No newline at end of file +CLEANFILES = out.pbm diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/io/pfm/Makefile.am +++ b/milena/tests/io/pfm/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index f6eef7c..f3f078d 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am index 8a4f02a..312521c 100644 --- a/milena/tests/io/pgms/Makefile.am +++ b/milena/tests/io/pgms/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -29,4 +26,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = out.pgm \ No newline at end of file +CLEANFILES = out.pgm diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/io/pnm/Makefile.am +++ b/milena/tests/io/pnm/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 913dd04..45dd419 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am index 173a9f7..219fb67 100644 --- a/milena/tests/io/ppms/Makefile.am +++ b/milena/tests/io/ppms/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -29,4 +26,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = out.ppm \ No newline at end of file +CLEANFILES = out.ppm diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am index f21e2c1..356214b 100644 --- a/milena/tests/io/tiff/Makefile.am +++ b/milena/tests/io/tiff/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index 1509d72..d7515fa 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 3bc1b01..2d51a10 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk @@ -54,4 +51,4 @@ TESTS = $(check_PROGRAMS) # FIXME: each test should clean its output, temporary output should # not be cleaned up by make. -CLEANFILES = out.pgm \ No newline at end of file +CLEANFILES = out.pgm diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index a3000c3..054f5ea 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am index bb8608c..9f53cfb 100644 --- a/milena/tests/linear/local/Makefile.am +++ b/milena/tests/linear/local/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am index 4310a95..ef86851 100644 --- a/milena/tests/literal/Makefile.am +++ b/milena/tests/literal/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index d095301..ca59622 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am index 27d65fb..34e0eff 100644 --- a/milena/tests/make/Makefile.am +++ b/milena/tests/make/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/math/Makefile.am +++ b/milena/tests/math/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am index e7e5f93..bc24893 100644 --- a/milena/tests/metal/Makefile.am +++ b/milena/tests/metal/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/metal/make/Makefile.am +++ b/milena/tests/metal/make/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am index f6b810d..cc48940 100644 --- a/milena/tests/metal/math/Makefile.am +++ b/milena/tests/metal/math/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 4a7c649..57a5ecb 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index 85fc367..35d3e1b 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/approx/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -34,4 +31,3 @@ TESTS = $(check_PROGRAMS) CLEANFILES = \ out.pbm \ ref.pbm - diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am index 1fcc2ab..ae0a5e5 100644 --- a/milena/tests/morpho/attribute/Makefile.am +++ b/milena/tests/morpho/attribute/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index c75b590..6cd8dfb 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index c9eb6b6..33fd975 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/approx/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am index 224585e..37a726a 100644 --- a/milena/tests/morpho/elementary/Makefile.am +++ b/milena/tests/morpho/elementary/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index 2b3425c..4fc7492 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am index 8afb5a9..c9d97b3 100644 --- a/milena/tests/morpho/opening/approx/Makefile.am +++ b/milena/tests/morpho/opening/approx/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am index ab3d108..4ea328e 100644 --- a/milena/tests/morpho/reconstruction/Makefile.am +++ b/milena/tests/morpho/reconstruction/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -25,5 +22,3 @@ SUBDIRS = \ TESTS = $(check_PROGRAMS) - - diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am index e6e8ea3..48f1460 100644 --- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -28,5 +25,3 @@ union_find_SOURCES = union_find.cc TESTS = $(check_PROGRAMS) - - diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am index e6e8ea3..48f1460 100644 --- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -28,5 +25,3 @@ union_find_SOURCES = union_find.cc TESTS = $(check_PROGRAMS) - - diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am index ed34881..303bd7c 100644 --- a/milena/tests/morpho/tree/Makefile.am +++ b/milena/tests/morpho/tree/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk @@ -35,4 +32,4 @@ max_SOURCES = max.cc TESTS = $(check_PROGRAMS) SUBDIRS = \ - filter \ No newline at end of file + filter diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am index 176971f..41a0603 100644 --- a/milena/tests/morpho/tree/filter/Makefile.am +++ b/milena/tests/morpho/tree/filter/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index 7e28a00..af0f169 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am index c1805f9..4c335be 100644 --- a/milena/tests/norm/Makefile.am +++ b/milena/tests/norm/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am index 7f2de05..27f0f0d 100644 --- a/milena/tests/opt/Makefile.am +++ b/milena/tests/opt/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am index b4ddc89..ae5a829 100644 --- a/milena/tests/pw/Makefile.am +++ b/milena/tests/pw/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 79372c7..2910259 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am index 0ce806a..ab6e345 100644 --- a/milena/tests/set/Makefile.am +++ b/milena/tests/set/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am index 89676d0..122b1a9 100644 --- a/milena/tests/subsampling/Makefile.am +++ b/milena/tests/subsampling/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/tag/Makefile.am +++ b/milena/tests/tag/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am index 18ab431..6e42c2c 100644 --- a/milena/tests/test/Makefile.am +++ b/milena/tests/test/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am index 5b5f73d..b8684bf 100644 --- a/milena/tests/topo/Makefile.am +++ b/milena/tests/topo/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am index 75611e4..0e60ff6 100644 --- a/milena/tests/topo/skeleton/Makefile.am +++ b/milena/tests/topo/skeleton/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/trace/Makefile.am +++ b/milena/tests/trace/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am index 66a1cb8..f3411f9 100644 --- a/milena/tests/trait/Makefile.am +++ b/milena/tests/trait/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am index 978aa1f..a428a33 100644 --- a/milena/tests/trait/image/Makefile.am +++ b/milena/tests/trait/image/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am index 7f41b15..8d83dd2 100644 --- a/milena/tests/trait/op/Makefile.am +++ b/milena/tests/trait/op/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am index 00d82c3..30e6d67 100644 --- a/milena/tests/trait/value/Makefile.am +++ b/milena/tests/trait/value/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 2184188..933483d 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 860b113..7327468 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am index dbe5a89..3d0016f 100644 --- a/milena/tests/upscaling/Makefile.am +++ b/milena/tests/upscaling/Makefile.am @@ -13,12 +13,8 @@ # # 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)/milena/tests/tests.mk SUBDIRS = \ art - diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am index e001aaa..01900f4 100644 --- a/milena/tests/upscaling/art/Makefile.am +++ b/milena/tests/upscaling/art/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 07a3f94..0a1119e 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk @@ -56,4 +54,3 @@ tree_fast_SOURCES = tree_fast.cc tree_to_fast_SOURCES = tree_to_fast.cc TESTS = $(check_PROGRAMS) - diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index c61a738..975d471 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -14,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am index 3a40bbd..fd5347d 100644 --- a/milena/tests/value/builtin/Makefile.am +++ b/milena/tests/value/builtin/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am index a8321f7..4c3ccb4 100644 --- a/milena/tests/value/concept/Makefile.am +++ b/milena/tests/value/concept/Makefile.am @@ -13,8 +13,5 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am index ad28850..9c58718 100644 --- a/milena/tests/win/Makefile.am +++ b/milena/tests/win/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,9 +14,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am index 41a8cba..3bae089 100644 --- a/milena/tests/world/Makefile.am +++ b/milena/tests/world/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am index eb97dd5..a52757c 100644 --- a/milena/tests/world/binary_2d/Makefile.am +++ b/milena/tests/world/binary_2d/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am index 327ba60..2d08ba2 100644 --- a/milena/tests/world/inter_pixel/Makefile.am +++ b/milena/tests/world/inter_pixel/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am index 8423f4b..10ac0fb 100644 --- a/milena/tests/world/inter_pixel/dim2/Makefile.am +++ b/milena/tests/world/inter_pixel/dim2/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tests/tests.mk diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index be3c3e5..f7114d0 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -13,9 +13,6 @@ # # 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)/milena/tools/tools.mk -- 1.5.6.5

1 0

last-svn-commit-164-g68624e4 Clean up a bit Olena's Makefiles.
by Roland Levillain 03 Jun '10

03 Jun '10

* Makefile.am, external/Makefile.am: Here. --- ChangeLog | 6 ++++++ Makefile.am | 7 +------ external/Makefile.am | 3 --- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c35f101..51e3c84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Olena's Makefiles. + + * Makefile.am, external/Makefile.am: Here. + 2010-06-02 Roland Levillain <roland(a)lrde.epita.fr> * lrde-upload.sh: Fix and factor uses of chmod. diff --git a/Makefile.am b/Makefile.am index c591b00..347913f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,8 +15,6 @@ # 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 produce Makefile.in. - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = build-aux external milena @@ -125,11 +123,10 @@ dist-hook: ) -# Set the package version to olena-x.x-snapshot-dd-mm-yy +# Set the package version to olena-x.x-snapshot-dd-mm-yy. # # Do not check NEWS file (this is not a release so there is no # entries in this file for this package). -# snapshot: current_date=`date +'%d-%m-%y'` \ && sed -e "s/^$AC_INIT(\[Olena\],$ \[$[\.[:alnum:]]*$$-snapshot-.*-[[:alnum:]]*$*\], $.*$/\1 [\2-snapshot-$$current_date], \4/g" \ @@ -139,6 +136,4 @@ snapshot: && cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac - #>> -# && $(srcdir)/build-aux/lrde-upload.sh \ No newline at end of file diff --git a/external/Makefile.am b/external/Makefile.am index 0eeb192..fba95ee 100644 --- a/external/Makefile.am +++ b/external/Makefile.am @@ -13,9 +13,6 @@ # # 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 produce Makefile.in. SUBDIRS = -- 1.5.6.5

1 0

last-svn-commit-123-g04aef4b Small fixes for Nuxeo/XWiki.
by Guillaume Lazzara 03 Jun '10

03 Jun '10

* src/text_in_article_preprocess.cc: Fix use of program arguments. * core/line_set.hh, * text/clean.hh, * text/merging.hh: Fix compilation. * text/recognition.hh: Update output format. --- scribo/ChangeLog | 13 +++++++++++++ scribo/core/line_set.hh | 3 +++ scribo/src/text_in_article_preprocess.cc | 2 +- scribo/text/clean.hh | 2 ++ scribo/text/merging.hh | 15 +++++++++------ scribo/text/recognition.hh | 20 ++++++++++++++++++-- 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 67159ad..e44137e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes for Nuxeo/XWiki. + + * src/text_in_article_preprocess.cc: Fix use of program + arguments. + + * core/line_set.hh, + * text/clean.hh, + * text/merging.hh: Fix compilation. + + * text/recognition.hh: Update output format. + +2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * text/merging.hh: Disable some debug. 2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/core/line_set.hh b/scribo/core/line_set.hh index 80a79b3..5dca629 100644 --- a/scribo/core/line_set.hh +++ b/scribo/core/line_set.hh @@ -57,8 +57,11 @@ namespace scribo // Forward declaration. template <typename L> struct line_set; + template <typename L> struct line_info; + typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; + namespace internal { /// Data structure for \c scribo::line_set<I>. diff --git a/scribo/src/text_in_article_preprocess.cc b/scribo/src/text_in_article_preprocess.cc index 8cfa82f..bf70c7f 100644 --- a/scribo/src/text_in_article_preprocess.cc +++ b/scribo/src/text_in_article_preprocess.cc @@ -75,7 +75,7 @@ int main(int argc, char* argv[]) lambda = 1.2 * (input_rgb.nrows() + input_rgb.ncols()); // Extract foreground - if (argc == 4 && atoi(argv[3]) == 1) + if (argc >= 4 && atoi(argv[3]) == 1) { std::cout << "Extracting foreground..." << std::endl; input_rgb = preprocessing::split_bg_fg(input_rgb, lambda, 32).second(); diff --git a/scribo/text/clean.hh b/scribo/text/clean.hh index f93bc6f..341d64c 100644 --- a/scribo/text/clean.hh +++ b/scribo/text/clean.hh @@ -31,6 +31,7 @@ /// /// Improve the quality of a text area. +# include <mln/core/concept/image.hh> # include <mln/core/concept/weighted_window.hh> # include <mln/core/routine/extend.hh> @@ -65,6 +66,7 @@ #include <mln/value/rgb8.hh> #include <mln/io/pgm/all.hh> +#include <scribo/core/line_info.hh> #include <scribo/upsampling/bs2x.hh> #include <scribo/subsampling/bilinear.hh> diff --git a/scribo/text/merging.hh b/scribo/text/merging.hh index 5309b10..7e943ef 100644 --- a/scribo/text/merging.hh +++ b/scribo/text/merging.hh @@ -59,12 +59,15 @@ + namespace scribo { namespace text { + using namespace mln; + /// \brief Merge text component in order to reconstruct text lines. /// @@ -161,7 +164,7 @@ namespace scribo - unsigned my_find_root(util::array<unsigned>& parent, unsigned x) + unsigned my_find_root(mln::util::array<unsigned>& parent, unsigned x) { if (parent[x] == x) return x; @@ -184,7 +187,7 @@ namespace scribo unsigned do_union(scribo::line_set<L>& lines, unsigned l1, unsigned l2, - util::array<unsigned>& parent) + mln::util::array<unsigned>& parent) { l1 = my_find_root(parent, l1); l2 = my_find_root(parent, l2); @@ -514,7 +517,7 @@ namespace scribo const box2d& domain, std::vector<scribo::line_id_t>& v, scribo::line_set<L>& lines, - util::array<unsigned>& parent) + mln::util::array<unsigned>& parent) { image2d<unsigned> billboard(domain); data::fill(billboard, 0); @@ -852,7 +855,7 @@ namespace scribo v.reserve(n); // Union-find parent data, used to merge lines. - util::array<unsigned> parent(n + 1); + mln::util::array<unsigned> parent(n + 1); // Initialize data parent(0) = 0; @@ -865,7 +868,7 @@ namespace scribo // Sort lines by bbox.nelements() and ids. std::sort(v.begin(), v.end(), func); - util::timer t; + mln::util::timer t; // Setting lines as text lines according to specific criterions. @@ -912,7 +915,7 @@ namespace scribo { using namespace mln; - util::timer t; + mln::util::timer t; t.start(); scribo::line_set<L> output diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index 6f9dac7..fcc83dd 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -185,7 +185,15 @@ namespace scribo { std::string str(s); str = str.substr(0, str.length() - 1); - file << lines(i).bbox() << " " << str; + file << lines(i).bbox().pmin().row() + << " " + << lines(i).bbox().pmin().col() + << " " + << lines(i).bbox().pmax().row() + << " " + << lines(i).bbox().pmax().col() + << " " + << str; } } @@ -248,7 +256,15 @@ namespace scribo { std::string str(s); str = str.substr(0, str.length() - 1); - file << line.domain() << " " << str; + file << line.domain().bbox().pmin().row() + << " " + << line.domain().bbox().pmin().col() + << " " + << line.domain().bbox().pmax().row() + << " " + << line.domain().bbox().pmax().col() + << " " + << str; } } -- 1.5.6.5

1 0

last-svn-commit-124-g24e4f68 * mln/io/magick/load.hh: set minimum resolution for PDF files to 300DPI.
by Guillaume Lazzara 03 Jun '10

03 Jun '10

--- milena/ChangeLog | 5 +++++ milena/mln/io/magick/load.hh | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1f2117e..98e20b3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-05-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/load.hh: set minimum resolution for PDF files to + 300DPI. + 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> Add a function to convert qt::rgb32 values to int_u8. diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 11d17bd..dfe9197 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -123,7 +123,17 @@ namespace mln // abort(); //} - Magick::Image im_file(filename); + Magick::Image im_file; + im_file.ping(filename); + + // Force a minimum resolution of 300DPI for PDF document. + if (im_file.magick() == "PDF" + && (im_file.xResolution() < 300 || im_file.yResolution() < 300)) + im_file.density(Magick::Geometry(300, 300)); + + im_file.read(filename); + + im_file.modifyImage(); im_file.type(Magick::TrueColorType); int columns = im_file.columns(); -- 1.5.6.5

1 0

last-svn-commit-104-gb54300a Use anchor::Type in alignment routines' dispatch.
by Guillaume Lazzara 03 Jun '10

03 Jun '10

* filter/object_links_bottom_aligned.hh, * filter/object_links_center_aligned.hh, * filter/object_links_left_aligned.hh, * filter/object_links_non_aligned_simple.hh, * filter/object_links_right_aligned.hh, * filter/object_links_top_aligned.hh: Use anchor::Type. * filter/internal/alignment_angle.hh, * filter/internal/component_aligned.hh: New. --- scribo/ChangeLog | 14 ++ scribo/filter/internal/alignment_angle.hh | 156 ++++++++++++++++++++++ scribo/filter/internal/component_aligned.hh | 114 ++++++++++++++++ scribo/filter/object_links_bottom_aligned.hh | 2 +- scribo/filter/object_links_center_aligned.hh | 2 +- scribo/filter/object_links_left_aligned.hh | 2 +- scribo/filter/object_links_non_aligned_simple.hh | 109 +-------------- scribo/filter/object_links_right_aligned.hh | 2 +- scribo/filter/object_links_top_aligned.hh | 2 +- 9 files changed, 297 insertions(+), 106 deletions(-) create mode 100644 scribo/filter/internal/alignment_angle.hh create mode 100644 scribo/filter/internal/component_aligned.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index da11249..a9c13e3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,19 @@ 2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Use anchor::Type in alignment routines' dispatch. + + * filter/object_links_bottom_aligned.hh, + * filter/object_links_center_aligned.hh, + * filter/object_links_left_aligned.hh, + * filter/object_links_non_aligned_simple.hh, + * filter/object_links_right_aligned.hh, + * filter/object_links_top_aligned.hh: Use anchor::Type. + + * filter/internal/alignment_angle.hh, + * filter/internal/component_aligned.hh: New. + +2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes related to object_groups. * core/object_groups.hh: Add more preconditions. diff --git a/scribo/filter/internal/alignment_angle.hh b/scribo/filter/internal/alignment_angle.hh new file mode 100644 index 0000000..5b88012 --- /dev/null +++ b/scribo/filter/internal/alignment_angle.hh @@ -0,0 +1,156 @@ +// Copyright (C) 2010 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_INTERNAL_ALIGNMENT_ANGLE_HH +# define SCRIBO_FILTER_INTERNAL_ALIGNMENT_ANGLE_HH + +/// \file +/// +/// Return the alignment angle between two components according to an +/// anchor. + + +# include <mln/util/array.hh> +# include <mln/math/abs.hh> +# include <mln/math/pi.hh> + +# include <scribo/core/macros.hh> +# include <scribo/core/tag/anchor.hh> +# include <scribo/core/component_set.hh> + +namespace scribo +{ + + namespace filter + { + + namespace internal + { + + using namespace mln; + + + /// Return the alignment angle between two components according + /// to anchor. + /// + /// \return An angle in Radians. + template <typename L> + float + alignment_angle(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + float + alignment_angle(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor) + { + trace::entering("scribo::filter::internal::alignment_angle_rad"); + + mln_precondition(comps.is_valid()); + + float dr, dc; + + if (nbh_object == current_object) + return 0; + + // Center + if (anchor == anchor::Center) + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + return std::atan(dr / dc); + } + + // Top + else if (anchor == anchor::Top) + { + dr = math::abs(comps(current_object).bbox().pmin().row() + - comps(nbh_object).bbox().pmin().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + return std::atan(dr / dc); + } + + // Bottom + else if (anchor == anchor::Bottom) + { + dr = math::abs(comps(current_object).bbox().pmax().row() + - comps(nbh_object).bbox().pmax().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + return std::atan(dr / dc); + } + + // Left + else if (anchor == anchor::Left) + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pmin().col() + - comps(nbh_object).bbox().pmin().col()); + + return std::atan(dc / dr); + } + + // Right + else if (anchor == anchor::Right) + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pmax().col() + - comps(nbh_object).bbox().pmax().col()); + + return std::atan(dc / dr); + } + + else + trace::warning("Invalid anchor value... Aborting computation."); + + trace::exiting("scribo::filter::internal::alignment_angle_rad"); + return 0; + + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::filter::internal + + } // end of namespace scribo::filter + +} // end of namespace scribo + +#endif // SCRIBO_FILTER_INTERNAL_ALIGNMENT_ANGLE_HH diff --git a/scribo/filter/internal/component_aligned.hh b/scribo/filter/internal/component_aligned.hh new file mode 100644 index 0000000..7200d44 --- /dev/null +++ b/scribo/filter/internal/component_aligned.hh @@ -0,0 +1,114 @@ +// Copyright (C) 2010 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_INTERNAL_COMPONENT_ALIGNED_HH +# define SCRIBO_FILTER_INTERNAL_COMPONENT_ALIGNED_HH + +/// \file +/// +/// Invalidate components between two non aligned components. + + +# include <mln/util/array.hh> +# include <mln/math/abs.hh> +# include <mln/math/pi.hh> + +# include <scribo/core/macros.hh> +# include <scribo/core/tag/anchor.hh> +# include <scribo/core/component_set.hh> +# include <scribo/filter/internal/alignment_angle.hh> + +namespace scribo +{ + + namespace filter + { + + namespace internal + { + + using namespace mln; + + + template <typename L> + bool + component_aligned(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor, float max_alpha); + + + template <typename L> + bool + component_aligned_rad(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor, float max_alpha_rad); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + bool + component_aligned(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor, float max_alpha) + { + float max_alpha_rad = (max_alpha / 180.0f) * math::pi; + + return component_aligned(comps, current_object, anchor, max_alpha_rad); + } + + + + template <typename L> + bool + component_aligned_rad(const component_set<L>& comps, + unsigned current_object, unsigned nbh_object, + anchor::Type anchor, float max_alpha_rad) + { + trace::entering("scribo::filter::internal::component_aligned_rad"); + + mln_precondition(comps.is_valid()); + + float angle = alignment_angle(comps, current_object, + nbh_object, anchor); + + bool output = (angle <= max_alpha_rad); + + trace::exiting("scribo::filter::internal::component_aligned_rad"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::filter::internal + + } // end of namespace scribo::filter + +} // end of namespace scribo + + +#endif // ! SCRIBO_FILTER_INTERNAL_COMPONENT_ALIGNED_HH diff --git a/scribo/filter/object_links_bottom_aligned.hh b/scribo/filter/object_links_bottom_aligned.hh index f1816d4..ba8ff31 100644 --- a/scribo/filter/object_links_bottom_aligned.hh +++ b/scribo/filter/object_links_bottom_aligned.hh @@ -97,7 +97,7 @@ namespace scribo mln_precondition(links.is_valid()); object_links<L> - output = object_links_non_aligned_simple(links, 2, max_alpha); + output = object_links_non_aligned_simple(links, anchor::Bottom, max_alpha); trace::exiting("scribo::filter::object_links_bottom_aligned"); return output; diff --git a/scribo/filter/object_links_center_aligned.hh b/scribo/filter/object_links_center_aligned.hh index abbac9e..8d89e73 100644 --- a/scribo/filter/object_links_center_aligned.hh +++ b/scribo/filter/object_links_center_aligned.hh @@ -95,7 +95,7 @@ namespace scribo object_links<L> output = object_links_non_aligned_simple(objects, links, - 0, max_alpha); + anchor::Center, max_alpha); trace::exiting("scribo::filter::object_links_center_aligned"); return output; diff --git a/scribo/filter/object_links_left_aligned.hh b/scribo/filter/object_links_left_aligned.hh index e69b110..a352d71 100644 --- a/scribo/filter/object_links_left_aligned.hh +++ b/scribo/filter/object_links_left_aligned.hh @@ -103,7 +103,7 @@ namespace scribo object_links<L> output = object_links_non_aligned_simple(objects, links, - 3, + anchor::Left, max_alpha); trace::exiting("scribo::filter::object_links_left_aligned"); diff --git a/scribo/filter/object_links_non_aligned_simple.hh b/scribo/filter/object_links_non_aligned_simple.hh index 5ecba0f..ae63527 100644 --- a/scribo/filter/object_links_non_aligned_simple.hh +++ b/scribo/filter/object_links_non_aligned_simple.hh @@ -38,6 +38,7 @@ # include <scribo/core/macros.hh> # include <scribo/core/object_links.hh> +# include <scribo/filter/internal/component_aligned.hh> namespace scribo { @@ -48,13 +49,13 @@ namespace scribo using namespace mln; /*! \brief Invalidate links between two non aligned components. - Alignment is based on a given edge of object bounding boxes. + Alignment is based on a given anchor of object bounding boxes. \param[in] links Object links information. \param[in] max_alpha Maximum angle value (degrees). - Exemple with dim == 1 and edge == 1 (bottom + Exemple with dim == 1 and anchor == 1 (bottom horizontal filter): \verbatim @@ -79,18 +80,11 @@ namespace scribo The angle between the two bottoms must be lower than \p alpha. - edge values : - 0 = center - 1 = top - 2 = bottom - 3 = left - 4 = right - */ template <typename L> object_links<L> object_links_non_aligned_simple(const object_links<L>& links, - unsigned edge, + anchor::Type anchor, float max_alpha); @@ -100,7 +94,7 @@ namespace scribo template <typename L> object_links<L> object_links_non_aligned_simple(const object_links<L>& links, - unsigned edge, + anchor::Type anchor, float max_alpha) { trace::entering("scribo::filter::object_links_non_aligned_simple"); @@ -111,100 +105,13 @@ namespace scribo const component_set<L>& comps = links.components(); object_links<L> output(links); - float dr, dc; float max_alpha_rad = (max_alpha / 180.0f) * math::pi; - // Center - if (edge == 0) - { - for_all_comps(i, comps) - { - if (links(i) != i) - { - dr = math::abs(comps(i).bbox().pcenter().row() - - comps(links(i)).bbox().pcenter().row()); - dc = math::abs(comps(i).bbox().pcenter().col() - - comps(links(i)).bbox().pcenter().col()); - - if (std::atan(dr / dc) > max_alpha_rad) - output(i) = i; - } - } - } - // Top - else if (edge == 1) - { - for_all_comps(i, comps) - if (links(i) != i) - { - dr = math::abs(comps(i).bbox().pmin().row() - - comps(links(i)).bbox().pmin().row()); - dc = math::abs(comps(i).bbox().pcenter().col() - - comps(links(i)).bbox().pcenter().col()); - - if (std::atan(dr / dc) > max_alpha_rad) - output(i) = i; - } - } - // Bottom - else if (edge == 2) - { - for_all_comps(i, comps) - { - if (links(i) != i) - { - dr = math::abs(comps(i).bbox().pmax().row() - - comps(links(i)).bbox().pmax().row()); - dc = math::abs(comps(i).bbox().pcenter().col() - - comps(links(i)).bbox().pcenter().col()); - - if (std::atan(dr / dc) > max_alpha_rad) - output(i) = i; - } - } - } - // Left - else if (edge == 3) - { - for_all_comps(i, comps) - { - if (links(i) != i) - { - dr = math::abs(comps(i).bbox().pcenter().row() - - comps(links(i)).bbox().pcenter().row()); - dc = math::abs(comps(i).bbox().pmin().col() - - comps(links(i)).bbox().pmin().col()); - - if (std::atan(dc / dr) > max_alpha_rad) - output(i) = i; - } - } - } - // Right - else if (edge == 4) - { - for_all_comps(i, comps) - { - if (links(i) != i) - { - dr = math::abs(comps(i).bbox().pcenter().row() - - comps(links(i)).bbox().pcenter().row()); - dc = math::abs(comps(i).bbox().pmax().col() - - comps(links(i)).bbox().pmax().col()); - - if (std::atan(dc / dr) > max_alpha_rad) - output(i) = i; - } - } - } - else - { - trace::warning("Invalid edge value... Aborting computation."); - trace::exiting("scribo::filter::object_links_non_aligned_simple"); - return output; - } + for_all_comps(i, comps) + if (!internal::component_aligned_rad(comps, i, links(i), anchor, max_alpha_rad)) + output(i) = i; trace::exiting("scribo::filter::object_links_non_aligned_simple"); diff --git a/scribo/filter/object_links_right_aligned.hh b/scribo/filter/object_links_right_aligned.hh index 2ee0280..ee964a3 100644 --- a/scribo/filter/object_links_right_aligned.hh +++ b/scribo/filter/object_links_right_aligned.hh @@ -102,7 +102,7 @@ namespace scribo object_links<L> output = object_links_non_aligned_simple(objects, links, - 4, + anchor::Right, max_alpha); trace::exiting("scribo::filter::object_links_right_aligned"); diff --git a/scribo/filter/object_links_top_aligned.hh b/scribo/filter/object_links_top_aligned.hh index de5ab3b..57e8d40 100644 --- a/scribo/filter/object_links_top_aligned.hh +++ b/scribo/filter/object_links_top_aligned.hh @@ -96,7 +96,7 @@ namespace scribo mln_precondition(links.is_valid()); object_links<L> - output = object_links_non_aligned_simple(links, 1, max_alpha); + output = object_links_non_aligned_simple(links, anchor::Top, max_alpha); trace::exiting("scribo::filter::object_links_top_aligned"); return output; -- 1.5.6.5

1 0

last-svn-commit-105-g53a9811 debug/decision_image.hh: Add the anchor::Type as argument.
by Guillaume Lazzara 03 Jun '10

03 Jun '10

--- scribo/ChangeLog | 4 ++++ scribo/debug/decision_image.hh | 24 ++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a9c13e3..53358b7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * debug/decision_image.hh: Add the anchor::Type as argument. + +2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Use anchor::Type in alignment routines' dispatch. * filter/object_links_bottom_aligned.hh, diff --git a/scribo/debug/decision_image.hh b/scribo/debug/decision_image.hh index cc3f0f0..7f881d3 100644 --- a/scribo/debug/decision_image.hh +++ b/scribo/debug/decision_image.hh @@ -66,7 +66,8 @@ namespace scribo mln_ch_value(I,value::rgb8) decision_image(const Image<I>& input_, const object_groups<L>& groups, - const object_groups<L>& filtered_groups); + const object_groups<L>& filtered_groups, + anchor::Type anchor); /*! \brief Save a color image showing the difference between to object links. @@ -84,7 +85,8 @@ namespace scribo mln_ch_value(I,value::rgb8) decision_image(const Image<I>& input_, const object_links<L>& links, - const object_links<L>& filtered_links); + const object_links<L>& filtered_links, + anchor::Type anchor); # ifndef MLN_INCLUDE_ONLY @@ -125,12 +127,13 @@ namespace scribo mln_ch_value(I,value::rgb8) decision_image(const Image<I>& input_, const object_links<L>& links, - const object_links<L>& filtered_links) + const object_links<L>& filtered_links, + anchor::Type anchor) { trace::entering("scribo::debug::decision_image"); const I& input = exact(input_); - const component_set<L>& components = links.components(); + const component_set<L>& comps = links.components(); mln_precondition(input.is_valid()); mln_precondition(links.is_valid()); @@ -142,21 +145,22 @@ namespace scribo image2d<value::rgb8> decision_image = data::convert(value::rgb8(), input); - for_all_comps(i, components) - mln::draw::box(decision_image, components(i).bbox(), literal::blue); + for_all_comps(i, comps) + mln::draw::box(decision_image, comps(i).bbox(), literal::blue); for (unsigned i = 1; i < links.nelements(); ++i) { if (links(i) != i) { + mln_site(L) + p1 = primitive::link::internal::compute_anchor(comps, i, anchor), + p2 = primitive::link::internal::compute_anchor(comps, links(i), anchor); + value::rgb8 value = literal::green; if (links(i) != filtered_links(i)) value = literal::red; - mln::draw::line(decision_image, - components(i).bbox().pcenter(), - components(links(i)).bbox().pcenter(), - value); + mln::draw::line(decision_image, p1, p2, value); } } -- 1.5.6.5

1 0

last-svn-commit-106-g11701a0 io/xml/save_text_lines.hh: Fix XML output.
by Guillaume Lazzara 03 Jun '10

03 Jun '10

--- scribo/ChangeLog | 4 ++ scribo/io/xml/save_text_lines.hh | 98 ++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 53358b7..5dc9919 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * io/xml/save_text_lines.hh: Fix XML output. + +2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * debug/decision_image.hh: Add the anchor::Type as argument. 2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/io/xml/save_text_lines.hh b/scribo/io/xml/save_text_lines.hh index 22aa3d9..7f0fdf4 100644 --- a/scribo/io/xml/save_text_lines.hh +++ b/scribo/io/xml/save_text_lines.hh @@ -84,56 +84,60 @@ namespace scribo file << "<PcGts xmlns=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16 http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16/pagecontent…" pcGtsId=\"" << input_name << "\">" << std::endl; - file << " <Metadata>" << std::endl; - file << " <Creator>LRDE</pcCreator>" << std::endl; - file << " <Created/>" << std::endl; - file << " <LastChange/>" << std::endl; - file << " <Comments>Generated by Scribo from Olena.</pcComments>" << std::endl; - file << " </Metadata>" << std::endl; - - file << " <Page image_filename=\"" << input_name - << "\" image_width=\"" << lines.component_set_().labeled_image().ncols() - << "\" image_height=\"" << lines.component_set_().labeled_image().nrows() + file << " <PcMetadata>" << std::endl; + file << " <PcCreator>LRDE</PcCreator>" << std::endl; + file << " <PcCreated/>" << std::endl; + file << " <PcLastChange/>" << std::endl; + file << " <PcComments>Generated by Scribo from Olena.</PcComments>" << std::endl; + file << " </PcMetadata>" << std::endl; + + file << " <page image_filename=\"" << input_name + << "\" image_width=\"" << lines.components().labeled_image().ncols() + << "\" image_height=\"" << lines.components().labeled_image().nrows() << "\">" << std::endl; for_all_lines(l, lines) - { - file << " <text_region id=\"" << lines(l).id() - << "\" txt_orientation=\"" << lines(l).orientation() - << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() - << "\" txt_reading_direction=\"" << lines(l).reading_direction() - << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") - << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") - // EXTENSIONS - Not officially supported - << "\" baseline=\"" << lines(l).baseline() - << "\" median=\"" << lines(l).median() - << "\" x_height=\"" << lines(l).x_height() - << "\" d_height=\"" << lines(l).d_height() - << "\" a_height=\"" << lines(l).a_height() - << "\" char_space=\"" << lines(l).char_space() - << "\" char_width=\"" << lines(l).char_width() - // End of EXTENSIONS - << "\">" - << std::endl; - - file << " <coords>" << std::endl - << " <point x=\"" << lines(l).bbox().pmin().row() - << "\" y=\"" << lines(l).bbox().pmin().col() << "\"/>" - << std::endl - << " <point x=\"" << lines(l).bbox().pmin().row() - << "\" y=\"" << lines(l).bbox().pmax().col() << "\"/>" - << std::endl - << " <point x=\"" << lines(l).bbox().pmax().row() - << "\" y=\"" << lines(l).bbox().pmin().col() << "\"/>" - << std::endl - << " <point x=\"" << lines(l).bbox().pmax().row() - << "\" y=\"" << lines(l).bbox().pmax().col() << "\"/>" - << std::endl - << " </coords>" << std::endl; - } - - file << " </text_region>" << std::endl; - file << " </Page>" << std::endl; + if (lines(l).tag() != line::Merged + && lines(l).tag() != line::Ignored) + { + file << " <text_region id=\"" << lines(l).id() + << "\" txt_orientation=\"" << lines(l).orientation() + << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() + << "\" txt_reading_direction=\"" << lines(l).reading_direction() + << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") + << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") + << "\" kerning=\"" << lines(l).char_space() + + // EXTENSIONS - Not officially supported + << "\" baseline=\"" << lines(l).baseline() + << "\" meanline=\"" << lines(l).meanline() + << "\" x_height=\"" << lines(l).x_height() + << "\" d_height=\"" << lines(l).d_height() + << "\" a_height=\"" << lines(l).a_height() + << "\" char_width=\"" << lines(l).char_width() + // End of EXTENSIONS + << "\">" + << std::endl; + + file << " <coords>" << std::endl + << " <point x=\"" << lines(l).bbox().pmin().col() + << "\" y=\"" << lines(l).bbox().pmin().row() << "\"/>" + << std::endl + << " <point x=\"" << lines(l).bbox().pmax().col() + << "\" y=\"" << lines(l).bbox().pmin().row() << "\"/>" + << std::endl + << " <point x=\"" << lines(l).bbox().pmax().col() + << "\" y=\"" << lines(l).bbox().pmax().row() << "\"/>" + << std::endl + << " <point x=\"" << lines(l).bbox().pmin().col() + << "\" y=\"" << lines(l).bbox().pmax().row() << "\"/>" + << std::endl + << " </coords>" << std::endl; + + file << " </text_region>" << std::endl; + } + + file << " </page>" << std::endl; file << "</PcGts>" << std::endl; -- 1.5.6.5

1 0