- Olena-patches

branch unstable/scribo updated: last-svn-commit-961-g33d0eb2
by lazzara＠lrde.epita.fr 02 Sep '11

02 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 33d0eb2944157526a4e72af100a8ffebcff22e4b (commit) via a046910585664ff3d165502289aa3fbbd4a170f5 (commit) via ab2583704057c1d6295075b5b38cff6bccb34af9 (commit) via 9f32e44c2cd5c2a86876d80cc96006fce9c15aaf (commit) via 810d1584d6ef795173a5ef4bdf2412b1b43bace1 (commit) via 7d6dcc263573fcc224be43560c67280ffb1915bc (commit) via b0f7350085bdceec275c79df6219f2f0f076249c (commit) via 0453f463e47ce15fa022406064b933fe90d955c4 (commit) from a76227a29b973d6403703c55752aa9474717f0d5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 33d0eb2 configure.ac: Remove references to deprecated Makefiles. a046910 Regen generated files in Milena. ab25837 Regen generated files in Scribo. 9f32e44 mln/debug/println_with_border.spe.hh: Improve output for 3D images. 810d158 Add vbbox() method. 7d6dcc2 build-aux/texi2dvi: Fix a regular expression. b0f7350 NEWS: List changes for the next release. 0453f46 Rename back nslices to nslis. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 +++ NEWS | 80 ++++++++++++++++++++- build-aux/texi2dvi | 2 +- configure.ac | 4 +- milena/ChangeLog | 49 +++++++++++++ milena/headers.mk | 4 +- milena/mln/core/image/image1d.hh | 15 ++++- milena/mln/core/image/image2d.hh | 15 ++++- milena/mln/core/image/image3d.hh | 26 +++++-- milena/mln/core/internal/box_impl.hh | 8 +- milena/mln/core/site_set/box.hh | 10 ++-- milena/mln/debug/println_with_border.spe.hh | 8 ++- milena/mln/debug/slices_2d.hh | 20 +++--- milena/mln/geom/all.hh | 6 +- milena/mln/geom/{nslices.hh => nslis.hh} | 14 ++-- milena/mln/geom/size3d.hh | 4 +- milena/mln/linear/gaussian.hh | 10 ++-- milena/mln/linear/gaussian/impl.hh | 12 ++-- milena/mln/make/box3d.hh | 16 ++-- milena/mln/make/image.hh | 8 +- milena/mln/make/image3d.hh | 9 ++- milena/mln/registration/icp.hh | 4 +- milena/tests/core/alias/box3d.cc | 6 +- milena/tests/core/image/image3d.cc | 12 ++-- milena/tests/geom/Makefile.am | 8 +- milena/tests/geom/{nslices.cc => nslis.cc} | 8 +- milena/tests/io/pbms/load.cc | 6 +- milena/tests/io/pgms/load.cc | 6 +- milena/tests/io/ppms/load.cc | 6 +- milena/tests/unit_test/unit-tests.mk | 8 ++- scribo/ChangeLog | 7 ++ scribo/headers.mk | 3 + scribo/sandbox/green/mln/clustering/k_mean.hh | 4 +- scribo/sandbox/green/mln/display/project_histo.hh | 44 ++++++------ scribo/tests/unit_test/unit-tests.mk | 6 ++ 35 files changed, 331 insertions(+), 129 deletions(-) rename milena/mln/geom/{nslices.hh => nslis.hh} (86%) rename milena/tests/geom/{nslices.cc => nslis.cc} (88%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-961-g33d0eb2 configure.ac: Remove references to deprecated Makefiles.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

--- ChangeLog | 4 ++++ configure.ac | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c029f64..d6dfc6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Remove references to deprecated Makefiles. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/texi2dvi: Fix a regular expression. 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 66643a4..b273521 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.61]) ## Package set up. ## ## ---------------- ## -AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr] [olena]) +AC_INIT([Olena], [1.1], [olena(a)lrde.epita.fr] [olena]) # M4 macros. AC_CONFIG_MACRO_DIR([m4]) @@ -351,8 +351,6 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/estim/Makefile scribo/tests/filter/Makefile - scribo/tests/io/Makefile - scribo/tests/io/xml/Makefile scribo/tests/preprocessing/Makefile scribo/tests/primitive/Makefile scribo/tests/primitive/extract/Makefile -- 1.7.2.5

