July 2009 - Olena-patches

4254: Start cleaning up line segmentation code.
by Thierry Geraud 07 Jul '09

07 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start cleaning up line segmentation code. * modules/icdar/lines.cc: New. * modules/icdar/input_to_words.cc: Rename as... * modules/icdar/words.cc: ...this. lines.cc | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) Property changes on: modules/icdar/words.cc ___________________________________________________________________ Added: svn:mergeinfo Index: modules/icdar/lines.cc --- modules/icdar/lines.cc (revision 0) +++ modules/icdar/lines.cc (revision 0) @@ -0,0 +1,221 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +// For local::superimpose_save. +#include <string> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/label.hh> +#include <mln/data/convert.hh> +#include <mln/data/fill.hh> +#include <mln/pw/all.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/literal/colors.hh> +#include <mln/io/ppm/save.hh> + +// For local::accu_compute_on_weighted_sets. +#include <mln/util/array.hh> + +// For main. +#include <mln/io/pbm/load.hh> +#include <mln/world/binary_2d/subsample.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/data/fill.hh> +#define MLN_FLOAT double +#include <sandbox/theo/exec/gaussian_directional_2d.hh> +#include <mln/data/saturate.hh> + +#include <mln/win/rectangle2d.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/morpho/watershed/flooding.hh> + +#include <mln/algebra/vec.hh> +#include <mln/accu/stat/var.hh> +#include <mln/make/region_adjacency_graph.hh> +#include <mln/make/vertex_image.hh> +#include <mln/make/edge_image.hh> + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm output.ppm" << std::endl + << " HSC @ ICDAR'2009" << std::endl + << " input.pbm: input 2D binary image (text is black; background is white)" << std::endl + << " output.ppm: result of line segmentation." << std::endl; + std::abort(); +} + + + +namespace local +{ + + using namespace mln; + + + // Superpose the watershed line (red) over an input image. + void superimpose_save(const image2d<value::int_u8>& input, + const image2d<value::label<12> >& ws, + const std::string& filename) + { + image2d<value::rgb8> output = data::convert(value::rgb8(), input); + data::fill((output | (pw::value(ws) == pw::cst(0))).rw(), + literal::red); + io::ppm::save(output, filename); + } + + + template <typename A, typename L, typename I> + util::array<A> + accu_compute_on_weighted_sets(A, + const L& label, + mln_value(L) nlabels, + const I& w) + { + util::array<A> arr(nlabels.next()); + mln_piter(L) p(label.domain()); + for_all(p) + arr[label(p)].take_n_times(w(p), p.to_site()); + return arr; + } + + + struct bloup : Function_vv2v<bloup> + { + typedef float result; + + template <typename Var, typename V> + float dist(const Var& var, const V& v) const + { + mln_precondition(var.is_valid()); + V v_ = v - var.mean(); + return v_.t() * var.variance()._1() * v_; + } + + template <typename Var> + float operator()(const Var& var1, const Var& var2) const + { + return std::min(dist(var1, var2.mean()), dist(var2, var1.mean())); + } + }; + + +} // local + + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + + if (argc != 3) + usage(argv); + + + // Parameters. + + const unsigned + height = 5, + width = 25; + + const float + h_sigma = 31, + v_sigma = 1.3; + + // end of Parameters. + + + trace::entering("main"); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + // Sub-sample. + image2d<value::int_u8> small = world::binary_2d::subsample(input, 4); +// io::pgm::save(small, "temp_small.pgm"); + + + + // Fuzzifying. + + image2d<double> temp(small.domain()); + data::fill(temp, small); + + temp = linear::gaussian_directional_2d(temp, 1, h_sigma, 255); + temp = linear::gaussian_directional_2d(temp, 0, v_sigma, 255); + + image2d<int_u8> fuzzy = data::saturate(value::int_u8(), temp); +// io::pgm::save(fuzzy, "temp_fuzzy.pgm"); + + // Closing. + image2d<int_u8> clo = morpho::closing::structural(fuzzy, win::rectangle2d(height, width)); + + // Watershed transform. + typedef value::label<12> L; + L n_basins; + image2d<L> ws = morpho::watershed::flooding(clo, c4(), n_basins); + + std::cout << "n basins = " << n_basins << std::endl; + + local::superimpose_save(small, ws, "temp_small_ws.ppm"); + local::superimpose_save(fuzzy, ws, "temp_fuzzy_ws.ppm"); + + + typedef accu::stat::var< algebra::vec<2,float> > A; + util::array<A> arr; + arr = local::accu_compute_on_weighted_sets(A(), + ws, + n_basins, + (pw::cst(255) - pw::value(small)) | small.domain()); + + for (unsigned l = 1; l <= n_basins; ++l) + std::cout << l << ' ' << arr[l].n_items() << ' ' << arr[l].mean() << std::endl; + + typedef util::graph G; + G gr = make::region_adjacency_graph(ws, c8(), n_basins); + + vertex_image<void,A,G> v_ima = make::vertex_image(gr, arr); + + edge_image<void,float,G> e_ima = make::edge_image(v_ima, + local::bloup()); + + { + typedef edge_image<void,float,G> I; + mln_piter_(I) e(e_ima.domain()); + for_all(e) + { + std::cout << e.element().v1() << '-' << e.element().v2() << " : " << e_ima(e) << std::endl; + } + } + + trace::exiting("main"); +}

