* 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@lrde.epita.fr> + Remove an inadvertently added file. + + * mln/linear/#ch_convolve.hh#: Remove. + +2013-07-25 Roland Levillain <roland@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