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 fixes has been updated
via 9bb391b78fcf0bb54e1c5d6ff1387021698a5db7 (commit)
via dfc378d90e022510767e81dfa75a5833239982c9 (commit)
from 90d7601e315c41aad406f50784cff6a392cf6c00 (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 -----------------------------------------------------------------
9bb391b Remove an inadvertently added file.
dfc378d Fix and improve mln::draw::dashed_line.
-----------------------------------------------------------------------
Summary of changes:
milena/ChangeLog | 18 ++++
milena/mln/core/site_set/p_line2d.hh | 1 -
milena/mln/draw/dashed_line.hh | 18 ++--
milena/mln/linear/#ch_convolve.hh# | 103 --------------------
milena/tests/draw/Makefile.am | 4 +-
.../binary_2d/subsample.cc => draw/dashed_line.cc} | 29 +++---
6 files changed, 48 insertions(+), 125 deletions(-)
delete mode 100644 milena/mln/linear/#ch_convolve.hh#
copy milena/tests/{world/binary_2d/subsample.cc => draw/dashed_line.cc} (75%)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
* mln/linear/#ch_convolve.hh#: Remove.
---
milena/ChangeLog | 6 +++
milena/mln/linear/#ch_convolve.hh# | 103 ------------------------------------
2 files changed, 6 insertions(+), 103 deletions(-)
delete mode 100644 milena/mln/linear/#ch_convolve.hh#
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 04622e7..e9e9079 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,11 @@
2013-07-25 Roland Levillain <roland(a)lrde.epita.fr>
+ Remove an inadvertently added file.
+
+ * mln/linear/#ch_convolve.hh#: Remove.
+
+2013-07-25 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix and improve mln::draw::dashed_line.
* mln/core/site_set/p_line2d.hh (mln::p_line2d::has(const psite&)):
diff --git a/milena/mln/linear/#ch_convolve.hh# b/milena/mln/linear/#ch_convolve.hh#
deleted file mode 100644
index b06583d..0000000
--- a/milena/mln/linear/#ch_convolve.hh#
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (C) 2008, 2009, 2012 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.
-
-#ifndef MLN_LINEAR_CH_CONVOLVE_HH
-# define MLN_LINEAR_CH_CONVOLVE_HH
-
-/// \file
-///
-/// Define convolution return type.
-
-# include <mln/core/concept/image.hh>
-# include <mln/core/concept/window.hh>
-# include <mln/core/concept/weighted_window.hh>
-# include <mln/trait/ch_value.hh>
-# include <mln/value/ops.hh>
-
-# include <mln/algebra/vec.hh>
-
-
-/// Define the result of the convolution of an image with type \p I
-/// with a weighted window of type \p W or weights of type \p W.
-# define mln_ch_convolve(I, W) \
- typename mln::linear::ch_convolve<I, W>::ret
-
-# define mln_ch_convolve_(I, W) \
- mln::linear::ch_convolve<I, W>::ret
-
-
-# define mln_ch_convolve_grad(I, W) \
- typename mln::trait::ch_value< I, algebra::vec< I::site::dim, typename mln::linear::ch_convolve<I,W>::ret::value > >::ret
-
-# define mln_ch_convolve_grad_(I, W) \
- mln::trait::ch_value< I, algebra::vec< I::site::dim, mln::linear::ch_convolve<I,W>::ret::value > >::ret
-
-
-namespace mln
-{
-
- namespace linear
- {
-
- namespace internal
- {
-
- template <bool b, /* = true, i.e., W is a Weighted_Window */
- typename I, typename W>
- struct ch_convolve_helper
- {
- typedef mln_sum_product(mln_value(I), mln_weight(W)) V;
- typedef mln_ch_value(I, V) ret;
- };
-
- template <typename I, typename W>
- struct ch_convolve_helper<false, I, W>
- {
- typedef mln_sum_product(mln_value(I), W) V;
- typedef mln_ch_value(I, V) ret;
- };
-
- } // end of namespace mln::linear::internal
-
-
- template <typename I, typename W>
- struct ch_convolve
- : private mlc_and( mlc_is_a(I, Image),
- mlc_is_not_a(W, Window) )::check_t
- {
- protected:
- enum { is_w_win = mlc_is_a(W, Weighted_Window)::value };
- typedef internal::ch_convolve_helper<is_w_win, I, W> helper;
- public:
- typedef mlc_ret(helper) ret;
- };
-
- } // end of namespace mln::linear
-
-} // end of namespace mln
-
-
-#endif // ! MLN_LINEAR_CH_CONVOLVE_HH
--
1.7.10.4
* mln/core/site_set/p_line2d.hh (mln::p_line2d::has(const psite&)):
Remove a too strict precondition.
* mln/draw/dashed_line.hh (mln::draw::dashed_line):
Rework implementation to make it more like mln::draw::line's.
Clean up a bit.
* tests/draw/dashed_line.cc: New test.
* tests/draw/Makefile.am (check_PROGRAMS): Add dashed_line.
---
milena/ChangeLog | 12 ++++++++
milena/mln/core/site_set/p_line2d.hh | 1 -
milena/mln/draw/dashed_line.hh | 18 +++++++-----
milena/tests/draw/Makefile.am | 4 +--
.../binary_2d/subsample.cc => draw/dashed_line.cc} | 29 ++++++++++++--------
5 files changed, 42 insertions(+), 22 deletions(-)
copy milena/tests/{world/binary_2d/subsample.cc => draw/dashed_line.cc} (75%)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index add0a55..04622e7 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-25 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix and improve mln::draw::dashed_line.
+
+ * mln/core/site_set/p_line2d.hh (mln::p_line2d::has(const psite&)):
+ Remove a too strict precondition.
+ * mln/draw/dashed_line.hh (mln::draw::dashed_line):
+ Rework implementation to make it more like mln::draw::line's.
+ Clean up a bit.
+ * tests/draw/dashed_line.cc: New test.
+ * tests/draw/Makefile.am (check_PROGRAMS): Add dashed_line.
+
2013-07-04 Roland Levillain <roland(a)lrde.epita.fr>
Work around a Clang 3.0 bug.
diff --git a/milena/mln/core/site_set/p_line2d.hh b/milena/mln/core/site_set/p_line2d.hh
index 1cbd3f6..e1ed059 100644
--- a/milena/mln/core/site_set/p_line2d.hh
+++ b/milena/mln/core/site_set/p_line2d.hh
@@ -240,7 +240,6 @@ namespace mln
bool
p_line2d::has(const psite& p) const
{
- mln_precondition(p.target_() == this); // FIXME: Refine.
if (! has(p.index()))
return false;
mln_invariant(p.to_site() == (*this)[p.index()]);
diff --git a/milena/mln/draw/dashed_line.hh b/milena/mln/draw/dashed_line.hh
index d26559b..1b76cfe 100644
--- a/milena/mln/draw/dashed_line.hh
+++ b/milena/mln/draw/dashed_line.hh
@@ -17,7 +17,7 @@
//
// 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 indashed_line functions from this
+// 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
@@ -29,15 +29,16 @@
/// \file
///
-/// \brief Draw a dashed_line in an image.
-/// \todo Add specializations for horizontal dashed_lines (use
+/// \brief Draw a dashed line in an image.
+/// \todo Add specializations for horizontal dashed lines (use
/// pointers/memset).
# include <mln/core/concept/function.hh>
# include <mln/core/concept/image.hh>
# include <mln/core/site_set/p_line2d.hh>
# include <mln/core/image/imorph/safe.hh>
-# include <mln/data/fill.hh>
+# include <mln/core/image/dmorph/image_if.hh>
+# include <mln/data/paste.hh>
# include <mln/pw/image.hh>
# include <mln/pw/cst.hh>
@@ -52,8 +53,8 @@ namespace mln
between the points \p beg and \p end.
\param[in,out] ima The image to be drawn.
- \param[in] beg The start point to drawn dashed_line.
- \param[in] end The end point to drawn dashed_line.
+ \param[in] beg The start point to drawn dashed line.
+ \param[in] end The end point to drawn dashed line.
\param[in] v The value to assign to all drawn pixels.
\pre \p ima has to be initialized.
@@ -103,7 +104,10 @@ namespace mln
if (! ima.has(end))
mln_trace_warning("End site is not part of the given image.");
- data::fill(((ima | p_line2d(beg, end)).rw() | internal::dashed_line_f<I, 1>()).rw(), v);
+ data::paste(pw::cst(v)
+ | p_line2d(beg, end)
+ | internal::dashed_line_f<I, 1>(),
+ safe(ima).rw());
}
# endif // ! MLN_INCLUDE_ONLY
diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am
index 0ef96b5..3c1e8f5 100644
--- a/milena/tests/draw/Makefile.am
+++ b/milena/tests/draw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development
# Laboratory (LRDE)
#
# This file is part of Olena.
@@ -18,8 +18,8 @@
include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
+ dashed_line \
line \
graph
-
TESTS = $(check_PROGRAMS)
diff --git a/milena/tests/world/binary_2d/subsample.cc b/milena/tests/draw/dashed_line.cc
similarity index 75%
copy from milena/tests/world/binary_2d/subsample.cc
copy to milena/tests/draw/dashed_line.cc
index f7aa4ef..86ebad9 100644
--- a/milena/tests/world/binary_2d/subsample.cc
+++ b/milena/tests/draw/dashed_line.cc
@@ -24,25 +24,30 @@
// executable file might be covered by the GNU General Public License.
/// \file
-/// Exercise mln::world::binary_2d::subsample.
+/// \brief Exercise mln::draw::dashed_line.
#include <mln/core/image/image2d.hh>
-#include <mln/value/int_u8.hh>
-#include <mln/world/binary_2d/subsample.hh>
-
-#include <mln/io/pbm/load.hh>
-#include <mln/io/pgm/save.hh>
-
-#include "tests/data.hh"
+#include <mln/draw/line.hh>
+#include <mln/draw/dashed_line.hh>
+#include <mln/data/fill.hh>
+#include <mln/data/compare.hh>
int main()
{
using namespace mln;
- using value::int_u8;
- image2d<bool> input = io::pbm::load(MLN_IMG_DIR "/small.pbm");
- image2d<int_u8> output = world::binary_2d::subsample(input, 3);
- io::pgm::save(output, "subsample-small.pgm");
+ point2d p1 = point2d(2,3);
+ point2d p2 = point2d(2,3);
+
+ image2d<bool> ima1(10,10);
+ data::fill(ima1, false);
+ draw::dashed_line(ima1, p1, p2, true);
+
+ image2d<bool> ima2(10,10);
+ data::fill(ima2, false);
+ draw::line(ima2, p1, p2, true);
+
+ mln_assertion(ima1 <= ima2);
}
--
1.7.10.4
#232: Update contributors' list on Olena's Web site
----------------------+-----------------------------------------------------
Reporter: levill_r | Owner: Olena Team
Type: task | Status: new
Priority: major | Milestone: Olena 1.1
Component: Web | Version: 1.0
Keywords: |
----------------------+-----------------------------------------------------
This page :
https://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Contributors
should be updated with the latest version (e.g., from branch `next`) of
this file :
source:AUTHORS
Better: write a script to automate the conversion, so as to simplify the
process of updating this page down to a copy-and-paste operation.
--
Ticket URL: <https://trac.lrde.org/olena/ticket/232>
Olena <http://olena.lrde.epita.fr>
Olena, a generic and efficient C++ image processing library.
Environmental enterprise searching for representation internationally
5% commission on 200K cash flow originated from promotion and sales of proprietary research articles
Necessary conditions:
- Own a company
- Be reachable on daily basis through E-mail, phone or Skype
- Proper execution of all planned undertakings
In case if being interested, please provide:
- Name and Surname
- Age
- Telephone number (including country code)
- City and Country
- Email
Please answer to: Noah(a)careers-consulting.com
Faithfully yours,
HR dept
Environmental enterprise searching for representation internationally
5% commission on 200K cash flow originated from promotion and sales of proprietary research articles
Necessary conditions:
- Own a company
- Be reachable on daily basis through E-mail, phone or Skype
- Proper execution of all planned undertakings
In case if being interested, please provide:
- �Name and Surname
- �Age
- �Telephone number (including country code)
- City and Country
- �Email
Please answer to: Delores(a)careers-consulting.com
Faithfully yours,
HR dept
Environmental enterprise searching for representation internationally
5% commission on 200K cash flow originated from promotion and sales of proprietary research articles
Necessary conditions:
- Own a company
- Be reachable on daily basis through E-mail, phone or Skype
- Proper execution of all planned undertakings
In case if being interested, please provide:
- Name and Surname
- Age
- Telephone number (including country code)
- City and Country
- Email
Please answer to: Lenny(a)careers-consulting.com
Faithfully yours,
HR dept