* apps/graph-morpho/morpho.hh (combine): Check the exact images,
not the abstract ones.
---
milena/ChangeLog | 7 +++++++
milena/apps/graph-morpho/morpho.hh | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index a308bc3..7178936 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,12 @@
2009-10-06 Roland Levillain <roland(a)lrde.epita.fr>
+ Fix a precondition in apps/graph-morpho.
+
+ * apps/graph-morpho/morpho.hh (combine): Check the exact images,
+ not the abstract ones.
+
+2009-10-06 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix the instruction flow in multiple_qiter<W,F>::change_target.
* mln/win/multiple.hh (mln::win::multiple_qiter<W,F>::change_target):
diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh
index 5aaecae..2288995 100644
--- a/milena/apps/graph-morpho/morpho.hh
+++ b/milena/apps/graph-morpho/morpho.hh
@@ -177,13 +177,15 @@ namespace trait
template <typename I>
inline
mln_concrete(I)
-combine(const mln::Image<I>& vertices, const mln::Image<I>& edges)
+combine(const mln::Image<I>& vertices_, const mln::Image<I>& edges_)
{
typedef trait::graph<I> T;
+ const I& vertices = mln::exact(vertices_);
+ const I& edges = mln::exact(edges_);
mln_precondition(vertices.domain() == edges.domain());
mln_concrete(I) output;
- mln::initialize(output, exact(vertices));
+ mln::initialize(output, vertices);
mln::data::fill(output, false);
mln::data::paste(vertices | T::is_vertex(), output);
mln::data::paste(edges | T::is_edge(), output);
--
1.6.3.1
Show replies by date