1 0

4253: modules/icdar/input_to_words.cc: Cleanup code for ICDAR.
by Guillaume Lazzara 07 Jul '09

07 Jul '09

--- milena/sandbox/ChangeLog | 4 + milena/sandbox/modules/icdar/input_to_words.cc | 225 ++++++++++++++++++++++++ 2 files changed, 229 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/modules/icdar/input_to_words.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index cf48639..6e960f6 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,7 @@ +2009-07-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * modules/icdar/input_to_words.cc: Cleanup code for ICDAR. + 2009-07-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> New directories for icdar code release. diff --git a/milena/sandbox/modules/icdar/input_to_words.cc b/milena/sandbox/modules/icdar/input_to_words.cc new file mode 100644 index 0000000..55ef385 --- /dev/null +++ b/milena/sandbox/modules/icdar/input_to_words.cc @@ -0,0 +1,225 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/concept/function.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/var.hh> + +#include <mln/fun/v2b/threshold.hh> +#include <mln/data/transform.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/labeling/wrap.hh> +#include <mln/labeling/colorize.hh> +#include <mln/morpho/watershed/superpose.hh> +#include <mln/logical/not.hh> +#include <mln/world/binary_2d/subsample.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/closing/area.hh> +#include <mln/morpho/closing/structural.hh> + +#include <mln/transform/distance_front.hh> + +#include <mln/make/w_window2d_int.hh> + +#include <mln/io/pbm/all.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/ppm/all.hh> + +#include <mln/value/int_u8.hh> + + + +namespace mln +{ + + + // Forward declaration. + template <typename P> struct to_larger; + + + template <typename P> + struct to_smaller + : Function_v2v < to_smaller > + { + typedef P result; + typedef to_larger invert; + + P operator()(const P& p) const + { + P tmp(p); + + for (unsigned i = 0; i < P::dim; ++i) + tmp[i] /= 2; + + return tmp; + } + + + invert inv() const + { + return to_larger(); + } + }; + + + template <typename P> + struct to_larger + : Function_v2v < to_larger > + { + typedef P result; + typedef to_smaller invert; + + P operator()(const P& p) const + { + P tmp(p); + + for (unsigned i = 0; i < P::dim; ++i) + tmp[i] *= 2; + + return tmp; + } + + + invert inv() const + { + return to_smaller(); + } + + }; + + +} + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + typedef value::int_u8 L; + typedef image2d<bool> I; + + + // Parameters. + + // Related to the first structural closing. + const unsigned + height = 5, + width = 11; + + // Related to the distance map computation. + const unsigned + l_area = 500; + + // end of Parameters. + + + + I input; + io::pbm::load(input, argv[1]); + + + /// Reduction and invertion. + image2d<L> + small_gl = world::binary_2d::subsample(input, 2); + I small = data::transform(small_gl, fun::v2b::threshold<L>(191)); + logical::not_inplace(small); + +#ifdef LOG + io::pbm::save(small, "small.pbm"); +#endif // ! LOG + + + /// Structural closing. + I clo = morpho::closing::structural(small, + win::rectangle2d(height, + width)); + +#ifdef LOG + io::pbm::save(clo, "tmp_clo.pbm"); +#endif // ! LOG + + + /// Distance map computation. + int ww[] = { 00, 11, 0, 11, 0, + 11, 7, 5, 7, 11, + 00, 5, 0, 5, 0, + 11, 7, 5, 7, 11, + 00, 11, 0, 11, 0 }; + + typedef value::int_u<12> int_u12; + image2d<int_u12> + dmap = transform::distance_front(clo, + c4(), make::w_window2d_int(ww), + mln_max(int_u12)), + dmap_ = morpho::closing::area(dmap, c4(), l_area); + + +#ifdef LOG + io::pgm::save(labeling::wrap(dmap), "tmp_dmap.pgm"); + io::pgm::save(labeling::wrap(dmap_), "tmp_dmap_.pgm"); +#endif // ! LOG + + /// Watershed. + L n_words; + image2d<L> ws_ = morpho::watershed::flooding(dmap_, + c4(), + n_words); + + /// Remove non-significant regional minima. + image2d<L> ws = morpho::elementary::dilation(ws_, + c4()); + +#ifdef LOG + io::pgm::save(labeling::wrap(ws), "tmp_ws.pgm"); + io::pgm::save(labeling::wrap(ws_), "tmp_ws_.pgm"); + + /// Adjust the domain of the watershed image. + mln_VAR(ws_large_, transposed_image(input.domain(), ws_, + to_larger<point2d>())); + io::ppm::save(morpho::watershed::superpose(input, ws_large_), + "tmp_ws_on_input.ppm"); +#endif // ! LOG + + + /// Adjust the domain of the watershed image. + mln_VAR(ws_large, transposed_image(input.domain(), ws, + to_larger<point2d>())); + + image2d<L> output(input.domain()); + data::fill(output, literal::zero); + + data::paste(ws_large | (pw::value(input) == pw::cst(false)), output); + + io::pgm::save(output, "ws_large.pgm"); + io::ppm::save(labeling::colorize(output, n_words), "ws_large.ppm"); + +} + -- 1.5.6.5