1 0

last-svn-commit-960-ga046910 Regen generated files in Milena.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 4 +++- milena/tests/unit_test/unit-tests.mk | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 537e8ed..dff1510 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/debug/println_with_border.spe.hh: Improve output for 3D images. diff --git a/milena/headers.mk b/milena/headers.mk index 762e963..c3d75ab 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -486,6 +486,8 @@ mln/draw/dashed_line.hh \ mln/draw/essential.hh \ mln/draw/line.hh \ mln/draw/plot.hh \ +mln/draw/polygon.hh \ +mln/draw/site_set.hh \ mln/essential/1d.hh \ mln/essential/2d.hh \ mln/essential/3d.hh \ @@ -619,7 +621,7 @@ mln/geom/ncols.hh \ mln/geom/ninds.hh \ mln/geom/nrows.hh \ mln/geom/nsites.hh \ -mln/geom/nslices.hh \ +mln/geom/nslis.hh \ mln/geom/pmin_pmax.hh \ mln/geom/rotate.hh \ mln/geom/seeds2tiling.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 59a3fc1..2519bd6 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -547,6 +547,8 @@ mln_draw_dashed_line \ mln_draw_essential \ mln_draw_line \ mln_draw_plot \ +mln_draw_polygon \ +mln_draw_site_set \ mln_essential_1d \ mln_essential_2d \ mln_essential_3d \ @@ -733,7 +735,7 @@ mln_geom_ncols \ mln_geom_ninds \ mln_geom_nrows \ mln_geom_nsites \ -mln_geom_nslices \ +mln_geom_nslis \ mln_geom_pmin_pmax \ mln_geom_rotate \ mln_geom_seeds2tiling \ @@ -1872,6 +1874,8 @@ mln_draw_dashed_line_SOURCES = mln_draw_dashed_line.cc mln_draw_essential_SOURCES = mln_draw_essential.cc mln_draw_line_SOURCES = mln_draw_line.cc mln_draw_plot_SOURCES = mln_draw_plot.cc +mln_draw_polygon_SOURCES = mln_draw_polygon.cc +mln_draw_site_set_SOURCES = mln_draw_site_set.cc mln_essential_1d_SOURCES = mln_essential_1d.cc mln_essential_2d_SOURCES = mln_essential_2d.cc mln_essential_3d_SOURCES = mln_essential_3d.cc @@ -2058,7 +2062,7 @@ mln_geom_ncols_SOURCES = mln_geom_ncols.cc mln_geom_ninds_SOURCES = mln_geom_ninds.cc mln_geom_nrows_SOURCES = mln_geom_nrows.cc mln_geom_nsites_SOURCES = mln_geom_nsites.cc -mln_geom_nslices_SOURCES = mln_geom_nslices.cc +mln_geom_nslis_SOURCES = mln_geom_nslis.cc mln_geom_pmin_pmax_SOURCES = mln_geom_pmin_pmax.cc mln_geom_rotate_SOURCES = mln_geom_rotate.cc mln_geom_seeds2tiling_SOURCES = mln_geom_seeds2tiling.cc -- 1.7.2.5

1 0

