https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Have beguin/irm compile again.
* beguin/irm.cc: Catch up with the interface of
mln::util::vertex_id.
(my_mln::merge_fg): Remove a useless `typename'.
irm.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: beguin/irm.cc
--- beguin/irm.cc (revision 2073)
+++ beguin/irm.cc (working copy)
@@ -314,7 +314,7 @@
fusion_graph fg;
// Vertices.
- for (util::vertex_id i = 0; i < rag.nvertices(); ++i)
+ for (util::vertex_id i = 0; i < rag.nvertices(); ++i.to_equiv())
{
// The singleton subregion: { I }.
std::set<util::vertex_id> sr;
@@ -350,7 +350,7 @@
// A disjoint set of vertices represented as a forest of rooted
// trees (disjoint set forest).
std::vector<util::vertex_id> parent(input.nvertices());
- for (util::vertex_id i = 0; i < parent.size(); ++i)
+ for (util::vertex_id i = 0; i < parent.size(); ++i.to_equiv())
// � make_set �.
parent[i] = i;
@@ -370,7 +370,7 @@
// Children.
typedef std::multimap<util::vertex_id, util::vertex_id> children_t;
children_t children;
- for (typename util::vertex_id i = 0; i < parent.size(); ++i)
+ for (util::vertex_id i = 0; i < parent.size(); ++i.to_equiv())
{
// � find �.
util::vertex_id r = i;
@@ -507,7 +507,7 @@
// Compute the values (means) for the output image.
std::map<util::vertex_id, int_u8> region_value;
- for (util::vertex_id v = 0; v < fg.nvertices(); ++v)
+ for (util::vertex_id v = 0; v < fg.nvertices(); ++v.to_equiv())
{
// FIXME: Implicit cast. We should rather change the type of
// the accumulator instead.