Commit 4be527e9 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Small fixes.

	* mln/core/point.hh: Fix point1d conversion.

	* mln/debug/draw_graph.hh: Don't write outside output image.

	* mln/win/multiple_size.hh: Avoid a warning.
parent b535547e
2011-08-08 Guillaume Lazzara <z@lrde.epita.fr>
Small fixes.
* mln/core/point.hh: Fix point1d conversion.
* mln/debug/draw_graph.hh: Don't write outside output image.
* mln/win/multiple_size.hh: Avoid a warning.
2011-08-05 Guillaume Lazzara <z@lrde.epita.fr>
 
* mln/util/timer.hh: Add support for milliseconds output.
// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
// Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and
// Development Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -337,6 +337,18 @@ namespace mln
to[i-j] = mln::internal::convert_data<C2>(from[j]);
}
template <typename C1, typename G, typename C2>
inline
void
from_to_(const mln::algebra::vec<1,C1>& from, point<G,C2>& to)
{
mlc_converts_to(C1, C2)::check();
enum { dim = G::dim };
mlc_bool(G::dim == 1)::check();
to[0] = mln::internal::convert_data<C2>(from[0]);
}
template <unsigned n, typename C1, typename G>
inline
void
......@@ -352,6 +364,16 @@ namespace mln
to[i-j] = from[j];
}
template <typename C1, typename G>
inline
void
from_to_(const mln::algebra::vec<1,C1>& from, point<G,C1>& to)
{
enum { dim = G::dim };
mlc_bool(G::dim == 1)::check();
to[0] = from[0];
}
} // end of namespace mln::convert::over_load
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -195,6 +196,7 @@ namespace mln
if (ima.has(p) && p.id() != 0u)
{
box2d box(p + dpoint2d(-5, -5), p + dpoint2d(+5, +5));
box.crop_wrt(ima.domain());
draw::box_plain(ima, box, vcolor_f(p.id()));
}
......
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2008, 2009, 2011 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -202,6 +203,7 @@ namespace mln
multiple_size<n,W,F>::set_window(unsigned i, const W& win)
{
mln_precondition(i == win_.nelements());
(void) i;
win_.append(win);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment