- Olena-patches

[PATCH 1/5] Use \tparam properly.
by Roland Levillain 10 Jun '09

10 Jun '09

* milena/mln/core/image/complex_image.hh, * milena/mln/core/site_set/p_complex.hh, * milena/mln/util/line_graph.hh, * milena/trash/bgraph_image.hh, * milena/trash/graph_image.hh, * milena/trash/line_graph_image.hh: Use \p instead of \tparam when highlighting a template parameter within a sentence. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/core/image/complex_image.hh | 2 +- milena/mln/core/site_set/p_complex.hh | 2 +- milena/mln/util/line_graph.hh | 2 +- milena/trash/bgraph_image.hh | 2 +- milena/trash/graph_image.hh | 2 +- milena/trash/line_graph_image.hh | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ee34372..7a68a0c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + + Use \tparam properly. + + * milena/mln/core/image/complex_image.hh, + * milena/mln/core/site_set/p_complex.hh, + * milena/mln/util/line_graph.hh, + * milena/trash/bgraph_image.hh, + * milena/trash/graph_image.hh, + * milena/trash/line_graph_image.hh: + Use \p instead of \tparam when highlighting a template parameter + within a sentence. + 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> Fix mln::io::abort(). diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 8dadeab..3419778 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -138,7 +138,7 @@ namespace mln /// Return type of read-write access. /// /// We use the associated type \c reference instead of a plain - /// reference on th value type (\tparam V), because it's the only way + /// reference on th value type (\p V), because it's the only way /// to safely form a reference on the element in the case of a /// std::vector<bool>. typedef typename std::vector<V>::reference lvalue; diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index eee3e8c..225a70d 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -103,7 +103,7 @@ namespace mln /* FIXME: Aggregate site data (location). */ /** A complex psite set based on the N-faces of a complex - of dimension \tparam D (a \p D-complex). + of dimension \p D (a \p D-complex). \arg \p D The dimension of the complex. \arg \p G A function object type, associating localization diff --git a/milena/mln/util/line_graph.hh b/milena/mln/util/line_graph.hh index d81e110..f367b77 100644 --- a/milena/mln/util/line_graph.hh +++ b/milena/mln/util/line_graph.hh @@ -74,7 +74,7 @@ namespace mln namespace util { - /// \brief Undirected line graph of a graph of type \tparam G. + /// \brief Undirected line graph of a graph of type \p G. /// /// \ingroup modgraph // diff --git a/milena/trash/bgraph_image.hh b/milena/trash/bgraph_image.hh index d20ecdb..fd7685b 100644 --- a/milena/trash/bgraph_image.hh +++ b/milena/trash/bgraph_image.hh @@ -110,7 +110,7 @@ namespace mln /// Return type of read-write access. /// /// We use the associated type \c reference instead of a plain - /// reference on th value type (\tparam V), because it's the only way + /// reference on th value type (\p V), because it's the only way /// to safely form a reference on the element in the case of a /// std::vector<bool>. typedef typename std::vector<V>::reference lvalue; diff --git a/milena/trash/graph_image.hh b/milena/trash/graph_image.hh index 7cb25e2..b58e729 100644 --- a/milena/trash/graph_image.hh +++ b/milena/trash/graph_image.hh @@ -116,7 +116,7 @@ namespace mln /// \brief Return type of read-write access. /// /// We use the associated type \c reference instead of a plain - /// reference on th value type (\tparam V), because it's the only way + /// reference on th value type (\p V), because it's the only way /// to safely form a reference on the element in the case of a /// std::vector<bool>. typedef typename std::vector<V>::reference lvalue; diff --git a/milena/trash/line_graph_image.hh b/milena/trash/line_graph_image.hh index 0d9e095..63bf1ac 100644 --- a/milena/trash/line_graph_image.hh +++ b/milena/trash/line_graph_image.hh @@ -130,7 +130,7 @@ namespace mln /// \brief Return type of read-write access. /// /// We use the associated type \c reference instead of a plain - /// reference on th value type (\tparam V), because it's the only way + /// reference on th value type (\p V), because it's the only way /// to safely form a reference on the element in the case of a /// std::vector<bool>. typedef typename std::vector<V>::reference lvalue; -- 1.6.1.2

