Commit 669c38a5 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Small fixes in Milena.

	* milena/mln/canvas/labeling/blobs.hh: Fill extension.

	* milena/mln/data/paste_without_localization.hh: Check whether the
	two images have the same domain.

	* milena/mln/labeling/blobs_and_compute.hh: Rename members.

	* milena/mln/labeling/colorize.hh: Add missing includes.

	* milena/mln/world/binary_2d/enlarge.hh: use def::coord.
parent eba3666e
2010-04-30 Guillaume Lazzara <z@lrde.epita.fr>
Small fixes in Milena.
* milena/mln/canvas/labeling/blobs.hh: Fill extension.
* milena/mln/data/paste_without_localization.hh: Check whether the
two images have the same domain.
* milena/mln/labeling/blobs_and_compute.hh: Rename members.
* milena/mln/labeling/colorize.hh: Add missing includes.
* milena/mln/world/binary_2d/enlarge.hh: use def::coord.
2010-04-13 Guillaume Lazzara <z@lrde.epita.fr>
 
* mln/labeling/blobs_and_compute.hh: Fix an invalid size of
......@@ -36,6 +36,8 @@
# include <mln/data/fill.hh>
# include <mln/core/site_set/p_queue_fast.hh>
# include <mln/extension/fill.hh>
# include <mln/util/pix.hh>
namespace mln
......@@ -100,6 +102,9 @@ namespace mln
out_t output;
initialize(output, input);
data::fill(output, zero);
extension::fill(input, false);
functor.init(); // <-- functor.init()
// Loop.
......
......@@ -258,7 +258,8 @@ namespace mln
{
if (sizeof(mln_value(I)) == sizeof(mln_value(J)))
{
if (border::get(input) == border::get(output))
if (border::get(input) == border::get(output)
&& input.domain() == output.domain())
impl::paste_without_localization_fastest(input, output);
else
impl::paste_without_localization_lines(input, output);
......
......@@ -97,12 +97,12 @@ namespace mln
void process_p(const util::pix<L>& pix)
{
process_(accu_argument(), pix);
process__(accu_argument(), pix);
}
void process_n(const util::pix<L>& pix)
{
process_(accu_argument(), pix);
process__(accu_argument(), pix);
}
void finalize()
......@@ -112,17 +112,17 @@ namespace mln
private:
void process_(const mln_psite(L)&, const util::pix<L>& pix)
void process__(const mln_psite(L)&, const util::pix<L>& pix)
{
accus_[current_lbl_].take(pix.p());
}
void process_(const mln_value(L)&, const util::pix<L>& pix)
void process__(const mln_value(L)&, const util::pix<L>& pix)
{
accus_[current_lbl_].take(pix.v());
}
void process_(const util::pix<L>&, const util::pix<L>& pix)
void process__(const util::pix<L>&, const util::pix<L>& pix)
{
accus_[current_lbl_].take(pix);
}
......
......@@ -38,6 +38,8 @@
# include <mln/data/transform.hh>
# include <mln/data/compute.hh>
# include <mln/accu/stat/max.hh>
# include <mln/util/array.hh>
# include <mln/util/set.hh>
namespace mln
......
......@@ -117,9 +117,9 @@ namespace mln
mln_precondition(input.is_valid());
unsigned
def::coord
mrow = geom::min_row(input),
mcol = geom::min_col(input);
mcol = geom::min_col(input);
image2d<int_u8> output(make::box2d(mrow, mcol,
mrow + 2 * input.nrows() - 1,
......
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