1 0

r4252: Fix small typo error
by Fabien Freling 07 Jul '09

07 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk ChangeLog: 2009-07-07 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix small typo error. * NEWS: Fix small typo error. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/NEWS =================================================================== --- trunk/NEWS (revision 4251) +++ trunk/NEWS (revision 4252) @@ -1,7 +1,7 @@ * Olena 1.0 * The core C++ library, renamed to Milena, has been rewritten - from scratch and feature numerous additions over the past + from scratch and features numerous additions over the past releases. * Milena uses a simplified version of the SCOOP 2 paradigm

1 0

milena r4251: Labeling computation with direct image output
by Edwin Carlinet 07 Jul '09

07 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-07-07 Edwin Carlinet <carlinet(a)lrde.epita.fr> Labeling computation with direct image output. * labeling/compute_image.hh: New routines to computes accumulators on labels and output an image that contains the results of the accumulator. --- compute_image.hh | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) Index: trunk/milena/mln/labeling/compute_image.hh =================================================================== --- trunk/milena/mln/labeling/compute_image.hh (revision 0) +++ trunk/milena/mln/labeling/compute_image.hh (revision 4251) @@ -0,0 +1,203 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_LABELING_COMPUTE_IMAGE_HH +# define MLN_LABELING_COMPUTE_IMAGE_HH + +/// +/// \file +/// +/// \brief Compute accumulators onto sites/values of each labeled +/// component of an image and return a new image where labels are +/// replaced by the result of the accumulator. +/// +/// +/// + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/accumulator.hh> +# include <mln/core/concept/meta_accumulator.hh> + +# include <mln/labeling/compute.hh> + + +namespace mln +{ + + namespace labeling + { + + /// Compute an accumulator onto the pixel values of the image \p input. + /// for each component of the image \p label. + /// + /// \param[in] a The mln::p_array of accumulator result. + /// \param[in] input The input image (values). + /// \param[in] labels The label image. + /// \param[in] nlabels The count of labels. + /// + /// \return The image where labels are replaced by the result of + /// the accumulator. + template <typename A, typename I, typename L> + mln_ch_value(L, mln_result(A)) + compute_image(const util::array<mln_result(A)>& a, + const Image& input, + const Image<L>& labels, + const mln_value(L)& nlabels); + + /// Compute an accumulator onto the pixel values of the image \p input. + /// for each component of the image \p label. + /// + /// \param[in] accu The accumulator. + /// \param[in] input The input image (values). + /// \param[in] labels The label image. + /// \param[in] nlabels The count of labels. + /// + /// \return The image where labels are replaced by the result of + /// the accumulator. + /// + template <typename A, typename I, typename L> + inline + mln_ch_value(L, mln_result(A)) + compute_image(const Accumulator<A>& accu, + const Image& input, + const Image<L>& labels, + const mln_value(L)& nlabels); + + + /// Compute an accumulator onto the pixel values of the image \p input. + /// for each component of the image \p label. + /// + /// \param[in] accu The meta-accumulator. + /// \param[in] input The input image (values). + /// \param[in] labels The label image. + /// \param[in] nlabels The count of labels. + /// + /// \return The image where labels are replaced by the result of + /// the accumulator. + /// + template <typename A, typename I, typename L> + inline + mln_ch_value(L, mln_accu_result(A, mln_value(I))) + compute_image(const Meta_Accumulator<A>& accu, + const Image& input, + const Image<L>& labels, + const mln_value(L)& nlabels); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename A, typename L> + mln_ch_value(L, A) + compute_image(const util::array<A>& a, + const Image<L>& labels_, + const mln_value(L)& nlabels) + { + const L& labels = exact(labels_); + + typedef mln_ch_value(L, A) O; + O output; + initialize(output, labels); + + mln_piter(L) p(labels.domain()); + for_all(p) + { + mln_assertion(labels(p) < nlabels); + output(p) = a[labels(p)]; + } + + return output; + } + + } // end of namespace mln::labeling::internal + + + template <typename A, typename I, typename L> + inline + mln_ch_value(L, mln_result(A)) + compute_image(const util::array<mln_result(A)>& a, + const Image<L>& labels, + const mln_value(L)& nlabels) + { + (void) nlabels; + + trace::entering("labeling::compute_image"); + + mln_ch_value(L, mln_result(A)) output = + labeling::internal::compute_image(a, labels, nlabels); + + trace::exiting("labeling::compute_image"); + return output; + } + + template <typename A, typename I, typename L> + inline + mln_ch_value(L, mln_result(A)) + compute_image(const Accumulator<A>& accu, + const Image& input, + const Image<L>& labels, + const mln_value(L)& nlabels) + { + trace::entering("labeling::compute_image"); + + util::array<mln_result(A)> res = + compute(accu, input, labels, nlabels); + + mln_ch_value(L, mln_result(A)) output = + internal::compute_image(res, labels, nlabels); + + trace::exiting("labeling::compute_image"); + return output; + } + + template <typename A, typename I, typename L> + inline + mln_ch_value(L, mln_accu_result(A, mln_value(I))) + compute_image(const Meta_Accumulator<A>& accu, + const Image& input, + const Image<L>& labels, + const mln_value(L)& nlabels) + { + trace::entering("labeling::compute_image"); + + util::array<mln_accu_result(A, mln_value(I))> res = + compute(accu, input, labels, nlabels); + + mln_ch_value(L, mln_accu_result(A, mln_value(I))) output = + labeling::internal::compute_image(res, labels, nlabels); + + trace::exiting("labeling::compute_image"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + +#endif // ! MLN_LABELING_COMPUTE_IMAGE_HH