1 0

4074: Fix mln::io::abort().
by Roland Levillain 10 Jun '09

10 Jun '09

* mln/io/abort.hh (mln::io::abort): Delegate to std::abort instead of std::exit. --- milena/ChangeLog | 7 +++++++ milena/mln/io/abort.hh | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6fe7f9d..ee34372 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Fix mln::io::abort(). + + * mln/io/abort.hh (mln::io::abort): Delegate to std::abort instead + of std::exit. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Regen Makefile helpers. * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/io/abort.hh b/milena/mln/io/abort.hh index dd85e4f..9d06e7b 100644 --- a/milena/mln/io/abort.hh +++ b/milena/mln/io/abort.hh @@ -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. // @@ -27,11 +28,11 @@ # define MLN_IO_ABORT_HH /// \file -/// + /// Define a function which aborts a process in io module. -# include <iostream> # include <cstdlib> +# include <iostream> namespace mln @@ -52,7 +53,7 @@ namespace mln void abort() { std::cerr << "I/O error, aborting." << std::endl; - std::exit(0); + std::abort(); } # endif // ! MLN_INCLUDE_ONLY -- 1.6.1.2

1 0

4073: tests/unit_test/unit-tests.mk: Regen.
by Roland Levillain 10 Jun '09

10 Jun '09

--- scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f3ca28a..55b969d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/unit_test/unit-tests.mk: Regen. + 2009-06-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Update license headers in Scribo. diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 761253b..1f58b67 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -14,12 +14,9 @@ scribo_debug_save_linked_textbboxes_image \ scribo_debug_save_table_image \ scribo_debug_save_textbboxes_image \ scribo_debug_usage \ -scribo_demat \ -scribo_demat_old \ scribo_draw_all \ scribo_draw_bounding_box_links \ scribo_draw_bounding_boxes \ -scribo_extract_lines_discontinued \ scribo_extract_primitive_canvas \ scribo_extract_primitive_cells \ scribo_extract_primitive_lines_discontinued \ @@ -40,7 +37,6 @@ scribo_make_influence_zone_graph \ scribo_make_text \ scribo_preprocessing_all \ scribo_preprocessing_unskew \ -scribo_src_woot \ scribo_table_align_lines_horizontaly \ scribo_table_align_lines_verticaly \ scribo_table_all \ @@ -94,12 +90,9 @@ scribo_debug_save_linked_textbboxes_image_SOURCES = scribo_debug_save_linked_tex scribo_debug_save_table_image_SOURCES = scribo_debug_save_table_image.cc scribo_debug_save_textbboxes_image_SOURCES = scribo_debug_save_textbboxes_image.cc scribo_debug_usage_SOURCES = scribo_debug_usage.cc -scribo_demat_SOURCES = scribo_demat.cc -scribo_demat_old_SOURCES = scribo_demat_old.cc scribo_draw_all_SOURCES = scribo_draw_all.cc scribo_draw_bounding_box_links_SOURCES = scribo_draw_bounding_box_links.cc scribo_draw_bounding_boxes_SOURCES = scribo_draw_bounding_boxes.cc -scribo_extract_lines_discontinued_SOURCES = scribo_extract_lines_discontinued.cc scribo_extract_primitive_canvas_SOURCES = scribo_extract_primitive_canvas.cc scribo_extract_primitive_cells_SOURCES = scribo_extract_primitive_cells.cc scribo_extract_primitive_lines_discontinued_SOURCES = scribo_extract_primitive_lines_discontinued.cc @@ -120,7 +113,6 @@ scribo_make_influence_zone_graph_SOURCES = scribo_make_influence_zone_graph.cc scribo_make_text_SOURCES = scribo_make_text.cc scribo_preprocessing_all_SOURCES = scribo_preprocessing_all.cc scribo_preprocessing_unskew_SOURCES = scribo_preprocessing_unskew.cc -scribo_src_woot_SOURCES = scribo_src_woot.cc scribo_table_align_lines_horizontaly_SOURCES = scribo_table_align_lines_horizontaly.cc scribo_table_align_lines_verticaly_SOURCES = scribo_table_align_lines_verticaly.cc scribo_table_all_SOURCES = scribo_table_all.cc -- 1.6.1.2

