October 2008 - Olena-patches

2705: Fix a compilation issue.
by Guillaume Lazzara 27 Oct '08

27 Oct '08

* mln/core/site_set/box.hh: Use a local variable of type P instead of point2d. --- milena/ChangeLog | 7 +++++++ milena/mln/core/site_set/box.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d1e9441..f1488d0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix a compilation issue. + + * mln/core/site_set/box.hh: Use a local variable of type P instead of + point2d. + +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix return type of i2v::array::operator(). * mln/fun/i2v/array.hh (operator() const): Return a reference instead of a copy. diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 9a03897..5a47fa1 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -351,7 +351,7 @@ namespace mln box::center() const { mln_precondition(is_valid()); - point2d center; + P center; for (unsigned i = 0; i < P::dim; ++i) center[i] = pmin_[i] + ((pmax_[i] - pmin_[i]) / 2); return center; -- 1.5.6.5

1 0

r2704: Work on a new classification method based on max_trees
by Maxime van Noppen 27 Oct '08

27 Oct '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2704: Work on a new classification method based on max_trees URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-27 Maxime van Noppen <yabo(a)lrde.epita.fr> Work on a new classification method based on max_trees. * max_tree.hh: New. * v2.cc: New. --- max_tree.hh | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ v2.cc | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) Index: branches/cleanup-2008/milena/sandbox/classif/max_tree.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 0) +++ branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2704) @@ -0,0 +1,117 @@ +#ifndef MAX_TREE_HH_ +# define MAX_TREE_HH_ + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/level/fill.hh> +# include <mln/util/pix.hh> +# include <mln/morpho/includes.hh> +# include <mln/level/sort_psites.hh> + +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/io/pgm/load.hh> +# include <mln/core/site_set/p_array.hh> + +using namespace mln; + +template <typename I, typename N> +struct max_tree_ +{ + typedef mln_site(I) point; + typedef p_array<point> S; + + // in: + const I& f; + const N& nbh; + + // aux: + S s; + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, point) parent; + mln_ch_value(I, point) zpar; + + max_tree_(const I& f, const N& nbh) + : f(f), + nbh(nbh) + { + run(); + } + + void run() + { + // init + { + initialize(deja_vu, f); + mln::level::fill(deja_vu, false); + initialize(parent, f); + initialize(zpar, f); + s = level::sort_psites_decreasing(f); + } + + // first pass + { + mln_fwd_piter(S) p(s); + mln_niter(N) n(nbh, p); + for_all(p) + { + make_set(p); + for_all(n) + if (f.has(n) && deja_vu(n)) + do_union(n, p); + deja_vu(p) = true; + } + } + + // second pass: canonization + { + mln_bkd_piter(S) p(s); + for_all(p) + { + point q = parent(p); + if (f(parent(q)) == f(q)) + parent(p) = parent(q); + } + } + + } // end of run() + + void make_set(const point& p) + { + parent(p) = p; + zpar(p) = p; + } + + bool is_root(const point& p) const + { + return parent(p) == p; + } + + bool is_node(const point& p) const + { + return is_root(p) || f(parent(p)) != f(p); + } + + point find_root(const point& x) + { + if (zpar(x) == x) + return x; + else + return zpar(x) = find_root(zpar(x)); + } + + void do_union(const point& n, const point& p) + { + point r = find_root(n); + if (r != p) + { + parent(r) = p; + zpar(r) = p; + } + } + +}; + + +#endif /* !MAX_TREE_HH_ */ Index: branches/cleanup-2008/milena/sandbox/classif/v2.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 0) +++ branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2704) @@ -0,0 +1,80 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/histo/data.hh> + +#include <mln/value/all.hh> + +#include <mln/level/fill.hh> +#include <mln/geom/all.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> + +#include "min_tree.hh" + +using namespace mln; + +template <typename I> +mln::image3d<unsigned> +fill_histo(const I& ima, int f) +{ + const value::int_u8 v = 255 / f; // FIXME + image3d<unsigned> histo(v,v,v); + level::fill(histo, 0); + unsigned i = 0; + + mln_piter(I) p(ima.domain()); + for_all(p) + { + point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + histo(p3)++; + } + return histo; +} + +template <typename I, typename N> +unsigned +compute_min_tree(const I& ima, const N& nbh) +{ + min_tree_<I,N> run(ima, nbh); + + mln_piter(I) p(ima.domain()); + unsigned nnodes = 0; + for_all(p) + if (run.is_node(p)) + ++nnodes; + + return nnodes; +} + +bool usage(int argc, char ** argv) +{ + if (argc != 3) + { + std::cout << "usage: " << argv[0] << " image div_factor" << std::endl; + return false; + } + return true; +} + +int main(int argc, char* argv[]) +{ + if (not usage(argc, argv)) + return 1; + image2d<value::rgb8> ima; + ima = io::ppm::load<value::rgb8>(argv[1]); + const int div_factor = atoi(argv[2]); + + //make histo + image3d<unsigned> histo = fill_histo(ima,div_factor); + + //revert histo + image3d<unsigned> rhisto = arith::revert(histo); + + // Compute min_tree + compute_min_tree(rhisto, c6()); +}

1 0

r2703: Fix bug in the mean color computation
by Maxime van Noppen 27 Oct '08

27 Oct '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2703: Fix bug in the mean color computation URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-27 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix bug in the mean color computation. * Makefile: Fix. * iccvg04.cc: Use double values instead of unsigned. --- Makefile | 57 +++++++++++++++++++++++++++++++++++++-------------------- iccvg04.cc | 11 ++++++++++- 2 files changed, 47 insertions(+), 21 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2702) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2703) @@ -106,7 +106,7 @@ unsigned count[nbasins + 1]; memset(count, 0, (nbasins + 1) * sizeof(unsigned)); - algebra::vec<3, unsigned> sum[nbasins + 1]; + algebra::vec<3, double> sum[nbasins + 1]; for (int i = 0; i < nbasins + 1; ++i) sum[i] = literal::zero; @@ -123,9 +123,16 @@ count[w] += histo(p3); sum[w] += histo(p3) * convert::to< algebra::vec<3, value::int_u8> >(p3); } + + std::cerr << "p3 : " << p3 << " == " << convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; } + for (int i = 1; i < nbasins + 1; ++i) + { + std::cout << "sum[" << i << "] = " << sum[i] * f << " / " << count[i] << " == "; sum[i] = (sum[i] * f) / count[i]; + std::cout << sum[i] << std::endl; + } // Make an output image where colors are replaced by their representatives. mln_piter(I) pi(ima.domain()); @@ -138,6 +145,8 @@ //if w == 0, out(pi) = 0 ie is part of a border of the watershed out(pi) = convert::to<value::rgb8>(sum[w]); + + std::cerr << "out(" << pi << ") = sum[" << w << "]; //" << sum[w] << " : rgb8(" << convert::to<value::rgb8>(sum[w]) << ")" << std::endl; } io::ppm::save(out, "out.ppm"); Index: branches/cleanup-2008/milena/sandbox/classif/Makefile =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2702) +++ branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2703) @@ -1,45 +1,62 @@ -INCLUDES=-I../.. +DISP=xv -SRC=iccvg04.cc -TARGET=iccvg - -TARGET_DBG=iccvg_dbg +# ICCVG +ICCVG_INCLUDES=-I../.. +ICCVG_SRC=iccvg04.cc +ICCVG=iccvg +ICCVG_DBG=iccvg_dbg IMG?=../../img/lena.ppm DIV?=8 LAMBDA?=10 + +# V2 +V2_INCLUDES=-I../.. -I../garrigues/fllt +V2_SRC=v2.cc +V2=v2 +V2_DBG=v2_dbg + + LOG=> stdout.log 2> stderr.log -all: $(TARGET) -$(TARGET): $(SRC) - g++ $(INCLUDES) -O1 -DNDEBUG $(SRC) -o $(TARGET) +$(ICCVG): $(ICCVG_SRC) + g++ $(ICCVG_INCLUDES) -O1 -DNDEBUG $(ICCVG_SRC) -o $(ICCVG) + + +$(ICCVG_DBG): $(ICCVG_SRC) + g++ $(ICCVG_INCLUDES) -O0 -g3 -ggdb3 $(ICCVG_SRC) -o $(ICCVG_DBG) + +$(V2): $(V2_SRC) + g++ $(V2_INCLUDES) -O1 -DNDEBUG $(V2_SRC) -o $(V2) + -debug: $(TARGET_DBG) +$(V2_DBG): $(V2_SRC) + g++ $(V2_INCLUDES) -O0 -g3 -ggdb3 $(V2_SRC) -o $(V2_DBG) -iccvg_dbg: $(SRC) - g++ $(INCLUDES) -O0 -g3 -ggdb3 $(SRC) -o $(TARGET_DBG) .PHONY:clean check check-debug valgrind clean: - rm -f $(TARGET) - rm -f $(TARGET_DBG) + rm -f $(ICCVG) + rm -f $(ICCVG_DBG) + rm -f $(V2) + rm -f $(V2_DBG) -check-debug: $(TARGET_DBG) +check-debug: $(ICCVG_DBG) ./iccvg_dbg $(IMG) $(DIV) $(LAMBDA) $(LOG) cat stdout.log - display out.ppm & + $(DISP) out.ppm & -check: $(TARGET) +check: $(ICCVG) ./iccvg $(IMG) $(DIV) $(LAMBDA) $(LOG) cat stdout.log - display out.ppm & + $(DISP) out.ppm & -valgrind: +valgrind: $(ICCVG_DBG) valgrind --log-file=valgrind.log ./iccvg_dbg ../../img/lena.ppm $(DIV) $(LAMBDA) $(LOG) -gdb: $(TARGET_DBG) +gdb: $(ICCVG_DBG) echo "run ../../img/lena.ppm $(DIV) $(LAMBDA)" > gdb.cmd - gdb $(TARGET_DBG) -x gdb.cmd + gdb $(ICCVG_DBG) -x gdb.cmd

1 0

2702: Use more routines provided by Olena.
by Guillaume Lazzara 27 Oct '08

27 Oct '08

* scribo/demat.hh: Use more routines provided by Olena: - not_inplace - level::convert - box::center() * scribo/main.cc: Update usage. --- milena/sandbox/ChangeLog | 11 +++++ milena/sandbox/scribo/demat.hh | 93 ++++++++++++---------------------------- milena/sandbox/scribo/main.cc | 6 +-- 3 files changed, 39 insertions(+), 71 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 8cba502..aa83342 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,14 @@ +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use more routines provided by Olena. + + * scribo/demat.hh: Use more routines provided by Olena: + - not_inplace + - level::convert + - box::center() + + * scribo/main.cc: Update usage. + 2008-10-27 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update classification. diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index 99ea3ef..00f6169 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -44,8 +44,6 @@ # include <mln/accu/bbox.hh> # include <mln/accu/count.hh> -# include <mln/binarization/threshold.hh> - # include <mln/border/fill.hh> # include <mln/convert/to.hh> @@ -65,20 +63,22 @@ # include <mln/labeling/blobs.hh> # include <mln/labeling/compute.hh> +# include <mln/level/convert.hh> # include <mln/level/compute.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> # include <mln/level/apply.hh> +# include <mln/level/transform.hh> # include <mln/literal/all.hh> +# include <mln/logical/not.hh> + # include <mln/morpho/hit_or_miss.hh> -# include <mln/morpho/opening.hh> +# include <mln/morpho/erosion.hh> # include <mln/pw/all.hh> -# include <mln/set/inter.hh> - # include <mln/util/array.hh> # include <mln/value/int_u16.hh> @@ -115,31 +115,10 @@ namespace scribo f(0) = literal::black; for (unsigned i = 1; i <= nlabels; ++i) f(i) = rgb8(255 / ((i % 10) + 1), (100 + i) % 255, (255 + i)%255); - level::transform(lbl, f, output); + output = level::transform(lbl, f); io::ppm::save(output, filename); } - image2d<rgb8> - to_color(const image2d<bool>& input) - { - image2d<rgb8> output; - - fun::i2v::array<rgb8> fconvert(2); - fconvert(0) = literal::black; - fconvert(1) = literal::white; - - return level::transform(input, fconvert); - } - - void negate(image2d<bool>& in) - { - fun::i2v::array<unsigned> negate(2); - negate(0) = 1; - negate(1) = 0; - level::apply(in, negate); - } - - /// Functions related to the table removal /// \{ @@ -155,27 +134,17 @@ namespace scribo return labeling::compute(accu::meta::bbox(), lbl, nlabels); } - - /// Remove table bboxes from an image. - void erase_table_boxes(image2d<rgb8>& output, - const util::array<box2d>& boxes, - unsigned bbox_larger) - { - for (unsigned i = 1; i < boxes.nelements(); ++i) - level::paste((pw::cst(literal::black) - | (boxes[i].to_larger(bbox_larger) | (pw::value(output) != pw::cst(literal::black)))), output); - - } - /// Remove table bboxes from an image. void erase_table_boxes(image2d<bool>& output, - const util::array<box2d>& boxes, - unsigned bbox_larger) + util::array<box2d>& boxes, + unsigned bbox_enlarge, unsigned dim) { for (unsigned i = 1; i < boxes.nelements(); ++i) + { + boxes[i].enlarge(dim, bbox_enlarge); level::paste((pw::cst(false) - | (boxes[i].to_larger(bbox_larger) | (pw::value(output) == pw::cst(true)))), output); - + | (boxes[i] | (pw::value(output) == pw::cst(true)))), output); + } } @@ -184,8 +153,7 @@ namespace scribo util::array<box2d> > extract_tables(image2d<bool>& in, image2d<rgb8>& output, - unsigned l, - unsigned n) + unsigned l) { typedef image2d<int_u16> I; typedef accu::bbox<mln_psite_(I)> A; @@ -195,27 +163,27 @@ namespace scribo // Lignes verticales std::cout << "Removing vertical lines" << std::endl; win::vline2d vline(l); - image2d<bool> vfilter = morpho::opening(in, vline); + image2d<bool> vfilter = morpho::erosion(in, vline); #ifndef NOUT io::pbm::save(vfilter, "./table-vfilter.pbm"); #endif boxes_t vboxes = component_boxes(vfilter); - erase_table_boxes(in, vboxes, n); + erase_table_boxes(in, vboxes, (l / 2), 0); // Lignes horizontales std::cout << "Removing horizontal lines" << std::endl; win::hline2d hline(l); - image2d<bool> hfilter = morpho::opening(in, hline); + image2d<bool> hfilter = morpho::erosion(in, hline); #ifndef NOUT io::pbm::save(hfilter, "./table-hfilter.pbm"); #endif boxes_t hboxes = component_boxes(hfilter); - erase_table_boxes(in, hboxes, n); + erase_table_boxes(in, hboxes, (l / 2), 1); #ifndef NOUT @@ -246,7 +214,7 @@ namespace scribo inline int_u16 - uncurri_left_link(const fun::i2v::array<int_u16>& left_link, unsigned i) + uncurri_left_link(fun::i2v::array<int_u16>& left_link, unsigned i) { if (left_link(i) != i) left_link(i) = most_left(left_link, left_link(i)); @@ -358,11 +326,8 @@ namespace scribo { unsigned midcol = (cboxes[i].pmax().col() - cboxes[i].pmin().col()) / 2; unsigned dmax = midcol + bbox_distance; - /// FIXME: Box center => Routine? - point2d c (cboxes[i].pmin().row() - + ((cboxes[i].pmax().row() - cboxes[i].pmin().row()) / 2), - cboxes[i].pmin().col() + midcol); - /// First site on the right of the center site + point2d c = cboxes[i].center(); + /// First site on the right of the central site point2d p(c.row(), c.col() + 1); // FIXME: Lemmings with a condition on the distance => write a special version? @@ -386,10 +351,7 @@ namespace scribo for (unsigned i = 1; i <= nlabels;) { unsigned midcol = (cboxes[i].pmax().col() - cboxes[i].pmin().col()) / 2; - /// FIXME: Box center => Routine? - point2d c (cboxes[i].pmin().row() - + ((cboxes[i].pmax().row() - cboxes[i].pmin().row()) / 2), - cboxes[i].pmin().col() + midcol); + point2d c = cboxes[i].center(); /// First site on the right of the center site point2d p(c.row(), c.col() + 1); @@ -401,7 +363,7 @@ namespace scribo if (lbl.domain().has(p) && lbl(p) != 0 && lbl(p) != i && (p.col() - c.col()) <= midcol) { - + } } @@ -466,22 +428,21 @@ namespace scribo //Useful debug variables unsigned l = atoi(argv[3]); - unsigned bbox_larger = atoi(argv[4]); - unsigned bbox_distance = atoi(argv[5]); - unsigned min_comp_size = atoi(argv[6]); + unsigned bbox_distance = atoi(argv[4]); + unsigned min_comp_size = atoi(argv[5]); //Load image image2d<bool> in; io::pbm::load(in, argv[1]); - internal::negate(in); + logical::not_inplace(in); #ifndef NOUT io::pbm::save(in, "in-neg.pbm"); #endif - image2d<rgb8> output = internal::to_color(in); + image2d<rgb8> output = level::convert(rgb8(), in); - internal::extract_tables(in, output, l, bbox_larger); + internal::extract_tables(in, output, l); util::array<box2d> tboxes = internal::extract_text(in, output, bbox_distance, min_comp_size); diff --git a/milena/sandbox/scribo/main.cc b/milena/sandbox/scribo/main.cc index f2f9d15..a74521e 100644 --- a/milena/sandbox/scribo/main.cc +++ b/milena/sandbox/scribo/main.cc @@ -42,14 +42,10 @@ int main(int argc, char*argv[]) << std::endl << std::endl << "<in.pbm> B/W inverted input image." << std::endl << std::endl - << "<out.pgm> RGB8 output image." + << "<out.ppm> RGB8 output image." << std::endl << std::endl << "<l> Line length" << std::endl << std::endl - << "<bbox_larger> Extension size of the bounding boxes vertical/horizontal" - << std::endl - << " lines considered as table borders which will be removed" - << std::endl << std::endl << "<bbox_distance> Maximum distance between character bounding boxes. Used for bbox grouping." << std::endl << std::endl << "<min_comp_nsites> Minimum site count of a character/text component." -- 1.5.6.5

1 0

2701: Fix return type of i2v::array::operator().
by Guillaume Lazzara 27 Oct '08

27 Oct '08

* mln/fun/i2v/array.hh (operator() const): Return a reference instead of a copy. --- milena/ChangeLog | 6 ++++++ milena/mln/fun/i2v/array.hh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2649954..d1e9441 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix return type of i2v::array::operator(). + + * mln/fun/i2v/array.hh (operator() const): Return a reference instead of a copy. + +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add box::center() and a new overload of box::enlarge(). * mln/core/site_set/box.hh: diff --git a/milena/mln/fun/i2v/array.hh b/milena/mln/fun/i2v/array.hh index 219be8a..a791ec6 100644 --- a/milena/mln/fun/i2v/array.hh +++ b/milena/mln/fun/i2v/array.hh @@ -60,7 +60,7 @@ namespace mln void resize(unsigned n); unsigned size() const; - T operator()(unsigned i) const; + const T& operator()(unsigned i) const; T& operator()(unsigned i); private: @@ -111,7 +111,7 @@ namespace mln template <typename T> inline - T + const T& array<T>::operator()(unsigned i) const { mln_precondition(i < v_.size()); -- 1.5.6.5

1 0

2700: Add box::center() and a new overload of box::enlarge().
by Guillaume Lazzara 27 Oct '08

27 Oct '08

* mln/core/site_set/box.hh: - Add a new version of enlarge() which can be applied on a single dimension passed as parameter. - Add center() which returns an approximated central site of a bo --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/box.hh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1a947ad..2649954 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add box::center() and a new overload of box::enlarge(). + + * mln/core/site_set/box.hh: + - Add a new version of enlarge() which can be applied on a single + dimension passed as parameter. + - Add center() which returns an approximated central site of a box. + +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix wrong or missing traces. * milena/mln/level/fill_with_image.spe.hh, * milena/mln/morpho/erosion.spe.hh: diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 9e8c6db..9a03897 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -137,9 +137,16 @@ namespace mln /// Enlarge the box with a border \p b. void enlarge(unsigned b); + /// Enlarge the box with a border \p b for dimension \p dim. + void enlarge(unsigned dim, unsigned b); + /// Give a larger box. box to_larger(unsigned b) const; + /// Return the approximated central site of this box. + /// FIXME: Do we want a routine as well like geom::bbox()? + P center() const; + /// Test that the box owns valid data, i.e., is initialized and /// with pmin being 'less-than' pmax. bool is_valid() const; @@ -296,6 +303,17 @@ namespace mln template <typename P> inline + void + box::enlarge(unsigned dim, unsigned b) + { + mln_precondition(is_valid()); + pmin_[dim] -= b; + pmax_[dim] += b; + mln_postcondition(is_valid()); + } + + template <typename P> + inline box larger_than(const box a, const box b) { @@ -329,6 +347,18 @@ namespace mln template <typename P> inline + P + box::center() const + { + mln_precondition(is_valid()); + point2d center; + for (unsigned i = 0; i < P::dim; ++i) + center[i] = pmin_[i] + ((pmax_[i] - pmin_[i]) / 2); + return center; + } + + template <typename P> + inline std::size_t box::memory_size() const { -- 1.5.6.5

1 0

2699: Fix wrong or missing traces.
by Guillaume Lazzara 27 Oct '08

27 Oct '08

* milena/mln/level/fill_with_image.spe.hh, * milena/mln/morpho/erosion.spe.hh: Call trace::exiting before the return statement. * mln/io/fits/load.hh, * mln/io/off/load.hh, * mln/io/off/save.hh, * mln/io/pbm/load.hh, * mln/io/pbm/save.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh, * mln/io/pgm/load.hh, * mln/io/pgm/save.hh, * mln/io/pnm/load.hh, * mln/io/pnm/save.hh, * mln/io/ppm/load.hh: Add missing traces. --- milena/ChangeLog | 21 +++++++++++++++++++++ milena/mln/io/fits/load.hh | 4 ++++ milena/mln/io/off/load.hh | 4 ++++ milena/mln/io/off/save.hh | 4 ++++ milena/mln/io/pbm/load.hh | 4 ++++ milena/mln/io/pbm/save.hh | 2 ++ milena/mln/io/pfm/load.hh | 5 +++++ milena/mln/io/pfm/save.hh | 2 ++ milena/mln/io/pgm/load.hh | 7 ++++++- milena/mln/io/pgm/save.hh | 3 ++- milena/mln/io/pnm/load.hh | 9 ++++++++- milena/mln/io/pnm/save.hh | 2 ++ milena/mln/io/ppm/load.hh | 7 ++++++- milena/mln/level/fill_with_image.spe.hh | 4 ++-- milena/mln/morpho/erosion.spe.hh | 31 ++++++++++++++++++++----------- 15 files changed, 92 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 26dca4b..1a947ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,24 @@ +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix wrong or missing traces. + * milena/mln/level/fill_with_image.spe.hh, + * milena/mln/morpho/erosion.spe.hh: + Call trace::exiting before the return statement. + + * mln/io/fits/load.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/io/pbm/load.hh, + * mln/io/pbm/save.hh, + * mln/io/pfm/load.hh, + * mln/io/pfm/save.hh, + * mln/io/pgm/load.hh, + * mln/io/pgm/save.hh, + * mln/io/pnm/load.hh, + * mln/io/pnm/save.hh, + * mln/io/ppm/load.hh: + Add missing traces. + 2008-10-27 Nicolas Ballas <ballas(a)lrde.epita.fr> Fix bugs in low level routines. diff --git a/milena/mln/io/fits/load.hh b/milena/mln/io/fits/load.hh index 4d7e8e2..2e1b920 100644 --- a/milena/mln/io/fits/load.hh +++ b/milena/mln/io/fits/load.hh @@ -88,6 +88,8 @@ namespace mln inline image2d<float> load(const std::string& filename) { + trace::entering("mln::io::fits::load"); + fitsfile *fptr; int status, nfound, anynull; long naxes[2]; @@ -124,6 +126,8 @@ namespace mln if (fits_close_file(fptr, &status)) fits_exit(status); + trace::exiting("mln::io::fits::load"); + return output; } diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index 60c534b..092d439 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -73,6 +73,8 @@ namespace mln void load(bin_2complex_image3df& ima, const std::string& filename) { + trace::entering("mln::io::off::load"); + const std::string me = "mln::io::off::load"; std::ifstream istr(filename.c_str()); @@ -276,6 +278,8 @@ namespace mln std::exit(1); } istr.close(); + + trace::exiting("mln::io::off::load"); } diff --git a/milena/mln/io/off/save.hh b/milena/mln/io/off/save.hh index dce42fd..ff47744 100644 --- a/milena/mln/io/off/save.hh +++ b/milena/mln/io/off/save.hh @@ -70,6 +70,8 @@ namespace mln void save(const bin_2complex_image3df& ima, const std::string& filename) { + trace::entering("mln::io::off::save"); + const std::string me = "mln::io::off::save"; std::ofstream ostr(filename.c_str()); @@ -183,6 +185,8 @@ namespace mln } ostr.close(); + + trace::exiting("mln::io::off::save"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pbm/load.hh b/milena/mln/io/pbm/load.hh index 3174b36..40c6086 100644 --- a/milena/mln/io/pbm/load.hh +++ b/milena/mln/io/pbm/load.hh @@ -131,6 +131,7 @@ namespace mln inline image2d<bool> load(const std::string& filename) { + trace::entering("mln::io::pbm::load"); std::ifstream file(filename.c_str()); if (! file) { @@ -148,6 +149,9 @@ namespace mln else if (type == '1') internal::load_ascii(file, ima); + + trace::exiting("mln::io::pbm::load"); + return ima; } diff --git a/milena/mln/io/pbm/save.hh b/milena/mln/io/pbm/save.hh index eeb0580..93d4485 100644 --- a/milena/mln/io/pbm/save.hh +++ b/milena/mln/io/pbm/save.hh @@ -119,8 +119,10 @@ namespace mln inline void save(const Image& ima, const std::string& filename) { + trace::entering("mln::io::pbm::save"); mln::metal::equal<mln_value(I), bool >::check(); impl::save_(exact(ima), filename); + trace::exiting("mln::io::pbm::save"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pfm/load.hh b/milena/mln/io/pfm/load.hh index 9ddaed2..35f5e54 100644 --- a/milena/mln/io/pfm/load.hh +++ b/milena/mln/io/pfm/load.hh @@ -143,6 +143,8 @@ namespace mln inline image2d<float> load(const std::string& filename) { + trace::entering("mln::io::pfm::load"); + std::ifstream file(filename.c_str()); if (! file) { @@ -155,6 +157,9 @@ namespace mln image2d<float> ima(nrows, ncols); internal::load_raw_2d(file, ima); + + trace::exiting("mln::io::pfm::load"); + return ima; } diff --git a/milena/mln/io/pfm/save.hh b/milena/mln/io/pfm/save.hh index 7223b38..486639e 100644 --- a/milena/mln/io/pfm/save.hh +++ b/milena/mln/io/pfm/save.hh @@ -108,8 +108,10 @@ namespace mln inline void save(const Image& ima, const std::string& filename) { + trace::entering("mln::io::pfm::save"); mln::metal::equal<mln_value(I), float >::check(); impl::save_(exact(ima), filename); + trace::exiting("mln::io::pfm::save"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pgm/load.hh b/milena/mln/io/pgm/load.hh index cbe7e05..e7df29e 100644 --- a/milena/mln/io/pgm/load.hh +++ b/milena/mln/io/pgm/load.hh @@ -85,7 +85,10 @@ namespace mln inline image2d<V> load(const std::string& filename) { - return io::pnm::load<V>(PGM, filename); + trace::entering("mln::io::pgm::load"); + image2d<V> ima = io::pnm::load<V>(PGM, filename); + trace::exiting("mln::io::pgm::load"); + return ima; } template <typename I> @@ -93,7 +96,9 @@ namespace mln void load(Image& ima, const std::string& filename) { + trace::entering("mln::io::pgm::load"); io::pnm::load(PGM, ima, filename); + trace::exiting("mln::io::pgm::load"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pgm/save.hh b/milena/mln/io/pgm/save.hh index d5d368b..b02576d 100644 --- a/milena/mln/io/pgm/save.hh +++ b/milena/mln/io/pgm/save.hh @@ -83,8 +83,9 @@ namespace mln // mln::metal::templated_by<mln_value(I), value::int_u >, // mln::metal::templated_by<mln_value(I), value::int_u_sat > // >::check(); - + trace::entering("mln::io::pgm::save"); io::pnm::save(PGM, exact(ima), filename); + trace::exiting("mln::io::pgm::save"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pnm/load.hh b/milena/mln/io/pnm/load.hh index be491e3..d2c2f6b 100644 --- a/milena/mln/io/pnm/load.hh +++ b/milena/mln/io/pnm/load.hh @@ -159,6 +159,8 @@ namespace mln inline image2d<V> load(char type_, const std::string& filename) { + trace::entering("mln::io::pnm::load"); + std::ifstream file(filename.c_str()); if (! file) { @@ -191,8 +193,10 @@ namespace mln else if (type == (type_ - 3)) pnm::load_ascii(file, ima); - return ima; + trace::entering("mln::io::pnm::load"); + + return ima; } /// An other way to load pnm files : @@ -204,6 +208,8 @@ namespace mln Image& ima_, const std::string& filename) { + trace::entering("mln::io::pnm::load"); + std::ifstream file(filename.c_str()); if (! file) { @@ -240,6 +246,7 @@ namespace mln if (type == (type_ - 3)) pnm::load_ascii(file, ima); + trace::exiting("mln::io::pnm::load"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pnm/save.hh b/milena/mln/io/pnm/save.hh index eadd618..b09465c 100644 --- a/milena/mln/io/pnm/save.hh +++ b/milena/mln/io/pnm/save.hh @@ -177,12 +177,14 @@ namespace mln inline void save(const int type, const Image& ima_, const std::string& filename) { + trace::entering("mln::io::pnm::save"); const I& ima = exact(ima_); std::ofstream file(filename.c_str()); io::pnm::save_header(type, ima, filename, file); impl::save_data_(file, mln_trait_image_speed(I)(), ima); + trace::exiting("mln::io::pnm::save"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/ppm/load.hh b/milena/mln/io/ppm/load.hh index dc2ee4d..f97700b 100644 --- a/milena/mln/io/ppm/load.hh +++ b/milena/mln/io/ppm/load.hh @@ -82,7 +82,10 @@ namespace mln inline image2d<V> load(const std::string& filename) { - return io::pnm::load<V>(PPM, filename); + trace::entering("mln::io::ppm::load"); + image2d<V> ima = io::pnm::load<V>(PPM, filename); + trace::exiting("mln::io::ppm::load"); + return ima; } template <typename I> @@ -90,7 +93,9 @@ namespace mln void load(Image& ima, const std::string& filename) { + trace::entering("mln::io::ppm::load"); io::pnm::load(PPM, ima, filename); + trace::exiting("mln::io::ppm::load"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/level/fill_with_image.spe.hh b/milena/mln/level/fill_with_image.spe.hh index 6084e72..036a7a0 100644 --- a/milena/mln/level/fill_with_image.spe.hh +++ b/milena/mln/level/fill_with_image.spe.hh @@ -88,7 +88,7 @@ namespace mln pi.val() = d.val(); d.next(); } - trace::entering("level::impl::fill_with_image_fast"); + trace::exiting("level::impl::fill_with_image_fast"); } @@ -108,7 +108,7 @@ namespace mln for_all(pi) pi.val() = data.val(); - trace::entering("level::impl::fill_with_image_fast_singleton"); + trace::exiting("level::impl::fill_with_image_fast_singleton"); } } // end of namespace mln::level::impl diff --git a/milena/mln/morpho/erosion.spe.hh b/milena/mln/morpho/erosion.spe.hh index e309c83..324cfa2 100644 --- a/milena/mln/morpho/erosion.spe.hh +++ b/milena/mln/morpho/erosion.spe.hh @@ -1199,10 +1199,12 @@ namespace mln erosion_dispatch_for_generic(const I& input, const W& win) // Entry point. { trace::entering("morpho::erosion_dispatch_for_generic"); - return erosion_dispatch_for_generic(mln_trait_image_kind(I)(), - mln_trait_image_speed(I)(), - input, win); + mln_concrete(I) ima = + erosion_dispatch_for_generic(mln_trait_image_kind(I)(), + mln_trait_image_speed(I)(), + input, win); trace::entering("morpho::erosion_dispatch_for_generic"); + return ima; } @@ -1249,8 +1251,9 @@ namespace mln erosion_dispatch_for_arbitrary(const I& input, const W& win) { trace::entering("morpho::erosion_dispatch_for_arbitrary"); - return erosion_dispatch_for_arbitrary(mln_trait_image_speed(I)(), - input, win); + mln_concrete(I) ima = + erosion_dispatch_for_arbitrary(mln_trait_image_speed(I)(), + input, win); trace::exiting("morpho::erosion_dispatch_for_arbitrary"); } @@ -1279,9 +1282,11 @@ namespace mln erosion_dispatch_for_directional(const I& input, const W& win, unsigned dir) { trace::entering("morpho::erosion_dispatch_for_directional"); - return erosion_dispatch_for_directional(mln_trait_image_speed(I)(), - input, win, dir); + mln_concrete(I) ima = + erosion_dispatch_for_directional(mln_trait_image_speed(I)(), + input, win, dir); trace::exiting("morpho::erosion_dispatch_for_directional"); + return ima; } @@ -1308,9 +1313,11 @@ namespace mln erosion_dispatch_for_diagonal2d(const I& input, const W& win) { trace::entering("morpho::erosion_dispatch_for_diagonal2d"); - return erosion_dispatch_for_diagonal2d(mln_trait_image_speed(I)(), - input, win); + mln_concrete(I) ima = + erosion_dispatch_for_diagonal2d(mln_trait_image_speed(I)(), + input, win); trace::exiting("morpho::erosion_dispatch_for_diagonal2d"); + return ima; } @@ -1337,9 +1344,11 @@ namespace mln erosion_dispatch_for_backdiagonal2d(const I& input, const W& win) { trace::entering("morpho::erosion_dispatch_for_backdiagonal2d"); - return erosion_dispatch_for_backdiagonal2d(mln_trait_image_speed(I)(), - input, win); + mln_concrete(I) ima = + erosion_dispatch_for_backdiagonal2d(mln_trait_image_speed(I)(), + input, win); trace::exiting("morpho::erosion_dispatch_for_backdiagonal2d"); + return ima; } // dispatch w.r.t. win -- 1.5.6.5

1 0

cleanup-2008 2698: Update classification.
by Thierry Geraud 27 Oct '08

27 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update classification. * classif/iccvg04.cc: Swap filtering and reverting so that lambda is more intuitive. iccvg04.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2697) +++ classif/iccvg04.cc (working copy) @@ -6,8 +6,12 @@ #include <mln/value/all.hh> #include <mln/level/fill.hh> + #include <mln/morpho/closing_volume.hh> #include <mln/morpho/closing_area.hh> +#include <mln/morpho/opening_volume.hh> +#include <mln/morpho/opening_area.hh> + #include <mln/arith/revert.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/core/alias/neighb3d.hh> @@ -163,20 +167,19 @@ //make histo image3d<unsigned> histo = fill_histo(ima,div_factor); - //revert histo - image3d<unsigned> rhisto = arith::revert(histo); + //compute opening_volume of histo + image3d<unsigned> histo_filtered(histo.domain()); + morpho::opening_volume(histo, c6(), lambda, histo_filtered); - //compute closing_volume of histo - image3d<unsigned> histo_closure(histo.domain()); - morpho::closing_volume(rhisto, c6(), lambda, histo_closure); //watershed over histo_closure unsigned nbasins = 0; - image3d<unsigned> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + image3d<unsigned> ws = morpho::meyer_wst(arith::revert(histo_filtered), + c6(), nbasins); std::cout << "nbassins : " << nbasins << std::endl; //classify image classify_image(ima, histo, ws, nbasins, div_factor); - save_class(histo_closure, "histo.ppm"); + save_class(histo_filtered, "histo.ppm"); }

1 0

cleanup-2008 2697: INIM: Classif: Add projection.
by Ugo Jardonnet 27 Oct '08

27 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif: Add projection. * classif/iccvg04.cc: Fix wrong init. * classif/proj.hh: Add generic proj. iccvg04.cc | 6 +++-- proj.hh | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2696) +++ classif/iccvg04.cc (working copy) @@ -31,6 +31,7 @@ #include <string.h> #include <stdlib.h> +#include "proj.hh" using namespace mln; @@ -102,7 +103,7 @@ memset(count, 0, (nbasins + 1) * sizeof(unsigned)); algebra::vec<3, unsigned> sum[nbasins + 1]; - for (int i = 1; i < nbasins + 1; ++i) + for (int i = 0; i < nbasins + 1; ++i) sum[i] = literal::zero; // Compute representatives of every class @@ -127,7 +128,6 @@ I out(ima.domain()); for_all(pi) { - //retrieve color class value::rgb8 coul = ima(pi); int w = ws(point3d(coul.red() / f, coul.green() / f, coul.blue() / f)); @@ -177,4 +177,6 @@ //classify image classify_image(ima, histo, ws, nbasins, div_factor); + + save_class(histo_closure, "histo.ppm"); } Index: classif/proj.hh --- classif/proj.hh (revision 0) +++ classif/proj.hh (revision 0) @@ -0,0 +1,64 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_PROJ_HH +# define MLN_PROJ_HH + +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/level/paste.hh> +#include <mln/accu/mean.hh> + +namespace mln +{ + + template <typename T, typename A> + image2d<mln_result(A)> + proj(const image3d<T>& input, A a) + { + image2d<A> acc(geom::nslis(input), geom::nrows(input)); + mln_piter(image3d<T>) p(input.domain()); + for_all(p) // 3d + acc.at(p.sli(), p.row()).take(input(p)); + + image2d<mln_result(A)> output(acc.domain()); + level::paste(acc, output); + return output; + } + + template <typename T> + void + save_class(const image3d<T>& histo, const char * fn) + { + accu::mean<unsigned, unsigned long, value::int_u8> mean; + io::pgm::save(proj(histo, mean), fn); + } + +} // end of namespace mln + +#endif /* MLN_PROJ_HH */ +

1 0

cleanup-2008 2696: Add fun::v2v::convert and level::convert.
by Thierry Geraud 27 Oct '08

27 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add fun::v2v::convert and level::convert. * milena/mln/fun/v2v/convert.hh: New. * milena/mln/fun/v2v/cast.hh (todo): New. * milena/mln/level/convert.hh: New. * milena/tests/level/convert.cc: New. * milena/tests/level/Makefile.am: Update. * milena/mln/value/rgb.hh (todo): New. (from_to): New overload for bool->rgbn. * milena/mln/convert/from_to.hxx (from_to): New decl for bool->rgbn. * milena/sandbox/scribo/demat.hh (include): Remove obsolete dependency. mln/convert/from_to.hxx | 5 ++ mln/fun/v2v/cast.hh | 5 ++ mln/fun/v2v/convert.hh | 85 ++++++++++++++++++++++++++++++++++++++++++++++ mln/level/convert.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ mln/value/rgb.hh | 21 +++++++++++ sandbox/scribo/demat.hh | 2 - tests/level/Makefile.am | 2 + tests/level/convert.cc | 56 ++++++++++++++++++++++++++++++ 8 files changed, 260 insertions(+), 3 deletions(-) Index: milena/tests/level/convert.cc --- milena/tests/level/convert.cc (revision 0) +++ milena/tests/level/convert.cc (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/level/convert.cc + * + * \brief Tests on mln::level::convert + */ + +#include <mln/core/image/image2d.hh> +#include <mln/level/convert.hh> + +#include <mln/value/rgb8.hh> +#include <mln/literal/grays.hh> + + +int main() +{ + using namespace mln; + using value::rgb8; + +// trace::quiet = false; + + // bool -> rgb8 + { + image2d<bool> ima(1, 2); + ima.at(0, 0) = false; + ima.at(0, 1) = true; + image2d<rgb8> out = level::convert(rgb8(), ima); + mln_assertion(out.at(0, 0) == literal::black); + mln_assertion(out.at(0, 1) == literal::white); + } +} Index: milena/tests/level/Makefile.am --- milena/tests/level/Makefile.am (revision 2695) +++ milena/tests/level/Makefile.am (working copy) @@ -11,6 +11,7 @@ assign \ compare \ compute \ + convert \ fill \ fill_with_value \ fill_with_image \ @@ -35,6 +36,7 @@ assign_SOURCES = assign.cc compare_SOURCES = compare.cc compute_SOURCES = compute.cc +convert_SOURCES = convert.cc fill_SOURCES = fill.cc fill_with_value_SOURCES = fill_with_value.cc fill_with_image_SOURCES = fill_with_image.cc Index: milena/mln/level/convert.hh --- milena/mln/level/convert.hh (revision 0) +++ milena/mln/level/convert.hh (revision 0) @@ -0,0 +1,87 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + // General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_LEVEL_CONVERT_HH +# define MLN_LEVEL_CONVERT_HH + +/*! \file mln/level/convert.hh + * + * \brief Convert the contents of an image into another one. + * + * \todo Re-write doc. + */ + +# include <mln/fun/v2v/convert.hh> +# include <mln/level/transform.hh> + + +namespace mln +{ + + namespace level + { + + /*! Convert the image \p input by changing the value type. + * + * \param[in] v A value of the destination type. + * \param[in] input The input image. + * \param[out] output The result image. + */ + template <typename V, typename I> + mln_ch_value(I, V) + convert(const V&, const Image& input); + + + +# ifndef MLN_INCLUDE_ONLY + + // Facade. + + template <typename V, typename I> + inline + mln_ch_value(I, V) + convert(const V&, const Image& input) + { + trace::entering("level::convert"); + + mln_precondition(exact(input).has_data()); + fun::v2v::convert<V> f; + mln_ch_value(I, V) output = level::transform(input, f); + + trace::exiting("level::convert"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_CONVERT_HH Index: milena/mln/value/rgb.hh --- milena/mln/value/rgb.hh (revision 2695) +++ milena/mln/value/rgb.hh (working copy) @@ -32,6 +32,11 @@ * * \brief Color class for red-green-blue where every component is * n-bit encoded. + * + * \todo Split decl and def for from_to. + * + * \todo Introduce the concept of Color, then generalize from_to to + * colors. */ # include <mln/value/ops.hh> @@ -515,6 +520,22 @@ to = value::rgb<m>(tmp); } + // bool -> rgb. + template <unsigned m> + void + from_to(bool from, value::rgb<m>& to) + { + static literal::white_t* white_ = 0; + static literal::black_t* black_ = 0; + // We do not use literal::white (the object) so that we + // do not introduce any coupling with the file where + // literals are defined. + if (from) + to = *white_; + else + to = *black_; + } + } // end of namespace mln::convert } // end of namespace mln Index: milena/mln/convert/from_to.hxx --- milena/mln/convert/from_to.hxx (revision 2695) +++ milena/mln/convert/from_to.hxx (working copy) @@ -108,6 +108,11 @@ void from_to(const algebra::vec<3,T>& from, value::rgb<m>& to); + // bool -> rgb. + template <unsigned m> + void + from_to(bool from, value::rgb<m>& to); + // Value -> Value template <typename F, typename T> void Index: milena/mln/fun/v2v/cast.hh --- milena/mln/fun/v2v/cast.hh (revision 2695) +++ milena/mln/fun/v2v/cast.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,6 +31,9 @@ /*! \file mln/fun/v2v/cast.hh * * \brief FIXME. + * + * \todo The function is intrisically meta; how to handle that + * particular case? */ # include <mln/core/concept/function.hh> Index: milena/mln/fun/v2v/convert.hh --- milena/mln/fun/v2v/convert.hh (revision 0) +++ milena/mln/fun/v2v/convert.hh (revision 0) @@ -0,0 +1,85 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_FUN_V2V_CONVERT_HH +# define MLN_FUN_V2V_CONVERT_HH + +/*! \file mln/fun/v2v/convert.hh + * + * \brief FIXME. + * + * \todo The function is intrisically meta; how to handle that + * particular case? + */ + +# include <mln/core/concept/function.hh> +# include <mln/convert/to.hh> + + + +namespace mln +{ + + namespace fun + { + + namespace v2v + { + + // FIXME: Doc! + + template <typename V> + struct convert : public Function_v2v< convert<V> > + { + typedef V result; + + template <typename W> + V operator()(const W& w) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + template <typename W> + inline + V + convert<V>::operator()(const W& w) const + { + return mln::convert::to<V>(w); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::v2v + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_V2V_CONVERT_HH Index: milena/sandbox/scribo/demat.hh --- milena/sandbox/scribo/demat.hh (revision 2695) +++ milena/sandbox/scribo/demat.hh (working copy) @@ -55,8 +55,6 @@ # include <mln/draw/box.hh> -# include <mln/estim/nsites.hh> - # include <mln/fun/i2v/array.hh> # include <mln/io/pbm/load.hh>

1 0