- Olena-patches

olena: branch exp/magick-improvements updated: olena-2.0-557-ge3c2648
by git＠lrde.epita.fr 02 May '13

02 May '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/magick-improvements has been updated via e3c2648c929860296341b0a2cfc9d593cb836117 (commit) from 36798c2d16e786c1cfd3460a0df738a9341eb607 (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 ----------------------------------------------------------------- e3c2648 NEWS: Add details about GraphicsMagick I/O improvements. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ NEWS | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-557-ge3c2648 NEWS: Add details about GraphicsMagick I/O improvements.
by Guillaume Lazzara 02 May '13

02 May '13

--- ChangeLog | 4 ++++ NEWS | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..a1a9ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Add details about GraphicsMagick I/O improvements. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/NEWS b/NEWS index 26ce3c0..bc4f3c5 100644 --- a/NEWS +++ b/NEWS @@ -15,7 +15,9 @@ * Improve extensibility of convert::from_to. - * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Improvements of ImageMagick/GraphicsMagick I/O: loading + speed-up, support for 16 bits images and a new function to + read image information without loading it. * Scribo -- 1.7.2.5

1 0

olena: olena-2.0-560-g8ad1a2f NEWS: Add details about GraphicsMagick I/O improvements.
by Guillaume Lazzara 02 May '13

02 May '13

--- ChangeLog | 4 ++++ NEWS | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..a1a9ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Add details about GraphicsMagick I/O improvements. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/NEWS b/NEWS index 26ce3c0..bc4f3c5 100644 --- a/NEWS +++ b/NEWS @@ -15,7 +15,9 @@ * Improve extensibility of convert::from_to. - * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Improvements of ImageMagick/GraphicsMagick I/O: loading + speed-up, support for 16 bits images and a new function to + read image information without loading it. * Scribo -- 1.7.2.5

1 0

olena: branch exp/fill_without_localization updated: olena-2.0-555-gfcf1e31
by git＠lrde.epita.fr 02 May '13

02 May '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/fill_without_localization has been updated via fcf1e3126bb3f284ff29a54199b4f52434f6e924 (commit) from 0178afedbdf7364ab0a9bf5538d1996f087fbfd1 (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 ----------------------------------------------------------------- fcf1e31 NEWS: Notification of data::fill_without_localization function. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ NEWS | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-555-gfcf1e31 NEWS: Notification of data::fill_without_localization function.
by Guillaume Lazzara 02 May '13

02 May '13

--- ChangeLog | 4 ++++ NEWS | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..7a75729 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Notification of data::fill_without_localization function. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/NEWS b/NEWS index 26ce3c0..93f48d6 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,8 @@ * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * New data::fill_without_localization function. + * Scribo * New logger class. -- 1.7.2.5

1 0

olena: branch exp/stretch_inplace updated: olena-2.0-557-g357bde8
by git＠lrde.epita.fr 02 May '13

02 May '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 discards 303c7ee8a708463abcc24a54d52818310af1c7a3 (commit) discards 9f7766066290bb052ae742d65c2891f3dc6a04a7 (commit) discards 5e497a24afef5a91a5afd2ada5d237b3298a62b2 (commit) discards 099072a30cb62c4fe56b62a09d62da8ea04975c5 (commit) discards 97d8f9d4b9ba0ec09c03ae5db09dc47dd25426de (commit) discards 2158fb78548737a3ef36f0f40d841e5d686de8c4 (commit) discards 77ff87be3ad07b95bdc66c9eaea37ea32341d386 (commit) discards dfcf6073f33da7610ccc9ba8fb1989ef25fdff4a (commit) discards 49e94260bce076fc5875e116de781e2a267b8871 (commit) discards de7480fbd4c5df9677329459e3da701e58c87cf3 (commit) discards 941064575545dd309c43b8cc264f8a43bf535a52 (commit) discards 64c2688d9e98b44fbe6285163f208ccc6f2fac2c (commit) discards 62ed69e16a8022c7555b0095b86328f7ff89b0b1 (commit) discards b73c5164aa4f99534b431579493206875e43773d (commit) discards faba80f174696a29ed6c0b9da73553889177862d (commit) discards 727ba1902758e8a1febb98c68e58b82930b420c8 (commit) via 357bde878da59be0f237a61b541b55baab3dae79 (commit) via c54e470a637308911754f01dff20139f9d51ceb8 (commit) via 6dbc5e12a4e8532e5432f4e7697cdd7476d92baa (commit) via 9a6e78a307966abfeac00367a2dec9d5dd06c2d8 (commit) via 1a03222386ba66855e27dcf3dd6c8e3cf2c9aae7 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (303c7ee8a708463abcc24a54d52818310af1c7a3) \ N -- N -- N (357bde878da59be0f237a61b541b55baab3dae79) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 357bde8 NEWS: Add notification for data::stretch_inplace. c54e470 tests/data/stretch.cc: Remove useless include. 6dbc5e1 Regen generated files in Milena. 9a6e78a Add data::stretch_inplace. 1a03222 mln/data/stretch_inplace.hh: Add stretch inplace. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + NEWS | 2 + milena/ChangeLog | 31 +-- milena/mln/binarization/tmms.hh | 139 -------- milena/mln/binarization/tmms_hysteresis.hh | 329 -------------------- milena/mln/canvas/labeling/blobs.hh | 12 +- milena/mln/data/stretch_inplace.hh | 24 +- milena/mln/labeling/all_blobs.hh | 127 -------- milena/mln/labeling/blobs.hh | 52 ++-- milena/mln/labeling/blobs_and_compute.hh | 16 +- milena/mln/labeling/values.hh | 166 ---------- milena/tests/data/Makefile.am | 3 +- milena/tests/data/stretch.cc | 4 +- .../tests/data/{saturate.cc => stretch_inplace.cc} | 25 +- milena/tests/labeling/Makefile.am | 1 - milena/tests/labeling/all_blobs.cc | 63 ---- 16 files changed, 76 insertions(+), 922 deletions(-) delete mode 100644 milena/mln/binarization/tmms.hh delete mode 100644 milena/mln/binarization/tmms_hysteresis.hh delete mode 100644 milena/mln/labeling/all_blobs.hh delete mode 100644 milena/mln/labeling/values.hh copy milena/tests/data/{saturate.cc => stretch_inplace.cc} (76%) delete mode 100644 milena/tests/labeling/all_blobs.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-557-g357bde8 NEWS: Add notification for data::stretch_inplace.
by Guillaume Lazzara 02 May '13

