URL:
https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena
ChangeLog:
2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr>
Fix fill_with_image.
* milena/mln/level/fill_with_image.hh: Use exact().
* milena/mln/level/fill_with_image.spe.hh:
Fix fill_with_image prototype.
* milena/mln/level/memcpy_.hh: Use full namespace name.
---
fill_with_image.hh | 6 ++++--
fill_with_image.spe.hh | 2 +-
memcpy_.hh | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
Index: branches/cleanup-2008/milena/mln/level/fill_with_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/level/fill_with_image.hh (revision 2261)
+++ branches/cleanup-2008/milena/mln/level/fill_with_image.hh (revision 2262)
@@ -90,10 +90,12 @@
{
template <typename I, typename J>
- inline
- void fill_with_image(Image<I>& ima, const Image<J>& data)
+ void fill_with_image(Image<I>& ima_, const Image<J>& data_)
{
trace::entering("level::impl::generic::fill_with_image");
+ I& ima = exact(ima_);
+ const J& data = exact(data_);
+
internal::fill_with_image_tests(ima, data);
mln_piter(I) p(ima.domain());
Index: branches/cleanup-2008/milena/mln/level/memcpy_.hh
===================================================================
--- branches/cleanup-2008/milena/mln/level/memcpy_.hh (revision 2261)
+++ branches/cleanup-2008/milena/mln/level/memcpy_.hh (revision 2262)
@@ -118,8 +118,8 @@
typedef mln_image(Pd) Id;
metal::is_not_const<Id>::check();
typedef mln_image(Ps) Is;
- Pd& dest = internal::force_exact<Pd>(dest_);
- Ps& src = internal::force_exact<Ps>(src_);
+ Pd& dest = mln::internal::force_exact<Pd>(dest_);
+ Ps& src = mln::internal::force_exact<Ps>(src_);
mln_precondition(sizeof(mln_value(Id)) == sizeof(mln_value(Is)));
mln_precondition(dest.ima().has_data());
Index: branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh
===================================================================
--- branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh (revision 2261)
+++ branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh (revision 2262)
@@ -55,7 +55,7 @@
namespace generic
{
template <typename I, typename J>
- void fill_with_image(const Image<I>& data, Image<J>& destination);
+ void fill_with_image(Image<I>& ima, const Image<J>& data);
}
// FIXME: Add specializations here...