last-svn-commit-960-gdea3d62 Regen generated files in Milena.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 4 +++- milena/tests/unit_test/unit-tests.mk | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 537e8ed..dff1510 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/debug/println_with_border.spe.hh: Improve output for 3D images. diff --git a/milena/headers.mk b/milena/headers.mk index 762e963..c3d75ab 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -486,6 +486,8 @@ mln/draw/dashed_line.hh \ mln/draw/essential.hh \ mln/draw/line.hh \ mln/draw/plot.hh \ +mln/draw/polygon.hh \ +mln/draw/site_set.hh \ mln/essential/1d.hh \ mln/essential/2d.hh \ mln/essential/3d.hh \ @@ -619,7 +621,7 @@ mln/geom/ncols.hh \ mln/geom/ninds.hh \ mln/geom/nrows.hh \ mln/geom/nsites.hh \ -mln/geom/nslices.hh \ +mln/geom/nslis.hh \ mln/geom/pmin_pmax.hh \ mln/geom/rotate.hh \ mln/geom/seeds2tiling.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 59a3fc1..2519bd6 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -547,6 +547,8 @@ mln_draw_dashed_line \ mln_draw_essential \ mln_draw_line \ mln_draw_plot \ +mln_draw_polygon \ +mln_draw_site_set \ mln_essential_1d \ mln_essential_2d \ mln_essential_3d \ @@ -733,7 +735,7 @@ mln_geom_ncols \ mln_geom_ninds \ mln_geom_nrows \ mln_geom_nsites \ -mln_geom_nslices \ +mln_geom_nslis \ mln_geom_pmin_pmax \ mln_geom_rotate \ mln_geom_seeds2tiling \ @@ -1872,6 +1874,8 @@ mln_draw_dashed_line_SOURCES = mln_draw_dashed_line.cc mln_draw_essential_SOURCES = mln_draw_essential.cc mln_draw_line_SOURCES = mln_draw_line.cc mln_draw_plot_SOURCES = mln_draw_plot.cc +mln_draw_polygon_SOURCES = mln_draw_polygon.cc +mln_draw_site_set_SOURCES = mln_draw_site_set.cc mln_essential_1d_SOURCES = mln_essential_1d.cc mln_essential_2d_SOURCES = mln_essential_2d.cc mln_essential_3d_SOURCES = mln_essential_3d.cc @@ -2058,7 +2062,7 @@ mln_geom_ncols_SOURCES = mln_geom_ncols.cc mln_geom_ninds_SOURCES = mln_geom_ninds.cc mln_geom_nrows_SOURCES = mln_geom_nrows.cc mln_geom_nsites_SOURCES = mln_geom_nsites.cc -mln_geom_nslices_SOURCES = mln_geom_nslices.cc +mln_geom_nslis_SOURCES = mln_geom_nslis.cc mln_geom_pmin_pmax_SOURCES = mln_geom_pmin_pmax.cc mln_geom_rotate_SOURCES = mln_geom_rotate.cc mln_geom_seeds2tiling_SOURCES = mln_geom_seeds2tiling.cc -- 1.7.2.5

1 0