02 May '13

--- ChangeLog | 4 ++++ NEWS | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..dc5c518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Add notification for data::stretch_inplace. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/NEWS b/NEWS index 26ce3c0..8e67f3f 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,8 @@ * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Add data::stretch_inplace function. + * Scribo * New logger class. -- 1.7.2.5

1 0

olena: olena-2.0-554-g0918485 NEWS: Add notification for data::stretch_inplace.
by Guillaume Lazzara 02 May '13

02 May '13

--- ChangeLog | 4 ++++ NEWS | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..dc5c518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Add notification for data::stretch_inplace. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/NEWS b/NEWS index 26ce3c0..8e67f3f 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,8 @@ * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Add data::stretch_inplace function. + * Scribo * New logger class. -- 1.7.2.5

1 0

olena: olena-2.0-556-gc54e470 tests/data/stretch.cc: Remove useless include.
by Guillaume Lazzara 02 May '13

02 May '13

--- milena/ChangeLog | 4 ++++ milena/tests/data/stretch.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 29d7d1b..4c914eb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/data/stretch.cc: Remove useless include. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> Regen generated files in Milena. diff --git a/milena/tests/data/stretch.cc b/milena/tests/data/stretch.cc index 5144146..e22605e 100644 --- a/milena/tests/data/stretch.cc +++ b/milena/tests/data/stretch.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -25,7 +26,6 @@ #include <mln/core/image/image2d.hh> #include <mln/data/stretch.hh> -#include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> -- 1.7.2.5

1 0

olena: olena-2.0-554-g9a6e78a Add data::stretch_inplace.
by Guillaume Lazzara 02 May '13

02 May '13