1 0

milena r4250: Add traits to mean accumulator
by Edwin Carlinet 07 Jul '09

07 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-07-07 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add traits to mean accumulator. * accu/stat/mean.hh: Add traits to mean accu. --- mean.hh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) Index: trunk/milena/mln/accu/stat/mean.hh =================================================================== --- trunk/milena/mln/accu/stat/mean.hh (revision 4249) +++ trunk/milena/mln/accu/stat/mean.hh (revision 4250) @@ -52,6 +52,9 @@ } // end of namespace mln::accu::stat + + // Meta. + namespace meta { @@ -74,6 +77,29 @@ } // end of namespace mln::accu::meta + } // end of namespace mln::accu + + + // Traits. + + namespace trait + { + + template <typename T, typename S, typename M> + struct accumulator_< accu::stat::mean<T, S, M> > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::no has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_v when_pix; + }; + + } // end of namespace mln::trait + + + namespace accu + { + namespace stat {

1 0

4249: doc/Doxyfile.in: Set INPUT_ENCODING.
by Guillaume Lazzara 07 Jul '09

07 Jul '09

--- milena/ChangeLog | 4 +++ milena/doc/Doxyfile.in | 69 ++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a4bf034..83385a8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-07-07 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * doc/Doxyfile.in: Set INPUT_ENCODING. + 2009-07-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix errors with icc. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 3fb38d3..6afa13f 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -10,13 +10,13 @@ CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES FULL_PATH_NAMES = NO STRIP_FROM_PATH = @top_srcdir@/milena \ @top_builddir@/milena -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = SHORT_NAMES = YES JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO @@ -24,7 +24,7 @@ DETAILS_AT_TOP = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 -ALIASES = +ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO BUILTIN_STL_SUPPORT = YES @@ -55,13 +55,13 @@ GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = +ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = NO # Disabled for light doc SHOW_DIRECTORIES = NO # Disabled for light doc SHOW_FILES = NO # Disabled for light doc SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -71,7 +71,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- @@ -89,19 +89,20 @@ EXCLUDE = @top_srcdir@/milena/sandbox \ @top_srcdir@/milena/doc/examples/split EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = EXAMPLE_PATH = @top_srcdir@/milena/doc/examples \ @top_srcdir@/milena/doc/outputs \ @top_srcdir@/milena/doc/examples/split \ @top_srcdir@/milena/doc/outputs/split -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = @top_srcdir@/milena/doc/img \ @top_srcdir@/milena/doc/figures \ @top_builddir@/milena/doc/figures -INPUT_FILTER = -FILTER_PATTERNS = +INPUT_FILTER = +FILTER_PATTERNS = FILTER_SOURCE_FILES = NO +INPUT_ENCODING = ISO-8859-1 #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -125,13 +126,13 @@ IGNORE_PREFIX = mln:: GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = +CHM_FILE = +HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO @@ -148,8 +149,8 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = +EXTRA_PACKAGES = +LATEX_HEADER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = YES @@ -161,8 +162,8 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- @@ -175,8 +176,8 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = +XML_SCHEMA = +XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output @@ -188,16 +189,16 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = PREDEFINED = "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ "for_all_2(x1, x2)=for(x1.start(), x2.start(); x1.is_valid(); x1.next(), x2.next())" \ "for_all_3(x1, x2, x3)=for(x1.start(), x2.start(), x3.start(); x1.is_valid(); x1.next(), x2.next(), x3.next())" \ @@ -274,7 +275,7 @@ PREDEFINED = "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ "mln_trait_op_mod_(L, R)=mln::trait::op::mod< L , R >::ret" \ "mln_trait_op_uminus_(T)=mln::trait::op::uminus< T >::ret" \ "mln_ch_value_(I, V)=typename mln::trait::ch_value< I, V >::ret" \ - "mln_ch_value(I, V)_=mln::trait::ch_value< I, V >::ret" \ + "mln_ch_value(I, V)_=mln::trait::ch_value< I, V >::ret" \ "mln_morpher_lvalue(I)=typename internal::morpher_lvalue_::ret" \ "mln_concrete(I)=typename mln::trait::concrete::ret" \ "mln_concrete_ch_value(I, V)=typename mln::trait::ch_value< typename mln::trait::concrete::ret, V >::ret" \ @@ -302,18 +303,18 @@ PREDEFINED = "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = +TAGFILES = +GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES @@ -330,14 +331,14 @@ CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = NO # Disabled for light doc DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = +DOT_PATH = +DOTFILE_DIRS = MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = NO # Disabled for light doc DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO -- 1.5.6.5

1 0

4247: Fix errors with icc.
by Thierry Geraud 07 Jul '09

07 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix errors with icc. * mln/core/internal/neighb_niter_impl.hh (element): Return a cpy. * mln/make/h_mat.hh: Remove overloading; it is disambiguation for icc. * tests/make/h_mat.cc: Update. mln/core/internal/neighb_niter_impl.hh | 6 +++- mln/make/h_mat.hh | 47 +-------------------------------- tests/make/h_mat.cc | 13 --------- 3 files changed, 7 insertions(+), 59 deletions(-) Index: mln/core/internal/neighb_niter_impl.hh --- mln/core/internal/neighb_niter_impl.hh (revision 4246) +++ mln/core/internal/neighb_niter_impl.hh (working copy) @@ -33,6 +33,7 @@ # include <mln/core/macros.hh> # include <mln/core/internal/force_exact.hh> + namespace mln { @@ -109,7 +110,10 @@ { typedef typename T::target S; - const mln_graph_element(S)& element() const + // Tech. note: A copy is returned since it actually is a + // temporary object; we cannot return a "const&" here for some + // compilers badly kills the temporary object... + mln_graph_element(S) element() const { return internal::force_exact<E>(*this).compute_p_().element(); } Index: mln/make/h_mat.hh --- mln/make/h_mat.hh (revision 4246) +++ mln/make/h_mat.hh (working copy) @@ -40,27 +40,8 @@ namespace make { - /// Create an mln::algebra::h_mat<d,T>. - /* - * \param[in] tab Array of values. - * - * \pre The array dimension has to be d * d. - */ - template <typename T, unsigned d> - algebra::h_mat<d,T> h_mat(const T (&tab)[(d+1)*(d+1)]); - - /// Create an mln::algebra::h_mat<d,T>. - /* - * \param[in] tab Array of values. - * - * \pre The array dimension has to be d * d. - */ - template <typename T, unsigned d> - algebra::h_mat<d,T> h_mat(const T (&tab)[d+1][d+1]); - - - /// reate an mln::algebra::mat<n,n,T>. + /// Create an mln::algebra::mat<n,n,T>. /* * \param[in] tab C-array of values. * @@ -73,31 +54,6 @@ # ifndef MLN_INCLUDE_ONLY - template <typename T, unsigned d> - inline - algebra::h_mat<d,T> - h_mat(const T (&tab)[(d)*(d)]) - { - std::cout << "plap" << std::endl; - algebra::h_mat<d,T> tmp; - for (unsigned i = 0; i < d; ++i) - tmp(i / (d), i % (d)) = tab[i]; - return tmp; - } - - - template <typename T, unsigned d> - algebra::h_mat<d,T> - h_mat(const T (&tab)[d][d]) - { - algebra::h_mat<d,T> tmp; - for (unsigned i = 0; i < d; ++i) - for (unsigned j = 0; j < d; ++j) - tmp(i, j) = tab[i][j]; - return tmp; - } - - template <typename T, unsigned N> inline algebra::h_mat<mlc_sqrt_int(N), T> @@ -117,4 +73,5 @@ } // end of namespace mln + #endif // ! MLN_MAKE_H_MAT_HH Index: tests/make/h_mat.cc --- tests/make/h_mat.cc (revision 4246) +++ tests/make/h_mat.cc (working copy) @@ -35,7 +35,6 @@ { using namespace mln; - { int vals[9] = { 2, 3, 4, 5, 6, 7, 8, 9, 10 }; @@ -45,15 +44,3 @@ for (unsigned j = 0; j < 4; ++j) mln_assertion(m(i,j) == result[i][j]); } - - { - int vals[3][3] = { { 2, 3, 4 }, - { 5, 6, 7 }, - { 8, 9, 10 } }; - algebra::h_mat<3,int> m = make::h_mat(vals); - - for (unsigned i = 0; i < 4; ++i) - for (unsigned j = 0; j < 4; ++j) - mln_assertion(m(i,j) == result[i][j]); - } -}