last-svn-commit-959-gab25837 Regen generated files in Scribo.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 3 +++ scribo/tests/unit_test/unit-tests.mk | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a203064..e9ad5eb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated files in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + 2011-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> Fix object selector for separators in scribo-viewer. diff --git a/scribo/headers.mk b/scribo/headers.mk index 12a4d4f..f636d04 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -61,6 +61,8 @@ scribo/debug/links_image.hh \ scribo/debug/logger.hh \ scribo/debug/looks_like_a_text_line_image.hh \ scribo/debug/mean_and_base_lines_image.hh \ +scribo/debug/option_check.hh \ +scribo/debug/option_parser.hh \ scribo/debug/save_comp_diff.hh \ scribo/debug/save_label_image.hh \ scribo/debug/save_table_image.hh \ @@ -278,6 +280,7 @@ scribo/toolchain/internal/content_in_doc_functor.hh \ scribo/toolchain/internal/content_in_hdoc_functor.hh \ scribo/toolchain/internal/text_in_doc_functor.hh \ scribo/toolchain/internal/text_in_doc_preprocess_functor.hh \ +scribo/toolchain/internal/text_in_picture_functor.hh \ scribo/toolchain/internal/toolchain_functor.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 5045f3e..9eb3771 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -152,6 +152,8 @@ scribo_debug_links_image \ scribo_debug_logger \ scribo_debug_looks_like_a_text_line_image \ scribo_debug_mean_and_base_lines_image \ +scribo_debug_option_check \ +scribo_debug_option_parser \ scribo_debug_save_comp_diff \ scribo_debug_save_label_image \ scribo_debug_save_table_image \ @@ -358,6 +360,7 @@ scribo_text_paragraphs_closing \ scribo_toolchain_content_in_hdoc \ scribo_toolchain_internal_content_in_hdoc_functor \ scribo_toolchain_internal_text_in_doc_preprocess_functor \ +scribo_toolchain_internal_text_in_picture_functor \ scribo_toolchain_internal_toolchain_functor \ scribo_toolchain_text_in_doc_preprocess \ scribo_toolchain_text_in_picture \ @@ -427,6 +430,8 @@ scribo_debug_links_image_SOURCES = scribo_debug_links_image.cc scribo_debug_logger_SOURCES = scribo_debug_logger.cc scribo_debug_looks_like_a_text_line_image_SOURCES = scribo_debug_looks_like_a_text_line_image.cc scribo_debug_mean_and_base_lines_image_SOURCES = scribo_debug_mean_and_base_lines_image.cc +scribo_debug_option_check_SOURCES = scribo_debug_option_check.cc +scribo_debug_option_parser_SOURCES = scribo_debug_option_parser.cc scribo_debug_save_comp_diff_SOURCES = scribo_debug_save_comp_diff.cc scribo_debug_save_label_image_SOURCES = scribo_debug_save_label_image.cc scribo_debug_save_table_image_SOURCES = scribo_debug_save_table_image.cc @@ -633,6 +638,7 @@ scribo_text_paragraphs_closing_SOURCES = scribo_text_paragraphs_closing.cc scribo_toolchain_content_in_hdoc_SOURCES = scribo_toolchain_content_in_hdoc.cc scribo_toolchain_internal_content_in_hdoc_functor_SOURCES = scribo_toolchain_internal_content_in_hdoc_functor.cc scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc +scribo_toolchain_internal_text_in_picture_functor_SOURCES = scribo_toolchain_internal_text_in_picture_functor.cc scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc scribo_toolchain_text_in_picture_SOURCES = scribo_toolchain_text_in_picture.cc -- 1.7.2.5

1 0

last-svn-commit-959-g61b2295 Regen generated files in Scribo.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 3 +++ scribo/tests/unit_test/unit-tests.mk | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a203064..e9ad5eb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated files in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + 2011-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> Fix object selector for separators in scribo-viewer. diff --git a/scribo/headers.mk b/scribo/headers.mk index 12a4d4f..f636d04 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -61,6 +61,8 @@ scribo/debug/links_image.hh \ scribo/debug/logger.hh \ scribo/debug/looks_like_a_text_line_image.hh \ scribo/debug/mean_and_base_lines_image.hh \ +scribo/debug/option_check.hh \ +scribo/debug/option_parser.hh \ scribo/debug/save_comp_diff.hh \ scribo/debug/save_label_image.hh \ scribo/debug/save_table_image.hh \ @@ -278,6 +280,7 @@ scribo/toolchain/internal/content_in_doc_functor.hh \ scribo/toolchain/internal/content_in_hdoc_functor.hh \ scribo/toolchain/internal/text_in_doc_functor.hh \ scribo/toolchain/internal/text_in_doc_preprocess_functor.hh \ +scribo/toolchain/internal/text_in_picture_functor.hh \ scribo/toolchain/internal/toolchain_functor.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 5045f3e..9eb3771 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -152,6 +152,8 @@ scribo_debug_links_image \ scribo_debug_logger \ scribo_debug_looks_like_a_text_line_image \ scribo_debug_mean_and_base_lines_image \ +scribo_debug_option_check \ +scribo_debug_option_parser \ scribo_debug_save_comp_diff \ scribo_debug_save_label_image \ scribo_debug_save_table_image \ @@ -358,6 +360,7 @@ scribo_text_paragraphs_closing \ scribo_toolchain_content_in_hdoc \ scribo_toolchain_internal_content_in_hdoc_functor \ scribo_toolchain_internal_text_in_doc_preprocess_functor \ +scribo_toolchain_internal_text_in_picture_functor \ scribo_toolchain_internal_toolchain_functor \ scribo_toolchain_text_in_doc_preprocess \ scribo_toolchain_text_in_picture \ @@ -427,6 +430,8 @@ scribo_debug_links_image_SOURCES = scribo_debug_links_image.cc scribo_debug_logger_SOURCES = scribo_debug_logger.cc scribo_debug_looks_like_a_text_line_image_SOURCES = scribo_debug_looks_like_a_text_line_image.cc scribo_debug_mean_and_base_lines_image_SOURCES = scribo_debug_mean_and_base_lines_image.cc +scribo_debug_option_check_SOURCES = scribo_debug_option_check.cc +scribo_debug_option_parser_SOURCES = scribo_debug_option_parser.cc scribo_debug_save_comp_diff_SOURCES = scribo_debug_save_comp_diff.cc scribo_debug_save_label_image_SOURCES = scribo_debug_save_label_image.cc scribo_debug_save_table_image_SOURCES = scribo_debug_save_table_image.cc @@ -633,6 +638,7 @@ scribo_text_paragraphs_closing_SOURCES = scribo_text_paragraphs_closing.cc scribo_toolchain_content_in_hdoc_SOURCES = scribo_toolchain_content_in_hdoc.cc scribo_toolchain_internal_content_in_hdoc_functor_SOURCES = scribo_toolchain_internal_content_in_hdoc_functor.cc scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc +scribo_toolchain_internal_text_in_picture_functor_SOURCES = scribo_toolchain_internal_text_in_picture_functor.cc scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc scribo_toolchain_text_in_picture_SOURCES = scribo_toolchain_text_in_picture.cc -- 1.7.2.5