1 0

[PATCH 7/7] Regen Makefile helpers.
by Roland Levillain 10 Jun '09

10 Jun '09

* headers.mk, tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 6 ++++++ milena/headers.mk | 2 -- milena/tests/unit_test/unit-tests.mk | 22 ---------------------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fd93be6..6fe7f9d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Regen Makefile helpers. + + * headers.mk, tests/unit_test/unit-tests.mk: Regen. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Complete the installation of the Make rule `tests' in Milena. * Makefile.am (tests): New phony target. diff --git a/milena/headers.mk b/milena/headers.mk index c35af98..c9de056 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -710,7 +710,6 @@ mln/io/ppms/all.hh \ mln/io/ppms/load.hh \ mln/io/tiff/all.hh \ mln/io/tiff/load.hh \ -mln/io/tiff/save.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ mln/labeling/all.hh \ @@ -1283,7 +1282,6 @@ mln/win/vline2d.hh \ mln/world/all.hh \ mln/world/binary_2d/all.hh \ mln/world/binary_2d/enlarge.hh \ -mln/world/binary_2d/enlarge_hq2x.hh \ mln/world/binary_2d/projected_histo.hh \ mln/world/binary_2d/subsample.hh \ mln/world/inter_pixel/all.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 48697c4..de60cc2 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -633,17 +633,10 @@ mln_io_all \ mln_io_cloud_all \ mln_io_cloud_load \ mln_io_cloud_save \ -mln_io_dicom_all \ -mln_io_dicom_load \ mln_io_dump_all \ mln_io_dump_load \ mln_io_dump_save \ mln_io_essential \ -mln_io_fits_all \ -mln_io_fits_load \ -mln_io_magick_all \ -mln_io_magick_load \ -mln_io_magick_save \ mln_io_off_all \ mln_io_off_load \ mln_io_off_save \ @@ -677,9 +670,6 @@ mln_io_ppm_load \ mln_io_ppm_save \ mln_io_ppms_all \ mln_io_ppms_load \ -mln_io_tiff_all \ -mln_io_tiff_load \ -mln_io_tiff_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ @@ -1249,7 +1239,6 @@ mln_win_vline2d \ mln_world_all \ mln_world_binary_2d_all \ mln_world_binary_2d_enlarge \ -mln_world_binary_2d_enlarge_hq2x \ mln_world_binary_2d_projected_histo \ mln_world_binary_2d_subsample \ mln_world_inter_pixel_all \ @@ -1900,17 +1889,10 @@ mln_io_all_SOURCES = mln_io_all.cc mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc -mln_io_dicom_all_SOURCES = mln_io_dicom_all.cc -mln_io_dicom_load_SOURCES = mln_io_dicom_load.cc mln_io_dump_all_SOURCES = mln_io_dump_all.cc mln_io_dump_load_SOURCES = mln_io_dump_load.cc mln_io_dump_save_SOURCES = mln_io_dump_save.cc mln_io_essential_SOURCES = mln_io_essential.cc -mln_io_fits_all_SOURCES = mln_io_fits_all.cc -mln_io_fits_load_SOURCES = mln_io_fits_load.cc -mln_io_magick_all_SOURCES = mln_io_magick_all.cc -mln_io_magick_load_SOURCES = mln_io_magick_load.cc -mln_io_magick_save_SOURCES = mln_io_magick_save.cc mln_io_off_all_SOURCES = mln_io_off_all.cc mln_io_off_load_SOURCES = mln_io_off_load.cc mln_io_off_save_SOURCES = mln_io_off_save.cc @@ -1944,9 +1926,6 @@ mln_io_ppm_load_SOURCES = mln_io_ppm_load.cc mln_io_ppm_save_SOURCES = mln_io_ppm_save.cc mln_io_ppms_all_SOURCES = mln_io_ppms_all.cc mln_io_ppms_load_SOURCES = mln_io_ppms_load.cc -mln_io_tiff_all_SOURCES = mln_io_tiff_all.cc -mln_io_tiff_load_SOURCES = mln_io_tiff_load.cc -mln_io_tiff_save_SOURCES = mln_io_tiff_save.cc mln_io_txt_all_SOURCES = mln_io_txt_all.cc mln_io_txt_save_SOURCES = mln_io_txt_save.cc mln_labeling_all_SOURCES = mln_labeling_all.cc @@ -2516,7 +2495,6 @@ mln_win_vline2d_SOURCES = mln_win_vline2d.cc mln_world_all_SOURCES = mln_world_all.cc mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc mln_world_binary_2d_enlarge_SOURCES = mln_world_binary_2d_enlarge.cc -mln_world_binary_2d_enlarge_hq2x_SOURCES = mln_world_binary_2d_enlarge_hq2x.cc mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc -- 1.6.1.2

1 0

[PATCH 6/7] Complete the installation of the Make rule `tests' in Olena.
by Roland Levillain 10 Jun '09

