Olena-patches May 2014

olena-patches@lrde.epita.fr

2 participants
24 discussions

olena: olena-2.0-856-gaac38bd Address Clang warnings in Swilena.

by Roland Levillain

* dynamic_image2d.i: Here. --- swilena/ChangeLog | 6 ++++++ swilena/dynamic_image2d.i | 25 +++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fcd4fd9..aeb9f6b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + + Address Clang warnings in Swilena. + + * dynamic_image2d.i: Here. + 2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> Swilena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. diff --git a/swilena/dynamic_image2d.i b/swilena/dynamic_image2d.i index 532f1e0..2a0430d 100644 --- a/swilena/dynamic_image2d.i +++ b/swilena/dynamic_image2d.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -152,7 +153,7 @@ namespace mln /// 3). dynamic_image2d(const box2d& b); - // FIXME: Add a virtual dtor? + virtual ~dynamic_image2d(); /// Initialize an empty image. virtual void init_(const box2d& b); @@ -230,6 +231,12 @@ namespace mln template <typename T> inline + dynamic_image2d<T>::~dynamic_image2d() + { + } + + template <typename T> + inline void dynamic_image2d<T>::init_(const box2d& b) { @@ -258,10 +265,11 @@ namespace mln template <typename T> inline const T& - dynamic_image2d<T>::operator()(const point2d& p) const + dynamic_image2d<T>::operator()(const point2d&) const { - // Dummy. - assert(false); + abort(); + static T v; + return v; } // Dummy implementation, provided to have swig wrap the class (swig won't @@ -269,10 +277,11 @@ namespace mln template <typename T> inline T& - dynamic_image2d<T>::operator()(const point2d& p) + dynamic_image2d<T>::operator()(const point2d&) { - // Dummy. - assert(false); + abort(); + static T v; + return v; } template <typename T> -- 1.7.10.4

9 years, 11 months

olena: olena-2.0-855-g478a682 Fix Doxygen command names in Milena documentation.

by Roland Levillain

* mln/topo/is_not_1d_isthmus.hh, * mln/topo/is_not_end_point.hh, * mln/topo/is_simple_point2d.hh, * mln/topo/is_simple_point3d.hh: Here. --- milena/ChangeLog | 10 ++++++++++ milena/mln/topo/is_not_1d_isthmus.hh | 5 +++-- milena/mln/topo/is_not_end_point.hh | 5 +++-- milena/mln/topo/is_simple_point2d.hh | 6 +++--- milena/mln/topo/is_simple_point3d.hh | 5 +++-- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c00e8fa..47e0c5e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Fix Doxygen command names in Milena documentation. + + * mln/topo/is_not_1d_isthmus.hh, + * mln/topo/is_not_end_point.hh, + * mln/topo/is_simple_point2d.hh, + * mln/topo/is_simple_point3d.hh: + Here. + +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Address Clang warnings in Milena. * mln/core/image/dmorph/mutable_extension_ima.hh, diff --git a/milena/mln/topo/is_not_1d_isthmus.hh b/milena/mln/topo/is_not_1d_isthmus.hh index 101cdf2..e6ba5f5 100644 --- a/milena/mln/topo/is_not_1d_isthmus.hh +++ b/milena/mln/topo/is_not_1d_isthmus.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -58,7 +59,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_not_1d_isthmus(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image<I>& ima); diff --git a/milena/mln/topo/is_not_end_point.hh b/milena/mln/topo/is_not_end_point.hh index 31ac02d..61b6e7b 100644 --- a/milena/mln/topo/is_not_end_point.hh +++ b/milena/mln/topo/is_not_end_point.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -51,7 +52,7 @@ namespace mln /// Build a functor, and assign an image to it. /// /// \param nbh The (foreground) neighborhood. - /// \apram ima The image. + /// \param ima The image. is_not_end_point(const Neighborhood<N>& nbh, const Image<I>& ima); /// Set the underlying image. diff --git a/milena/mln/topo/is_simple_point2d.hh b/milena/mln/topo/is_simple_point2d.hh index ae05663..d8f3fc6 100644 --- a/milena/mln/topo/is_simple_point2d.hh +++ b/milena/mln/topo/is_simple_point2d.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011, 2013 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -69,7 +69,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_simple_point2d(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image<I>& ima); diff --git a/milena/mln/topo/is_simple_point3d.hh b/milena/mln/topo/is_simple_point3d.hh index d3dac55..de83168 100644 --- a/milena/mln/topo/is_simple_point3d.hh +++ b/milena/mln/topo/is_simple_point3d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -64,7 +65,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_simple_point3d(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image<I>& ima); -- 1.7.10.4

9 years, 11 months

olena: olena-2.0-854-g874c85f Address Clang warnings in Milena.

by Roland Levillain