1 0

last-svn-commit-958-g9f32e44 mln/debug/println_with_border.spe.hh: Improve output for 3D images.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/debug/println_with_border.spe.hh | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0814f80..537e8ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/debug/println_with_border.spe.hh: Improve output for 3D + images. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add vbbox() method. * mln/core/image/image1d.hh, diff --git a/milena/mln/debug/println_with_border.spe.hh b/milena/mln/debug/println_with_border.spe.hh index ce882bf..f59f45b 100644 --- a/milena/mln/debug/println_with_border.spe.hh +++ b/milena/mln/debug/println_with_border.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -92,8 +93,11 @@ namespace mln { for (unsigned j = 0; j < real_len_r; ++j) { + for (unsigned l = 0; l < real_len_r - j; ++l) + std::cout << ' '; + for (unsigned i = 0; i < real_len_c; ++i) - std::cout << format(input.point_at_index(k * (real_len_r * real_len_c) + j * real_len_c + i)) + std::cout << format(input.buffer()[k * (real_len_r * real_len_c) + j * real_len_c + i]) << ' '; std::cout << std::endl; } -- 1.7.2.5

1 0

last-svn-commit-958-ga93cf00 mln/debug/println_with_border.spe.hh: Improve output for 3D images.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/debug/println_with_border.spe.hh | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0814f80..537e8ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/debug/println_with_border.spe.hh: Improve output for 3D + images. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add vbbox() method. * mln/core/image/image1d.hh, diff --git a/milena/mln/debug/println_with_border.spe.hh b/milena/mln/debug/println_with_border.spe.hh index ce882bf..f59f45b 100644 --- a/milena/mln/debug/println_with_border.spe.hh +++ b/milena/mln/debug/println_with_border.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -92,8 +93,11 @@ namespace mln { for (unsigned j = 0; j < real_len_r; ++j) { + for (unsigned l = 0; l < real_len_r - j; ++l) + std::cout << ' '; + for (unsigned i = 0; i < real_len_c; ++i) - std::cout << format(input.point_at_index(k * (real_len_r * real_len_c) + j * real_len_c + i)) + std::cout << format(input.buffer()[k * (real_len_r * real_len_c) + j * real_len_c + i]) << ' '; std::cout << std::endl; } -- 1.7.2.5

1 0

last-svn-commit-957-g810d158 Add vbbox() method.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/image/image1d.hh | 15 ++++++++++++++- milena/mln/core/image/image2d.hh | 15 ++++++++++++++- milena/mln/core/image/image3d.hh | 12 ++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77e5081..0814f80 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add vbbox() method. + + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh: Here. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename back nslices to nslis. * mln/core/image/image3d.hh, diff --git a/milena/mln/core/image/image1d.hh b/milena/mln/core/image/image1d.hh index 89e93e7..6d10aa5 100644 --- a/milena/mln/core/image/image1d.hh +++ b/milena/mln/core/image/image1d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -193,6 +194,9 @@ namespace mln /// Give the bounding box domain. const box1d& bbox() const; + /// virtual box, i.e., box including the virtual border + const box1d& vbbox() const; + /// Give the border thickness. unsigned border() const; @@ -412,6 +416,15 @@ namespace mln template <typename T> inline + const box1d& + image1d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return this->data_->vb_; + } + + template <typename T> + inline unsigned image1d<T>::border() const { diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index d2a3e0f..cdb460a 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -176,6 +177,9 @@ namespace mln /// Give the bounding box domain. const box2d& bbox() const; + // virtual box, i.e., box including the virtual border + const box2d& vbbox() const; + /// Read-only access to the image value located at point \p p. const T& operator()(const point2d& p) const; @@ -434,6 +438,15 @@ namespace mln template <typename T> inline + const box2d& + image2d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return this->data_->vb_; + } + + template <typename T> + inline bool image2d<T>::has(const point2d& p) const { diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 86c8f23..59d6908 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -181,6 +181,9 @@ namespace mln /// Give the bounding box domain. const box3d& bbox() const; + /// virtual box, i.e., box including the virtual border + const box3d& vbbox() const; + /// Give the border thickness. unsigned border() const; @@ -430,6 +433,15 @@ namespace mln template <typename T> inline + const box3d& + image3d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return data_->vb_; + } + + template <typename T> + inline unsigned image3d<T>::border() const { -- 1.7.2.5

1 0

last-svn-commit-957-gf46fc5c Add vbbox() method.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/image/image1d.hh | 15 ++++++++++++++- milena/mln/core/image/image2d.hh | 15 ++++++++++++++- milena/mln/core/image/image3d.hh | 12 ++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77e5081..0814f80 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add vbbox() method. + + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh: Here. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename back nslices to nslis. * mln/core/image/image3d.hh, diff --git a/milena/mln/core/image/image1d.hh b/milena/mln/core/image/image1d.hh index 89e93e7..6d10aa5 100644 --- a/milena/mln/core/image/image1d.hh +++ b/milena/mln/core/image/image1d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -193,6 +194,9 @@ namespace mln /// Give the bounding box domain. const box1d& bbox() const; + /// virtual box, i.e., box including the virtual border + const box1d& vbbox() const; + /// Give the border thickness. unsigned border() const; @@ -412,6 +416,15 @@ namespace mln template <typename T> inline + const box1d& + image1d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return this->data_->vb_; + } + + template <typename T> + inline unsigned image1d<T>::border() const { diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index d2a3e0f..cdb460a 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -176,6 +177,9 @@ namespace mln /// Give the bounding box domain. const box2d& bbox() const; + // virtual box, i.e., box including the virtual border + const box2d& vbbox() const; + /// Read-only access to the image value located at point \p p. const T& operator()(const point2d& p) const; @@ -434,6 +438,15 @@ namespace mln template <typename T> inline + const box2d& + image2d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return this->data_->vb_; + } + + template <typename T> + inline bool image2d<T>::has(const point2d& p) const { diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 86c8f23..59d6908 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -181,6 +181,9 @@ namespace mln /// Give the bounding box domain. const box3d& bbox() const; + /// virtual box, i.e., box including the virtual border + const box3d& vbbox() const; + /// Give the border thickness. unsigned border() const; @@ -430,6 +433,15 @@ namespace mln template <typename T> inline + const box3d& + image3d<T>::vbbox() const + { + mln_precondition(this->is_valid()); + return data_->vb_; + } + + template <typename T> + inline unsigned image3d<T>::border() const { -- 1.7.2.5

1 0