April 2013 - Olena-patches

olena: olena-2.0-496-g137ae1e mln/binarization/tmms_hysiteresis.hh: change call to labeling::all_blobs to labeling::blobs.
by Jonathan Fabrizio 29 Apr '13

29 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 58ec6fa..64b5dbf 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -134,7 +134,7 @@ namespace mln mln_ch_value(I, unsigned int) labels_high_images; //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::all_blobs(high_image, mln::c4(), nlabels); + labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); V *values = new V[nlabels]; for(unsigned int i=0;i<nlabels;i++) { @@ -232,7 +232,7 @@ namespace mln mln_ch_value(I, unsigned int) labels_high_images; //labels_high_images = mln::labeling::values(high_image, mln::c4(), nlabels); - labels_high_images = mln::labeling::all_blobs(high_image, mln::c4(), nlabels); + labels_high_images = mln::labeling::blobs(high_image, mln::c4(), nlabels); V *values = new V[nlabels]; for(unsigned int i=0;i<nlabels;i++) { -- 1.7.2.5

1 0

olena: olena-2.0-579-g3e418dc doc/mln/io/io.dox: List the required dependencies for each I/O type.
by Guillaume Lazzara 29 Apr '13

29 Apr '13

--- milena/ChangeLog | 5 +++ milena/doc/mln/io/io.dox | 81 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 364f90b..796405c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/mln/io/io.dox: List the required dependencies for each I/O + type. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/internal/image_base.hh: Add more documentation for diff --git a/milena/doc/mln/io/io.dox b/milena/doc/mln/io/io.dox index 97c199e..720eac7 100644 --- a/milena/doc/mln/io/io.dox +++ b/milena/doc/mln/io/io.dox @@ -12,10 +12,15 @@ */ /*! \defgroup iodicom DICOM - * - * \brief DICOM I/O routines. - * - * \ingroup iogroup + + \brief DICOM I/O routines. + + These routines require the following packages: + + \li libgdcm2.0 + \li libgdcm2-dev + + \ingroup iogroup */ /*! \defgroup iodump Dump @@ -26,10 +31,15 @@ */ /*! \defgroup iofits FITS - * - * \brief FITS I/O routines. - * - * \ingroup iogroup + + \brief FITS I/O routines. + + These routines require the following packages: + + \li libcfitsio3 + \li libcfitsio3-dev + + \ingroup iogroup */ /*! \defgroup iofld FLD @@ -40,10 +50,29 @@ */ /*! \defgroup iomagick ImageMagick - * - * \brief ImageMagick I/O routines. - * - * \ingroup iogroup + + \brief ImageMagick I/O routines. + + These routines require ImageMagick or GraphicsMagick to be installed. + + GraphicsMagick requires the following packages: + + \li libgraphismagick++-3 + \li graphicsmagick + \li graphicsmagick-imagemagick-compat + \li libgraphicsmagick++3 + \li libgraphicsmagick3 + \li libgraphicsmagick++1-dev + \li libgraphicsmagick1-dev + \li graphicsmagick-libmagick-dev-compat + + ImageMagick requires the following packages: + + \li libmagick++5 + \li libmagick++-dev + \li imagemagick + + \ingroup iogroup */ /*! \defgroup iooff OFF @@ -96,10 +125,15 @@ */ /*! \defgroup iotiff TIFF - * - * \brief TIFF I/O routines. - * - * \ingroup iogroup + + \brief TIFF I/O routines. + + These routines require the following packages: + + \li libtiff5 + \li libtiff5-dev + + \ingroup iogroup */ /*! \defgroup iotxt TXT @@ -110,8 +144,15 @@ */ /*! \defgroup iopdf PDF - * - * \brief PDF I/O routines. - * - * \ingroup iogroup + + \brief PDF I/O routines. + + These routines require the following packages: + + \li libpoppler5 + \li libpoppler-dev + \li libpoppler-cpp-dev + \li libpoppler-qt-dev + + \ingroup iogroup */ -- 1.7.2.5