* mln/core/image/dmorph/mutable_extension_ima.hh, * tests/metal/is.cc, * tests/transform/fft.cc: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/image/dmorph/mutable_extension_ima.hh | 6 +++--- milena/tests/metal/is.cc | 5 +++-- milena/tests/transform/fft.cc | 13 ++++++++----- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index acf88b9..c00e8fa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + + Address Clang warnings in Milena. + + * mln/core/image/dmorph/mutable_extension_ima.hh, + * tests/metal/is.cc, + * tests/transform/fft.cc: + Here. + 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> Improve tests on mln::border::mirror. diff --git a/milena/mln/core/image/dmorph/mutable_extension_ima.hh b/milena/mln/core/image/dmorph/mutable_extension_ima.hh index f208581..701534f 100644 --- a/milena/mln/core/image/dmorph/mutable_extension_ima.hh +++ b/milena/mln/core/image/dmorph/mutable_extension_ima.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -40,7 +40,7 @@ namespace mln { // Forward declaration. - template <typename I, typename J> struct mutable_extension_ima; + template <typename I, typename J> class mutable_extension_ima; namespace internal diff --git a/milena/tests/metal/is.cc b/milena/tests/metal/is.cc index 9778c6c..d9d1962 100644 --- a/milena/tests/metal/is.cc +++ b/milena/tests/metal/is.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -39,7 +40,7 @@ struct dest struct from_2 { - operator dest() const { dest* tmp; return *tmp; } + operator dest() const { dest* tmp = 0; return *tmp; } }; diff --git a/milena/tests/transform/fft.cc b/milena/tests/transform/fft.cc index 1dce9df..c5449c9 100644 --- a/milena/tests/transform/fft.cc +++ b/milena/tests/transform/fft.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2012 EPITA Research and Development Laboratory +// Copyright (C) 2004, 2012, 2014 EPITA Research and Development Laboratory. // // This file is part of Olena. // @@ -86,12 +86,15 @@ int main () io::pgm::save(out, "fft_trans_log.pgm"); - for (int row = 40; row < im2.nrows() - 40; ++row) - for (int col = 0; col < im2.ncols(); ++col) + int nrows = im2.nrows(); + int ncols = im2.ncols(); + int hlen = 40; + for (int row = hlen; row < nrows - hlen; ++row) + for (int col = 0; col < ncols; ++col) opt::at(im2, row, col) = 0; - for (int row = 0; row < im2.nrows(); ++row) - for (int col = 40; col < im2.ncols() - 40; ++col) + for (int row = 0; row < nrows; ++row) + for (int col = hlen; col < ncols - hlen; ++col) opt::at(im2, row, col) = 0; fft = fourier.transformed_image_log_magn<int_u8>(true); -- 1.7.10.4

9 years, 11 months

olena: branch next updated: olena-2.0-854-g7f13595

by git＠lrde.epita.fr

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 next has been updated discards 37db86920108a095aa87b2ae0be6322ee3804e49 (commit) discards 8f4ee017f9b8e2bf3541df3e464bc2d56368bf04 (commit) via 7f135958759e0b5bbbfdbedd6873ad4bda2c666a (commit) via 11434c3d5bce98164462b59d0a30c9a0219297c7 (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 (37db86920108a095aa87b2ae0be6322ee3804e49) \ N -- N -- N (7f135958759e0b5bbbfdbedd6873ad4bda2c666a) 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 ----------------------------------------------------------------- 7f13595 Add a test case to exercise the issue of Trac ticket #125. 11434c3 Improve tests on mln::border::mirror. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +- milena/mln/border/mirror.hh | 225 +++++++++++++++++++++++-------------------- 2 files changed, 122 insertions(+), 108 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 11 months

olena: olena-2.0-853-g11434c3 Improve tests on mln::border::mirror.

by Roland Levillain

* tests/border/mirror.cc: Revamp. * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. --- milena/ChangeLog | 7 ++++ milena/tests/border/Makefile.am | 5 +-- milena/tests/border/mirror.cc | 74 ++++++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a2e295e..acf88b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + + Improve tests on mln::border::mirror. + + * tests/border/mirror.cc: Revamp. + * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. + 2012-10-02 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a precondition (Trac ticket #256). diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 64c8197..a268a5b 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -26,6 +26,7 @@ check_PROGRAMS = \ find \ get \ mirror \ + mirror_full \ resize_equal \ resize_image1d_1 \ resize_image1d_2 \ diff --git a/milena/tests/border/mirror.cc b/milena/tests/border/mirror.cc index 09435e5..58a038e 100644 --- a/milena/tests/border/mirror.cc +++ b/milena/tests/border/mirror.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// Exercise mln::border::mirror. #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> @@ -35,46 +35,54 @@ #include <mln/data/paste_without_localization.hh> #include <mln/data/compare.hh> -using namespace mln; - int -main (void) +main() { - { - image1d<int> ima(2, 3); - debug::iota(ima); - border::mirror(ima); - mln_assertion(opt::element(ima, 0) == 2); - mln_assertion(opt::element(ima, 1) == 2); - mln_assertion(opt::element(ima, 2) == 1); - mln_assertion(opt::element(ima, 3) == 1); - mln_assertion(opt::element(ima, 4) == 2); - mln_assertion(opt::element(ima, 5) == 2); - mln_assertion(opt::element(ima, 6) == 1); - mln_assertion(opt::element(ima, 7) == 1); - } - + using namespace mln; - // Image2d + // image1d. { - unsigned ref_data[6][7] = { - { 1, 1, 4, 5, 6, 3, 3 }, - { 1, 1, 1, 2, 3, 3, 3 }, - { 2, 1, 1, 2, 3, 3, 2 }, - { 5, 4, 4, 5, 6, 6, 5 }, - { 4, 4, 4, 5, 6, 6, 6 }, - { 4, 4, 1, 2, 3, 6, 6 } - }; + // A 2-pixel 1D image with a 3-pixel border. + image1d<unsigned> input(2, 3); + debug::iota(input); + border::mirror(input); + // Data are framed; other values form the border. + unsigned ref_data[8] = + // ,-------------. + { 2, 2, 1, /* | */ 1, 2, /* | */ 2, 1, 1 }; + // `-------------' + image1d<unsigned> ref = make::image(ref_data); - image2d<unsigned> ref = make::image(ref_data); + image1d<unsigned> output(8, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); + } + + // image2d. + { + // A 2x3-pixel 2D image with a 2-pixel border. image2d<unsigned> input(2, 3, 2); - image2d<unsigned> res(6, 7, 0); debug::iota(input, 0); border::mirror(input); - data::paste_without_localization(extended_to(input, input.vbbox()), res); + // Data are framed; other values form the border. + unsigned ref_data[6][7] = { + { 1, 1, 4, 5, 6, 3, 3 }, + { 1, 1, 1, 2, 3, 3, 3 }, + // ,----------------. + { 2, 1, /* | */ 1, 2, 3, /* | */ 3, 2 }, + { 5, 4, /* | */ 4, 5, 6, /* | */ 6, 5 }, + // `----------------' + { 4, 4, 4, 5, 6, 6, 6 }, + { 4, 4, 1, 2, 3, 6, 6 } + }; + image2d<unsigned> ref = make::image(ref_data); - mln_assertion(res == ref); + image2d<unsigned> output(6, 7, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); } } -- 1.7.10.4

9 years, 11 months

olena: branch next updated: olena-2.0-854-g37db869

by git＠lrde.epita.fr

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 next has been updated discards ffdd63fed19fc26c8807ce67a72fb42d507a9f94 (commit) discards 888cdfe7745e9f4016e0c73b64933a8162229e4a (commit) via 37db86920108a095aa87b2ae0be6322ee3804e49 (commit) via 8f4ee017f9b8e2bf3541df3e464bc2d56368bf04 (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 (ffdd63fed19fc26c8807ce67a72fb42d507a9f94) \ N -- N -- N (37db86920108a095aa87b2ae0be6322ee3804e49) 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 ----------------------------------------------------------------- 37db869 Add a test case to exercise the issue of Trac ticket #125. 8f4ee01 Various changes in mln::border::mirror. ----------------------------------------------------------------------- Summary of changes: milena/mln/border/mirror.hh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 11 months

olena: branch next updated: olena-2.0-854-gffdd63f

by git＠lrde.epita.fr

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 next has been updated discards 8758e60615436bdf40fc662343cad3ac24e74d9a (commit) via ffdd63fed19fc26c8807ce67a72fb42d507a9f94 (commit) via 888cdfe7745e9f4016e0c73b64933a8162229e4a (commit) via f1072390229a482c78e88aee3f3c67ea8502b4ea (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 (8758e60615436bdf40fc662343cad3ac24e74d9a) \ N -- N -- N (ffdd63fed19fc26c8807ce67a72fb42d507a9f94) 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 ----------------------------------------------------------------- ffdd63f Add a test case to exercise the issue of Trac ticket #125. 888cdfe Various changes in mln::border::mirror. f107239 Fix a precondition (Trac ticket #256). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 +- milena/mln/border/mirror.hh | 223 +++++++++----------- milena/tests/border/Makefile.am | 5 +- milena/tests/border/mirror.cc | 74 ++++--- milena/tests/value/Makefile.am | 5 +- .../essential.hh => tests/value/literals_op.cc} | 21 +- 6 files changed, 178 insertions(+), 170 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 11 months

olena: olena-2.0-854-g7f13595 Add a test case to exercise the issue of Trac ticket #125.

by Roland Levillain

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index acf88b9..97b2bb9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Improve tests on mln::border::mirror. * tests/border/mirror.cc: Revamp. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

9 years, 11 months

olena: olena-2.0-854-g37db869 Add a test case to exercise the issue of Trac ticket #125.

by Roland Levillain

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0206b0f..8f2766a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Various changes in mln::border::mirror. * mln/border/mirror.hh: Here. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

9 years, 11 months

olena: olena-2.0-854-gffdd63f Add a test case to exercise the issue of Trac ticket #125.

by Roland Levillain

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0206b0f..8f2766a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Various changes in mln::border::mirror. * mln/border/mirror.hh: Here. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

9 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2014