1 0

4248: New directories for icdar code release.
by Thierry Geraud 07 Jul '09

07 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> New directories for icdar code release. * modules, * modules/icdar: New directories. 0 files changed

1 0

4246: Fix compilation issues with ICC.
by Guillaume Lazzara 07 Jul '09

07 Jul '09

* mln/accu/compute.hh, * mln/accu/transform.hh, * mln/accu/transform_diagonal.hh, * mln/accu/transform_directional.hh, * mln/accu/transform_line.hh, * mln/accu/transform_snake.hh, * mln/accu/transform_stop.hh, * mln/core/concept/meta_accumulator.hh, * mln/data/compute.hh, * mln/labeling/compute.hh, * mln/set/compute.hh, * mln/set/compute_with_weights.hh: use a helper to deduce the accumulator type from a meta accumulator. * mln/core/image/dmorph/extended.hh: define 'value'. --- milena/ChangeLog | 20 ++++++++++++++++++++ milena/mln/accu/compute.hh | 4 ++-- milena/mln/accu/transform.hh | 4 ++-- milena/mln/accu/transform_diagonal.hh | 4 ++-- milena/mln/accu/transform_directional.hh | 4 ++-- milena/mln/accu/transform_line.hh | 4 ++-- milena/mln/accu/transform_snake.hh | 4 ++-- milena/mln/accu/transform_stop.hh | 4 ++-- milena/mln/core/concept/meta_accumulator.hh | 25 ++++++++++++++++++------- milena/mln/core/image/dmorph/extended.hh | 5 ++++- milena/mln/data/compute.hh | 4 ++-- milena/mln/labeling/compute.hh | 8 ++++---- milena/mln/set/compute.hh | 4 ++-- milena/mln/set/compute_with_weights.hh | 4 ++-- 14 files changed, 66 insertions(+), 32 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b311841..c842b8c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,23 @@ +2009-07-07 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Fix compilation issues with ICC. + + * mln/accu/compute.hh, + * mln/accu/transform.hh, + * mln/accu/transform_diagonal.hh, + * mln/accu/transform_directional.hh, + * mln/accu/transform_line.hh, + * mln/accu/transform_snake.hh, + * mln/accu/transform_stop.hh, + * mln/core/concept/meta_accumulator.hh, + * mln/data/compute.hh, + * mln/labeling/compute.hh, + * mln/set/compute.hh, + * mln/set/compute_with_weights.hh: use a helper to deduce the + accumulator type from a meta accumulator. + + * mln/core/image/dmorph/extended.hh: define 'value'. + 2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Fix ambiguous typedef 'value'. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 56413ac..aeb86e2 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -72,7 +72,7 @@ namespace mln /// \warning This routine does not perform a.init(). /// template <typename A, typename I> - mln_accu_result(A, util::pix) + mln_meta_accu_result(A, util::pix) compute(const Meta_Accumulator<A>& a, const Image& input); @@ -140,7 +140,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_result(A, util::pix) + mln_meta_accu_result(A, util::pix) compute(const Meta_Accumulator<A>& a, const Image& input) { trace::entering("accu::compute"); diff --git a/milena/mln/accu/transform.hh b/milena/mln/accu/transform.hh index 7c0fbf9..eeae247 100644 --- a/milena/mln/accu/transform.hh +++ b/milena/mln/accu/transform.hh @@ -50,7 +50,7 @@ namespace mln const Window<W>& win); template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform(const Image& input, const Meta_Accumulator<A>& a, const Window<W>& win); @@ -197,7 +197,7 @@ namespace mln } template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform(const Image& input, const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform"); diff --git a/milena/mln/accu/transform_diagonal.hh b/milena/mln/accu/transform_diagonal.hh index 99000f4..2c73c8a 100644 --- a/milena/mln/accu/transform_diagonal.hh +++ b/milena/mln/accu/transform_diagonal.hh @@ -65,7 +65,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_diagonal(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win); @@ -444,7 +444,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_diagonal(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win) { diff --git a/milena/mln/accu/transform_directional.hh b/milena/mln/accu/transform_directional.hh index 46863cc..5534a56 100644 --- a/milena/mln/accu/transform_directional.hh +++ b/milena/mln/accu/transform_directional.hh @@ -63,7 +63,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_directional(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win, unsigned dir); @@ -318,7 +318,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_directional(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win, unsigned dir) diff --git a/milena/mln/accu/transform_line.hh b/milena/mln/accu/transform_line.hh index 604853d..42daf31 100644 --- a/milena/mln/accu/transform_line.hh +++ b/milena/mln/accu/transform_line.hh @@ -56,7 +56,7 @@ namespace mln unsigned length, unsigned dir); template <typename A, typename I> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_line(const Meta_Accumulator<A>& a, const Image& input, unsigned length, unsigned dir); @@ -360,7 +360,7 @@ namespace mln template <typename A, typename I> inline - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_line(const Meta_Accumulator<A>& a, const Image& input, unsigned length, unsigned dir) diff --git a/milena/mln/accu/transform_snake.hh b/milena/mln/accu/transform_snake.hh index 62140d4..3890eb4 100644 --- a/milena/mln/accu/transform_snake.hh +++ b/milena/mln/accu/transform_snake.hh @@ -62,7 +62,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_snake(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win); @@ -452,7 +452,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_snake(const Meta_Accumulator<A>& a, const Image& input, const Window<W>& win) { diff --git a/milena/mln/accu/transform_stop.hh b/milena/mln/accu/transform_stop.hh index e9c62e6..b694042 100644 --- a/milena/mln/accu/transform_stop.hh +++ b/milena/mln/accu/transform_stop.hh @@ -48,7 +48,7 @@ namespace mln transform_stop(const Image& input, const Accumulator<A>& a, const Window<W>& win); template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_stop(const Image& input, const Meta_Accumulator<A>& a, const Window<W>& win); @@ -201,7 +201,7 @@ namespace mln } template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_result(A, mln_value(I))) + mln_ch_value(I, mln_meta_accu_result(A, mln_value(I))) transform_stop(const Image& input, const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform_stop"); diff --git a/milena/mln/core/concept/meta_accumulator.hh b/milena/mln/core/concept/meta_accumulator.hh index 013826a..f00a0c6 100644 --- a/milena/mln/core/concept/meta_accumulator.hh +++ b/milena/mln/core/concept/meta_accumulator.hh @@ -36,18 +36,18 @@ # define mln_accu_with(A, T) \ -typename A::template with< T >::ret +typename mln::internal::accu_with_helper<A,T>::ret # define mln_accu_with_(A, T) \ -A::with< T >::ret +mln::internal::accu_with_helper<A,T>::ret -# define mln_accu_result(A, T) \ -typename mln::internal::accu_ret_result_helper<A,T>::result +# define mln_meta_accu_result(A, T) \ +typename mln::internal::meta_accu_ret_result_helper<A,T>::result -# define mln_accu_result_(A, T) \ -mln::internal::accu_ret_result_helper<A,T>::result +# define mln_meta_accu_result_(A, T) \ +mln::internal::meta_accu_ret_result_helper<A,T>::result @@ -66,11 +66,22 @@ namespace mln /// Introduced for ICC compatibility. // template <typename A, typename T> - struct accu_ret_result_helper + struct meta_accu_ret_result_helper { typedef typename A::template with< T >::ret::result result; }; + + /// Make the type resolution easier for the compiler. + /// Introduced for ICC compatibility. + // + template <typename A, typename T> + struct accu_with_helper + { + typedef typename A::template with< T >::ret ret; + }; + + } // end of namespace mln::internal diff --git a/milena/mln/core/image/dmorph/extended.hh b/milena/mln/core/image/dmorph/extended.hh index 581359f..588f95a 100644 --- a/milena/mln/core/image/dmorph/extended.hh +++ b/milena/mln/core/image/dmorph/extended.hh @@ -95,6 +95,9 @@ namespace mln private mlc_not_equal(mln_trait_image_ext_domain(I), trait::image::ext_domain::none)::check_t { + /// Value type. + typedef mln_value(I) value; + /// Skeleton. typedef tag::image_ skeleton; // This property is lost! @@ -124,7 +127,7 @@ namespace mln template <typename I, typename B> extended extended_to(Image& ima, const Box& b); - + # ifndef MLN_INCLUDE_ONLY diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 63942cd..c0d87cc 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -61,7 +61,7 @@ namespace mln /// \return The accumulator result. /// template <typename A, typename I> - mln_accu_result(A, mln_value(I)) + mln_meta_accu_result(A, mln_value(I)) compute(const Meta_Accumulator<A>& a, const Image& input); @@ -90,7 +90,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_result(A, mln_value(I)) + mln_meta_accu_result(A, mln_value(I)) compute(const Meta_Accumulator<A>& a, const Image& input) { typedef mln_accu_with(A, mln_value(I)) A_; diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index eeede38..0e74fd7 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -101,7 +101,7 @@ namespace mln /// \return A mln::p_array of accumulator result (one result per label). // template <typename A, typename I, typename L> - util::array<mln_accu_result(A, mln_value(I))> + util::array<mln_meta_accu_result(A, mln_value(I))> compute(const Meta_Accumulator<A>& a, const Image& input, const Image<L>& label, @@ -132,7 +132,7 @@ namespace mln /// \return A mln::p_array of accumulator result (one result per label). // template <typename A, typename L> - util::array<mln_accu_result(A, mln_psite(L))> + util::array<mln_meta_accu_result(A, mln_psite(L))> compute(const Meta_Accumulator<A>& a, const Image<L>& label, const mln_value(L)& nlabels); @@ -390,7 +390,7 @@ namespace mln template <typename A, typename I, typename L> inline - util::array<mln_accu_result(A, mln_value(I))> + util::array<mln_meta_accu_result(A, mln_value(I))> compute(const Meta_Accumulator<A>& a, const Image& input, const Image<L>& label, @@ -426,7 +426,7 @@ namespace mln template <typename A, typename L> inline - util::array<mln_accu_result(A, mln_psite(L))> + util::array<mln_meta_accu_result(A, mln_psite(L))> compute(const Meta_Accumulator<A>& a, const Image<L>& label, const mln_value(L)& nlabels) diff --git a/milena/mln/set/compute.hh b/milena/mln/set/compute.hh index 1828a8e..39c0164 100644 --- a/milena/mln/set/compute.hh +++ b/milena/mln/set/compute.hh @@ -59,7 +59,7 @@ namespace mln // \return The accumulator result. // template <typename A, typename S> - mln_accu_result(A, mln_site(S)) + mln_meta_accu_result(A, mln_site(S)) compute(const Meta_Accumulator<A>& a, const Site_Set<S>& s); @@ -123,7 +123,7 @@ namespace mln template <typename A, typename S> - mln_accu_result(A, mln_site(S)) + mln_meta_accu_result(A, mln_site(S)) compute(const Meta_Accumulator<A>& a, const Site_Set<S>& s) { trace::entering("set::compute"); diff --git a/milena/mln/set/compute_with_weights.hh b/milena/mln/set/compute_with_weights.hh index de9c17b..b2ae04d 100644 --- a/milena/mln/set/compute_with_weights.hh +++ b/milena/mln/set/compute_with_weights.hh @@ -80,7 +80,7 @@ namespace mln /// \return The accumulator result. // template <typename A, typename I> - mln_accu_result(A, mln_site(I)) + mln_meta_accu_result(A, mln_site(I)) compute_with_weights(const Meta_Accumulator<A>& a, const Image& w); @@ -252,7 +252,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_result(A, mln_site(I)) + mln_meta_accu_result(A, mln_site(I)) compute_with_weights(const Meta_Accumulator<A>& a, const Image& w) { trace::entering("set::compute_with_weights"); -- 1.5.6.5

