Commit 749308a7 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Various small fixes.

	* doc/tutorial/tutorial.tex: Add more contacts.

	* mln/accu/label_used.hh: Do not use label<>::next().

	* mln/draw/line.hh: Add a fixme.

	* mln/io/dump/save.hh: Close the file.

	* mln/io/plot/save.hh: Fix an invalid prototype.

	* mln/io/pnm/load.hh: Fix an invalid static check.

	* mln/io/raw/get_header.hh: Fix comment.

	* mln/labeling/pack.hh: Disable a static check on symbolic values.

	* mln/math/diff_abs.hh: Add a fixme.

	* mln/world/inter_pixel/full2image.hh: Use mln_concrete().

	* mln/data/fill_with_value.hh,
	* mln/io/raw/load.hh,
	* mln/io/raw/save.hh,
	* mln/labeling/compute.hh,
	* mln/registration/icp.hh: Aesthetic changes.
parent 49762301
2010-02-16 Guillaume Lazzara <z@lrde.epita.fr>
Various small fixes.
* doc/tutorial/tutorial.tex: Add more contacts.
* mln/accu/label_used.hh: Do not use label<>::next().
* mln/draw/line.hh: Add a fixme.
* mln/io/dump/save.hh: Close the file.
* mln/io/plot/save.hh: Fix an invalid prototype.
* mln/io/pnm/load.hh: Fix an invalid static check.
* mln/io/raw/get_header.hh: Fix comment.
* mln/labeling/pack.hh: Disable a static check on symbolic values.
* mln/math/diff_abs.hh: Add a fixme.
* mln/world/inter_pixel/full2image.hh: Use mln_concrete().
* mln/data/fill_with_value.hh,
* mln/io/raw/load.hh,
* mln/io/raw/save.hh,
* mln/labeling/compute.hh,
* mln/registration/icp.hh: Aesthetic changes.
2010-02-16 Guillaume Lazzara <z@lrde.epita.fr>
 
* mln/topo/skeleton/crest.hh: Fix invalid PSI values for component
......@@ -545,6 +545,10 @@ If you want to reach us directly, you can contact one of the following people:
\begin{itemize}
\item Thierry Geraud - Project Manager - thierry.geraud@lrde.epita.fr
\item Jonathan Fabrizio - jonathan.fabrizio@lrde.epita.fr
\item Yann Jacquelet - yann.jacquelet@lrde.epita.fr
\item Guillaume Lazzara - guillaume.lazzara@lrde.epita.fr
\item Roland Levillain - roland.levillain@lrde.epita.fr
\end{itemize}
......
// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -116,7 +117,7 @@ namespace mln
label_used<L>::take(const argument& l)
{
if (label_used_.size() <= l)
label_used_.resize(l.next(), false);
label_used_.resize(unsigned(l) + 1, false);
label_used_(l) = true;
}
......
// 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.
//
......
......@@ -30,6 +30,7 @@
/// \file
///
/// Draw a line in an image.
/// \fixme Add specializations for horizontal lines (use pointers/memset).
# include <mln/core/concept/image.hh>
# include <mln/core/site_set/p_line2d.hh>
......
......@@ -144,6 +144,9 @@ namespace mln
internal::save_header(ima, file);
internal::save_data(ima, file);
file.close();
trace::exiting("mln::io::dump::save");
}
......
// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -60,7 +61,7 @@ namespace mln
template <typename T>
void save(util::array<T>& arr,
const std::string& filename,
int start_value = 0);
int start_value);
# ifndef MLN_INCLUDE_ONLY
......
......@@ -197,7 +197,8 @@ namespace mln
inline
void load_raw_2d(std::ifstream& file, I& ima)
{
if (sizeof(value::int_u8) == 1)
typedef mln_value(I) V;
if (sizeof(V) == 1)
load_raw_2d_contiguous(file, ima);
else
load_raw_2d_uncontiguous(file, ima);
......
......@@ -28,7 +28,7 @@
/// \file
///
/// Load a Milena image rawed into a file.
/// Load a raw image header.
# include <iostream>
# include <fstream>
......
// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
// Copyright (C) 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
......
// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE)
//
// This file is part of Olena.
//
......
......@@ -38,11 +38,11 @@
/// and change 'input' from Image to Site_Set!
/// ==> NO, see below. (Z)
///
/// The overload not taking 'input' as argument works on sites and would be a good
/// candidate for set::compute. However, the fact that this version of compute
/// is in the namespace 'labeling' means that it produces several results at the
/// same time for each labels which is not the case of other implementations of
/// compute.
/// The overload not taking 'input' as argument works on sites and
/// would be a good candidate for set::compute. However, the fact that
/// this version of compute is in the namespace 'labeling' means that
/// it produces several results at the same time for each labels which
/// is not the case of other implementations of compute.
# include <mln/core/concept/image.hh>
# include <mln/core/concept/accumulator.hh>
......
......@@ -100,7 +100,7 @@ namespace mln
pack_tests(const Image<I>& label, mln_value(I)& new_nlabels)
{
// FIXME: we may want to check that it is exactly a label.
mlc_is_a(mln_value(I), mln::value::Symbolic)::check();
//mlc_is_a(mln_value(I), mln::value::Symbolic)::check();
mln_precondition(exact(label).is_valid());
(void) label;
(void) new_nlabels;
......
// 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.
//
......@@ -29,6 +30,8 @@
/// \file
///
/// Define diff_abs routine.
///
/// \fixme Do we want a specific version for vectorial types?
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.
//
......
......@@ -52,7 +52,7 @@ namespace mln
/// \return A classical image without inter-pixel data.
//
template <typename I>
I
mln_concrete(I)
full2image(const Image<I>& input);
......@@ -60,7 +60,7 @@ namespace mln
template <typename I>
I
mln_concrete(I)
full2image(const Image<I>& input_)
{
trace::entering("world::inter_pixel::full2image");
......
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