* mln/data/stretch.hh: Remove fixme. * mln/data/stretch_inplace.hh, * tests/data/stretch_inplace.cc: New. * tests/data/Makefile.am: New target. --- milena/ChangeLog | 11 +++ milena/mln/data/stretch.hh | 10 ++- milena/mln/data/stretch_inplace.hh | 76 ++++++++++--------- milena/tests/data/Makefile.am | 3 +- .../tests/data/{saturate.cc => stretch_inplace.cc} | 25 ++++--- 5 files changed, 74 insertions(+), 51 deletions(-) copy milena/tests/data/{saturate.cc => stretch_inplace.cc} (76%) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..27b023e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add data::stretch_inplace. + + * mln/data/stretch.hh: Remove fixme. + + * mln/data/stretch_inplace.hh, + * tests/data/stretch_inplace.cc: New. + + * tests/data/Makefile.am: New target. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/data/stretch.hh b/milena/mln/data/stretch.hh index 5b36dbe..2473494 100644 --- a/milena/mln/data/stretch.hh +++ b/milena/mln/data/stretch.hh @@ -33,8 +33,6 @@ /// stretching way. /// /// \todo Make it work with other types than scalars (e.g., vectors). -/// -/// \todo Think about adding a stretch_inplace(?) # include <mln/estim/min_max.hh> # include <mln/value/int_u.hh> @@ -82,7 +80,7 @@ namespace mln template <typename V, typename I> inline mln_ch_value(I, V) - stretch(const V& v, const Image<I>& input) + stretch(const V& v, const Image<I>& input) { mln_trace("data::impl::stretch"); @@ -95,6 +93,12 @@ namespace mln estim::min_max(input, min_, max_); if (max_ != min_) { + // We always want to perform this algorithm even if (min_ == + // mln_min(V) and max_ == mln_max(V)) since we need to + // convert the input image towards the given type and a + // default conversion function may not exist between V and + // mln_value(I). + //FIXME: we would like to use float instead of double but we //can't for precision reasons. See ticket #179. double diff --git a/milena/mln/data/stretch_inplace.hh b/milena/mln/data/stretch_inplace.hh index a4579f1..12c8b8e 100644 --- a/milena/mln/data/stretch_inplace.hh +++ b/milena/mln/data/stretch_inplace.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -31,8 +30,6 @@ /// /// Transform linearly the contents of an image into another one in a /// stretching way. -/// -/// \todo Make it work with other types than scalars (e.g., vectors). # include <mln/estim/min_max.hh> @@ -54,6 +51,8 @@ namespace mln * * \param[in,out] ima The input image. * + * If input is filled with a single value, this function does + * nothing. * * \pre input.is_valid * @@ -67,7 +66,10 @@ namespace mln * stored inplace. * * \param[in,out] ima The input image. - * \param[out] stretched The image has changed. + * \param[out] stretched The image has changed. + * + * If input is filled with a single value, this function does + * nothing. * * \pre input.is_valid * @@ -81,39 +83,41 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> - inline - void - stretch_inplace(Image<I>& ima, bool& stretched) + template <typename I> + inline + void + stretch_inplace(Image<I>& ima, bool& stretched) + { + mln_trace("data::stretch_inplace"); + typedef mln_value(I) V; + mln_precondition(exact(ima).is_valid()); + + stretched = false; + V min_, max_; + estim::min_max(ima, min_, max_); + if (max_ != min_) { - mln_trace("data::stretch_inplace"); - typedef mln_value(I) V; - mln_precondition(exact(ima).is_valid()); - - V min_, max_; - estim::min_max(ima, min_, max_); - if (max_ != min_ && (mln_max(V)>max_ || mln_min(V)>min_)) - { - //FIXME: we would like to use float instead of double but we - //can't for precision reasons. See ticket #179. - double - min = double(min_), - max = double(max_), - epsilon = mln_epsilon(float), - M = mln_max(V) + 0.5f - epsilon, - m = 0.0f - 0.5f + epsilon, - a = (M - m) / (max - min), - b = (m * max - M * min) / (max - min); - fun::v2v::linear_sat<V, double, V> f(a, b); - data::transform_inplace(ima, f); - stretched = true; - } - else - { - stretched = false; - mln_trace_warning("output has no significative data!"); - } + // Already stretched ? + if (min_ == mln_min(V) && max_ == mln_max(V)) + return; + + //FIXME: we would like to use float instead of double but we + //can't for precision reasons. See ticket #179. + double + min = double(min_), + max = double(max_), + epsilon = mln_epsilon(float), + M = mln_max(V) + 0.5f - epsilon, + m = 0.0f - 0.5f + epsilon, + a = (M - m) / (max - min), + b = (m * max - M * min) / (max - min); + fun::v2v::linear_sat<V, double, V> f(a, b); + data::transform_inplace(ima, f); + stretched = true; } + // else nothing to do. + } + template <typename I> void diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index b733718..565987e 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -39,6 +39,7 @@ check_PROGRAMS = \ sort_psites \ split \ stretch \ + stretch_inplace \ transform \ transform_inplace \ update diff --git a/milena/tests/data/saturate.cc b/milena/tests/data/stretch_inplace.cc similarity index 76% copy from milena/tests/data/saturate.cc copy to milena/tests/data/stretch_inplace.cc index 4baee22..fb7b071 100644 --- a/milena/tests/data/saturate.cc +++ b/milena/tests/data/stretch_inplace.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,24 +24,27 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/data/saturate.hh> -#include <mln/debug/iota.hh> - +#include <mln/data/stretch_inplace.hh> int main() { using namespace mln; - image2d<int> ima(3, 3); int vs[3][3] = { - { 2, 2, 3 }, - { 4, 5, 6 }, - { 6, 6, 6 } + { 1000, 2000, 3000 }, + { 1000, 2000, 3000 }, + { 1000, 2000, 3000 } + }; + image2d<int> ima = make::image(vs); + data::stretch_inplace(ima); + + int ws[3][3] = { + { 0, 1073741824, 2147483647 }, + { 0, 1073741824, 2147483647 }, + { 0, 1073741824, 2147483647 } }; + image2d<int> ref = make::image(ws); - image2d<int> ref = make::image(vs); - debug::iota(ima); - data::saturate_inplace(ima, 2, 6); box_fwd_piter_<point2d> p(ima.domain()); for_all(p) mln_assertion(ima(p) == ref(p)); -- 1.7.2.5

1 0