10 Jun '09

* Makefile.am (LOCAL_RECURSIVE_TARGETS): Add tests. --- ChangeLog | 6 ++++++ Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ce993e..5d6c5ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + + Complete the installation of the Make rule `tests' in Olena. + + * Makefile.am (LOCAL_RECURSIVE_TARGETS): Add tests. + 2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> Update NEWS. diff --git a/Makefile.am b/Makefile.am index b8388a8..8ceba09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ if ENABLE_SWILENA endif ENABLE_SWILENA # Target shortcuts delegating the actual action to milena/Makefile. -LOCAL_RECURSIVE_TARGETS = doc pretty-check +LOCAL_RECURSIVE_TARGETS = doc pretty-check tests $(LOCAL_RECURSIVE_TARGETS): cd milena && $(MAKE) $(AM_MAKEFLAGS) $@ .PHONY: $(LOCAL_RECURSIVE_TARGETS) -- 1.6.1.2

1 0

[PATCH 5/7] Complete the installation of the Make rule `tests' in Milena.
by Roland Levillain 10 Jun '09

10 Jun '09

* Makefile.am (tests): New phony target. * tests/world/Makefile.am: Include milena/tests/tests.mk. --- milena/ChangeLog | 7 +++++++ milena/Makefile.am | 5 ++++- milena/tests/world/Makefile.am | 4 ++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cf6a1fc..fd93be6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Complete the installation of the Make rule `tests' in Milena. + + * Makefile.am (tests): New phony target. + * tests/world/Makefile.am: Include milena/tests/tests.mk. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Set missing flags in Makefiles. * tests/Makefile.am (all_headers_CPPFLAGS, all_headers_LDFLAGS) diff --git a/milena/Makefile.am b/milena/Makefile.am index 6d33714..a1db868 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -30,7 +30,7 @@ if ENABLE_TOOLS SUBDIRS += tools endif ENABLE_TOOLS -.PHONY: doc tutorial pretty-check +.PHONY: doc tutorial pretty-check tests doc: cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ @@ -42,6 +42,9 @@ tutorial: pretty-check: cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ +tests: + cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ + # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += doc tests diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am index d370f91..41a8cba 100644 --- a/milena/tests/world/Makefile.am +++ b/milena/tests/world/Makefile.am @@ -15,6 +15,10 @@ # 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 = \ binary_2d \ inter_pixel -- 1.6.1.2

1 0

[PATCH 4/7] Set missing flags in Makefiles.
by Roland Levillain 10 Jun '09

10 Jun '09

* tests/Makefile.am (all_headers_CPPFLAGS, all_headers_LDFLAGS) * tests/io/dicom/Makefile.am (AM_CPPFLAGS, AM_LDFLAGS): New. --- milena/ChangeLog | 8 ++++++++ milena/tests/Makefile.am | 5 +++++ milena/tests/io/dicom/Makefile.am | 3 +++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 081cf0b..cf6a1fc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Set missing flags in Makefiles. + + * tests/Makefile.am (all_headers_CPPFLAGS, all_headers_LDFLAGS) + * tests/io/dicom/Makefile.am (AM_CPPFLAGS, AM_LDFLAGS): + New. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Do not exercise parts depening on optional dependencies. * tests/unit_test/build_unit_test.sh (HEADERS): Ignore files diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index a0124cd..18a5a76 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -75,6 +75,11 @@ check_PROGRAMS = \ global_vars all_headers_SOURCES = all_headers.cc +all_headers_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFITSIO_CPPFLAGS) $(GDCM_CPPFLAGS) $(MAGICKXX_CPPFLAGS) $(TIFF_CPPFLAGS) +all_headers_LDFLAGS = \ + $(CFITSIO_LDFLAGS) $(GDCM_LDFLAGS) $(MAGICKXX_LDFLAGS) $(TIFF_LDFLAGS) + essential_headers_SOURCES = essential_headers.cc global_vars_SOURCES = global_vars1.cc global_vars2.cc diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am index 67d73a4..da98219 100644 --- a/milena/tests/io/dicom/Makefile.am +++ b/milena/tests/io/dicom/Makefile.am @@ -21,6 +21,9 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = dicom +AM_CPPFLAGS += $(GDCM_CPPFLAGS) +AM_LDFLAGS = $(GDCM_LDFLAGS) + # FIXME: Upon completion, if this test only read (not write) images, # rename it as load.cc dicom_SOURCES = dicom.cc -- 1.6.1.2

1 0

[PATCH 3/7] Do not exercise parts depening on optional dependencies.
by Roland Levillain 10 Jun '09

10 Jun '09

* tests/unit_test/build_unit_test.sh (HEADERS): Ignore files depending on optional packages (GDCM, CFITSIO, Magick++, TIFF). --- milena/ChangeLog | 7 +++++++ milena/tests/unit_test/build_unit_test.sh | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 22ce781..081cf0b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Do not exercise parts depening on optional dependencies. + + * tests/unit_test/build_unit_test.sh (HEADERS): Ignore files + depending on optional packages (GDCM, CFITSIO, Magick++, TIFF). + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/ppms/load.hh: Repair copyright header. 2009-06-10 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/tests/unit_test/build_unit_test.sh b/milena/tests/unit_test/build_unit_test.sh index 55c4567..ae31679 100755 --- a/milena/tests/unit_test/build_unit_test.sh +++ b/milena/tests/unit_test/build_unit_test.sh @@ -32,7 +32,25 @@ test $# -eq 1 || { echo "Usage: $0 <mln path>" && exit 1; } ## FIXME: Ouch! Using `find' properly can probably save us some pipes, ## forks and characters here. -HEADERS=`find $1 -name "*.hh" | grep -vE "*.spe.hh" | grep -v "mln/core/concept/doc" | sort | sed -e 's/.*\/mln\/$.*$/mln\/\1/g' | sed 's/\.\.\/\.\.\///g'` +## +## FIXME: We do not include these directories +## +## mln/io/dicom +## mln/io/fits +## mln/io/magick +## mln/io/tiff +## +## because they contain files depending on optional (external) +## libraries. We should test them conditionally. +HEADERS=$(find $1 -name "*.hh" \ + | grep -vE "*.spe.hh" \ + | grep -v "mln/core/concept/doc" \ + | grep -v "mln/io/dicom" \ + | grep -v "mln/io/fits" \ + | grep -v "mln/io/magick" \ + | grep -v "mln/io/tiff" \ + | sort \ + | sed -e 's/.*\/mln\/$.*$/mln\/\1/g' | sed 's/\.\.\/\.\.\///g') output=unit-tests.mk -- 1.6.1.2