1 0

olena: olena-2.0-601-gdbe0051 Merge branch 'exp/tmms' into exp/TL
by Jonathan Fabrizio 29 Apr '13

29 Apr '13

This is a merge commit message of the following branches: Merge: 64ea46b 548172e milena/mln/binarization/tmms_hysteresis.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/TL updated: olena-2.0-601-gdbe0051
by git＠lrde.epita.fr 29 Apr '13

29 Apr '13

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 exp/TL has been updated via dbe00511daaabf3b9bfe5719c5b15899ecb5b920 (commit) via 548172e159ba61c45caf2d8a00c310bb61f6506d (commit) from 64ea46b45ff414d59d532d641a9ffa6d0ddd5bd1 (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 ----------------------------------------------------------------- dbe0051 Merge branch 'exp/tmms' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/mln/binarization/tmms_hysteresis.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-495-g548172e mln/binarization/tmms_hysteresis.hh: Fix include.
by Jonathan Fabrizio 29 Apr '13

29 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 1cf44df..58ec6fa 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -28,7 +28,7 @@ # include <mln/morpho/all.hh> //# include <mln/labeling/values.hh> -#include <mln/labeling/all_blobs.hh> +#include <mln/labeling/blobs.hh> /// \file -- 1.7.2.5

1 0

olena: branch exp/tmms updated: olena-2.0-495-g548172e
by git＠lrde.epita.fr 29 Apr '13

29 Apr '13

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 exp/tmms has been updated via 548172e159ba61c45caf2d8a00c310bb61f6506d (commit) from 3596ac75b533b25f489f3a6acc104c0bdd8a7ac3 (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 ----------------------------------------------------------------- 548172e mln/binarization/tmms_hysteresis.hh: Fix include. ----------------------------------------------------------------------- Summary of changes: milena/mln/binarization/tmms_hysteresis.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/stretch_inplace updated: olena-2.0-504-g62f325a
by git＠lrde.epita.fr 26 Apr '13

26 Apr '13

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 exp/stretch_inplace has been updated via 62f325a806d6b026d170717a105e84ca6756b8d6 (commit) from e760fce0a57482b723240b980041a9bda176b612 (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 ----------------------------------------------------------------- 62f325a Regen generated files in Milena. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/headers.mk | 5 +++++ milena/tests/unit_test/unit-tests.mk | 7 +++++++ 3 files changed, 19 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-555-g141d002 Regen generated files in Milena.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3499fd3..64a7241 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> Add data::stretch_inplace. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..ca9c8d0 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -456,6 +456,7 @@ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ mln/data/split.hh \ mln/data/stretch.hh \ +mln/data/stretch_inplace.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ mln/data/transform.spe.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c79f929..bc93153 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -518,6 +518,7 @@ mln_data_sort_offsets \ mln_data_sort_psites \ mln_data_split \ mln_data_stretch \ +mln_data_stretch_inplace \ mln_data_to_enc \ mln_data_transform \ mln_data_transform_inplace \ -- 1.7.2.5

1 0

olena: olena-2.0-555-g6dbc5e1 Regen generated files in Milena.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 5 +++++ milena/tests/unit_test/unit-tests.mk | 5 +++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 27b023e..29d7d1b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + 2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> Add data::stretch_inplace. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..002f3bd 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -100,6 +100,8 @@ mln/binarization/binarization.hh \ mln/binarization/essential.hh \ mln/binarization/includes.hh \ mln/binarization/threshold.hh \ +mln/binarization/tmms.hh \ +mln/binarization/tmms_hysteresis.hh \ mln/border/adjust.hh \ mln/border/all.hh \ mln/border/duplicate.hh \ @@ -456,6 +458,7 @@ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ mln/data/split.hh \ mln/data/stretch.hh \ +mln/data/stretch_inplace.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ mln/data/transform.spe.hh \ @@ -738,6 +741,7 @@ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ mln/labeling/all.hh \ +mln/labeling/all_blobs.hh \ mln/labeling/background.hh \ mln/labeling/blobs.hh \ mln/labeling/blobs_and_compute.hh \ @@ -758,6 +762,7 @@ mln/labeling/superpose.hh \ mln/labeling/value.hh \ mln/labeling/value.spe.hh \ mln/labeling/value_and_compute.hh \ +mln/labeling/values.hh \ mln/labeling/wrap.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c79f929..3c27771 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -188,6 +188,8 @@ mln_binarization_binarization \ mln_binarization_essential \ mln_binarization_includes \ mln_binarization_threshold \ +mln_binarization_tmms \ +mln_binarization_tmms_hysteresis \ mln_border_adjust \ mln_border_all \ mln_border_duplicate \ @@ -518,6 +520,7 @@ mln_data_sort_offsets \ mln_data_sort_psites \ mln_data_split \ mln_data_stretch \ +mln_data_stretch_inplace \ mln_data_to_enc \ mln_data_transform \ mln_data_transform_inplace \ @@ -782,6 +785,7 @@ mln_io_raw_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ +mln_labeling_all_blobs \ mln_labeling_background \ mln_labeling_blobs \ mln_labeling_blobs_and_compute \ @@ -801,6 +805,7 @@ mln_labeling_relabel \ mln_labeling_superpose \ mln_labeling_value \ mln_labeling_value_and_compute \ +mln_labeling_values \ mln_labeling_wrap \ mln_linear_all \ mln_linear_ch_convolve \ -- 1.7.2.5

1 0

olena: olena-2.0-567-g9f77660 Regen generated files in Milena.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 5 +++++ milena/tests/unit_test/unit-tests.mk | 5 +++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6e75bc4..5d8ff07 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix an invalid test in data::stretch* routines. * mln/data/stretch.hh: Fix an invalid test. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..002f3bd 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -100,6 +100,8 @@ mln/binarization/binarization.hh \ mln/binarization/essential.hh \ mln/binarization/includes.hh \ mln/binarization/threshold.hh \ +mln/binarization/tmms.hh \ +mln/binarization/tmms_hysteresis.hh \ mln/border/adjust.hh \ mln/border/all.hh \ mln/border/duplicate.hh \ @@ -456,6 +458,7 @@ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ mln/data/split.hh \ mln/data/stretch.hh \ +mln/data/stretch_inplace.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ mln/data/transform.spe.hh \ @@ -738,6 +741,7 @@ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ mln/labeling/all.hh \ +mln/labeling/all_blobs.hh \ mln/labeling/background.hh \ mln/labeling/blobs.hh \ mln/labeling/blobs_and_compute.hh \ @@ -758,6 +762,7 @@ mln/labeling/superpose.hh \ mln/labeling/value.hh \ mln/labeling/value.spe.hh \ mln/labeling/value_and_compute.hh \ +mln/labeling/values.hh \ mln/labeling/wrap.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c79f929..3c27771 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -188,6 +188,8 @@ mln_binarization_binarization \ mln_binarization_essential \ mln_binarization_includes \ mln_binarization_threshold \ +mln_binarization_tmms \ +mln_binarization_tmms_hysteresis \ mln_border_adjust \ mln_border_all \ mln_border_duplicate \ @@ -518,6 +520,7 @@ mln_data_sort_offsets \ mln_data_sort_psites \ mln_data_split \ mln_data_stretch \ +mln_data_stretch_inplace \ mln_data_to_enc \ mln_data_transform \ mln_data_transform_inplace \ @@ -782,6 +785,7 @@ mln_io_raw_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ +mln_labeling_all_blobs \ mln_labeling_background \ mln_labeling_blobs \ mln_labeling_blobs_and_compute \ @@ -801,6 +805,7 @@ mln_labeling_relabel \ mln_labeling_superpose \ mln_labeling_value \ mln_labeling_value_and_compute \ +mln_labeling_values \ mln_labeling_wrap \ mln_linear_all \ mln_linear_ch_convolve \ -- 1.7.2.5

1 0