Commit ecee001f authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Small fixes.

	* mln/accu/math/inf.hh,
	* mln/accu/math/sup.hh,
	* mln/accu/shape/height.hh,
	* mln/accu/shape/volume.hh,
	* mln/accu/stat/median_alt.hh,
	* mln/value/stack.hh: fix invalid namespace closing.

	* mln/util/internal/graph_iter.hh,
	* mln/fun/v2v/rgb_to_hsl.hh: fix ambiguities with operators.

	* mln/value/internal/gray_f.hh: repair header.

	* tests/registration/Makefile.am: disable registration test.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4150 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent ca4c5986
2009-06-16 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr>
Small fixes.
* mln/accu/math/inf.hh,
* mln/accu/math/sup.hh,
* mln/accu/shape/height.hh,
* mln/accu/shape/volume.hh,
* mln/accu/stat/median_alt.hh,
* mln/value/stack.hh: fix invalid namespace closing.
* mln/util/internal/graph_iter.hh,
* mln/fun/v2v/rgb_to_hsl.hh: fix ambiguities with operators.
* mln/value/internal/gray_f.hh: repair header.
* tests/registration/Makefile.am: disable registration test.
2009-06-15 Edwin Carlinet <carlinet@lrde.epita.fr>
 
Move inf and sup accumulators into math directory.
......@@ -166,10 +166,10 @@ namespace mln
return true;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::math
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
......
......@@ -168,10 +168,10 @@ namespace mln
return true;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::math
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -200,10 +201,10 @@ namespace mln
return true;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::shape
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
......
......@@ -217,10 +217,10 @@ namespace mln
return true;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::shape
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -326,11 +327,10 @@ namespace mln
return ostr << m.to_result();
}
} // end of namespace mln::accu::stat
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::stat
} // end of namespace mln::accu
} // end of namespace mln
......
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -102,7 +103,7 @@ namespace mln
else
hsl.hue() = (60. * (rgb.red() - rgb.green()) / (rmax - rmin)) + 240;
hsl.lum() = ((double) rmax + rmin) / 2;
hsl.lum() = ((double) rmax + (double) rmin) / 2;
// We want min and max between 0 and 1
rmax -= mln_min(typename T_rgb::red_t);
......
......@@ -189,7 +189,7 @@ namespace mln
util::vertex_id_t
vertex_fwd_iterator<G>::next_id_() const
{
return this->p_.id() + 1;
return this->p_.id().value() + 1;
}
......@@ -224,7 +224,7 @@ namespace mln
util::vertex_id_t
vertex_bkd_iterator<G>::next_id_() const
{
return this->p_.id() - 1;
return this->p_.id().value() - 1;
}
......@@ -259,7 +259,7 @@ namespace mln
util::edge_id_t
edge_fwd_iterator<G>::next_id_() const
{
return this->p_.id() + 1;
return this->p_.id().value() + 1;
}
......@@ -294,7 +294,7 @@ namespace mln
util::edge_id_t
edge_bkd_iterator<G>::next_id_() const
{
return this->p_.id() - 1;
return this->p_.id().value() - 1;
}
# endif // ! MLN_INCLUDE_ONLY
......
// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -323,10 +324,10 @@ namespace mln
return imas;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::value
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln
......
......@@ -20,9 +20,9 @@
include $(top_srcdir)/milena/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
check_PROGRAMS = registration
registration_SOURCES = registration.cc
# FIXME: Not distributed (yet) and currently disabled.
# check_PROGRAMS = registration
# registration_SOURCES = registration.cc
#>>
TESTS = $(check_PROGRAMS)
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