1 0

[PATCH 2/7] mln/io/ppms/load.hh: Repair copyright header.
by Roland Levillain 10 Jun '09

10 Jun '09

--- milena/ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 486904c..22ce781 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/io/ppms/load.hh: Repair copyright header. + 2009-06-10 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Update generated files. -- 1.6.1.2

1 0

[PATCH 1/7] Simplify all_headers tests: keep a single one at the top-level.
by Roland Levillain 10 Jun '09

10 Jun '09

* milena/tests/arith/all_headers.cc, * milena/tests/border/all_headers.cc, * milena/tests/display/all_headers.cc, * milena/tests/draw/all_headers.cc, * milena/tests/logical/all_headers.cc, * milena/tests/util/all_headers.cc: Remove. * milena/tests/arith/Makefile.am, * milena/tests/border/Makefile.am, * milena/tests/data/Makefile.am, * milena/tests/draw/Makefile.am, * milena/tests/logical/Makefile.am (check_PROGRAM): Remove all_headers. (all_headers_SOURCES): Remove. * milena/tests/all_headers.cc, * milena/tests/display/Makefile.am: Clean up. Aesthetic changes. --- milena/ChangeLog | 23 +++++++++++++++++++++++ milena/tests/all_headers.cc | 4 +++- milena/tests/arith/Makefile.am | 2 -- milena/tests/arith/all_headers.cc | 31 ------------------------------- milena/tests/border/Makefile.am | 2 -- milena/tests/border/all_headers.cc | 31 ------------------------------- milena/tests/data/Makefile.am | 2 -- milena/tests/display/Makefile.am | 12 +++++------- milena/tests/display/all_headers.cc | 31 ------------------------------- milena/tests/draw/Makefile.am | 2 -- milena/tests/draw/all_headers.cc | 31 ------------------------------- milena/tests/logical/Makefile.am | 2 -- milena/tests/logical/all_headers.cc | 31 ------------------------------- milena/tests/util/all_headers.cc | 31 ------------------------------- 14 files changed, 31 insertions(+), 204 deletions(-) delete mode 100644 milena/tests/arith/all_headers.cc delete mode 100644 milena/tests/border/all_headers.cc delete mode 100644 milena/tests/display/all_headers.cc delete mode 100644 milena/tests/draw/all_headers.cc delete mode 100644 milena/tests/logical/all_headers.cc delete mode 100644 milena/tests/util/all_headers.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e413ac..486904c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1004,6 +1004,29 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Simplify all_headers tests: keep a single one at the top-level. + + * milena/tests/arith/all_headers.cc, + * milena/tests/border/all_headers.cc, + * milena/tests/display/all_headers.cc, + * milena/tests/draw/all_headers.cc, + * milena/tests/logical/all_headers.cc, + * milena/tests/util/all_headers.cc: + Remove. + * milena/tests/arith/Makefile.am, + * milena/tests/border/Makefile.am, + * milena/tests/data/Makefile.am, + * milena/tests/draw/Makefile.am, + * milena/tests/logical/Makefile.am + (check_PROGRAM): Remove all_headers. + (all_headers_SOURCES): Remove. + * milena/tests/all_headers.cc, + * milena/tests/display/Makefile.am: + Clean up. + Aesthetic changes. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/pbm/load.hh: Repair the copyright header. 2009-06-09 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> diff --git a/milena/tests/all_headers.cc b/milena/tests/all_headers.cc index 038a2db..29f4536 100644 --- a/milena/tests/all_headers.cc +++ b/milena/tests/all_headers.cc @@ -23,9 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file tests/all_headers.cc +/// \brief Check all Milena's headers. + #include <mln/all.hh> int main () { - } diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index 5476af6..c7539a7 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -20,14 +20,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ diff_abs \ minus \ plus \ revert \ times -all_headers_SOURCES = all_headers.cc diff_abs_SOURCES = diff_abs.cc minus_SOURCES = minus.cc plus_SOURCES = plus.cc diff --git a/milena/tests/arith/all_headers.cc b/milena/tests/arith/all_headers.cc deleted file mode 100644 index 7536314..0000000 --- a/milena/tests/arith/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/arith/all.hh> - -int main() -{ - -} diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index efdd1c2..9337423 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -21,7 +21,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ adjust \ - all_headers \ duplicate \ equalize \ fill \ @@ -43,7 +42,6 @@ check_PROGRAMS = \ resize adjust_SOURCES = adjust.cc -all_headers_SOURCES = all_headers.cc duplicate_SOURCES = duplicate.cc equalize_SOURCES = equalize.cc fill_SOURCES = fill.cc diff --git a/milena/tests/border/all_headers.cc b/milena/tests/border/all_headers.cc deleted file mode 100644 index 3d132a2..0000000 --- a/milena/tests/border/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/border/all.hh> - -int main() -{ - -} diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 2dfc0ba..a87c109 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = approx naive check_PROGRAMS = \ abs \ - all_headers \ apply \ compare \ compute \ @@ -44,7 +43,6 @@ check_PROGRAMS = \ update abs_SOURCES = abs.cc -all_headers_SOURCES = all_headers.cc apply_SOURCES = apply.cc compare_SOURCES = compare.cc compute_SOURCES = compute.cc diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am index 719b8eb..40752fe 100644 --- a/milena/tests/display/Makefile.am +++ b/milena/tests/display/Makefile.am @@ -19,12 +19,10 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = - +# Remember not to execute display tests by default. They require a +# running X11 server (as well as a `pkill' binary...). Perform the +# necessary checks at configure time first. -# FIXME: Don't execute `save' and `save_and_show' by default! These -# tests require a running X11 server (as well as a `pkill' binary...). -# Perform the necessary checks at configure time first. -#TESTS = $(check_PROGRAMS) +check_PROGRAMS = -TESTS = +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/display/all_headers.cc b/milena/tests/display/all_headers.cc deleted file mode 100644 index 822ef72..0000000 --- a/milena/tests/display/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/display/all.hh> - -int main() -{ - -} diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index addb33d..3cb7692 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -20,11 +20,9 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ line \ graph -all_headers_SOURCES = all_headers.cc line_SOURCES = line.cc graph_SOURCES = graph.cc diff --git a/milena/tests/draw/all_headers.cc b/milena/tests/draw/all_headers.cc deleted file mode 100644 index c6f4506..0000000 --- a/milena/tests/draw/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/draw/all.hh> - -int main() -{ - -} diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index 17bfc31..d095301 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -20,14 +20,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ and \ and_not \ not \ or \ xor -all_headers_SOURCES = all_headers.cc and_SOURCES = and.cc and_not_SOURCES = and_not.cc not_SOURCES = not.cc diff --git a/milena/tests/logical/all_headers.cc b/milena/tests/logical/all_headers.cc deleted file mode 100644 index e5bc299..0000000 --- a/milena/tests/logical/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/logical/all.hh> - -int main() -{ - -} diff --git a/milena/tests/util/all_headers.cc b/milena/tests/util/all_headers.cc deleted file mode 100644 index 9bf0ce9..0000000 --- a/milena/tests/util/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/util/all.hh> - -int main() -{ - -} -- 1.6.1.2

1 0