1 0

4245: Fix ambiguous typedef 'value'.
by Guillaume Lazzara 06 Jul '09

06 Jul '09

* mln/core/image/dmorph/extension_fun.hh, * mln/core/image/dmorph/extension_ima.hh, * mln/core/image/dmorph/extension_val.hh: typedef 'value' in concrete classes. --- milena/ChangeLog | 12 +++++++++++- milena/mln/core/image/dmorph/extension_fun.hh | 2 ++ milena/mln/core/image/dmorph/extension_ima.hh | 6 ++++-- milena/mln/core/image/dmorph/extension_val.hh | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 493a76c..b311841 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix ambiguous typedef 'value'. + + * mln/core/image/dmorph/extension_fun.hh, + * mln/core/image/dmorph/extension_ima.hh, + * mln/core/image/dmorph/extension_val.hh: typedef 'value' in + concrete classes. + + +2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix compilation issues with icc and meta accumulators. * mln/core/concept/meta_accumulator.hh: introduce a helper to help @@ -149,7 +159,7 @@ * mln/transformation/all.hh, * mln/transformation/essential.hh, * tests/transformation/Makefile.am: Remove. - + * tests/geom/Makefile.am: add rotate. 2009-06-29 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/mln/core/image/dmorph/extension_fun.hh b/milena/mln/core/image/dmorph/extension_fun.hh index aea8dac..a8731c2 100644 --- a/milena/mln/core/image/dmorph/extension_fun.hh +++ b/milena/mln/core/image/dmorph/extension_fun.hh @@ -105,6 +105,8 @@ namespace mln /// Skeleton. typedef extension_fun< tag::image_, tag::function_<F> > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; diff --git a/milena/mln/core/image/dmorph/extension_ima.hh b/milena/mln/core/image/dmorph/extension_ima.hh index 269a0e7..a0bc9ca 100644 --- a/milena/mln/core/image/dmorph/extension_ima.hh +++ b/milena/mln/core/image/dmorph/extension_ima.hh @@ -1,4 +1,5 @@ -// 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. // @@ -103,11 +104,12 @@ namespace mln /// Skeleton. typedef extension_ima< tag::image_, tag::ext_<J> > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; - /// Constructor without argument. extension_ima(); diff --git a/milena/mln/core/image/dmorph/extension_val.hh b/milena/mln/core/image/dmorph/extension_val.hh index cf2fc29..c104eba 100644 --- a/milena/mln/core/image/dmorph/extension_val.hh +++ b/milena/mln/core/image/dmorph/extension_val.hh @@ -103,6 +103,8 @@ namespace mln /// Skeleton. typedef extension_val< tag::image_ > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; -- 1.5.6.5

1 0