- Olena-patches

last-svn-commit-507-g5290863 Revamp the handling of Qt.
by Roland Levillain 21 Oct '10

21 Oct '10

* configure.ac: Here. Use autotroll.m4's features instead of duplicating them. --- ChangeLog | 7 +++++++ configure.ac | 21 ++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37071a7..cb5d835 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the handling of Qt. + + * configure.ac: Here. + Use autotroll.m4's features instead of duplicating them. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the handling of Boost libraries. * configure.ac: Here. diff --git a/configure.ac b/configure.ac index de405e9..30064c0 100644 --- a/configure.ac +++ b/configure.ac @@ -228,23 +228,14 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) ## Qt. ## ## --- ## -oln_have_qt=no - -if test "x$with_qt" != xno; then - AT_WITH_QT([+xml], [], [], - AC_MSG_WARN([Qt dependent programs will be disabled.])) - - if test "x$QT_VERSION_MAJOR" != x; then - AT_REQUIRE_QT_VERSION([4], AC_MSG_WARN([Your Qt version is too old! Qt dependent programs will be disabled.]), - AC_DEFINE([HAVE_QT], 1, - [Define to 1 if we can use Qt]) oln_have_qt=yes) - if test "x$QT_VERSION_MAJOR" = x4; then - oln_have_qt=yes - fi - fi +AT_WITH_QT([xml], [], [], [], [oln_have_qt=yes]) +if test $oln_have_qt = yes; then + AT_REQUIRE_QT_VERSION([4], + AC_MSG_WARN([Qt-dependent programs will be disabled.]), + oln_have_expected_qt_version=yes) fi +AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes]) -AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_qt" = xyes]) ## ---------- ## -- 1.5.6.5

1 0

last-svn-commit-505-g944186e Revamp the handling of Boost libraries.
by Roland Levillain 21 Oct '10

21 Oct '10

* configure.ac: Here. Use boost.m4's features instead of duplicating them. Do not explictly look for the Boost Preprocessor (Boost.PP) Library, as we do not directly use it. --- ChangeLog | 9 +++++++++ configure.ac | 35 +++-------------------------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76dbf12..37071a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the handling of Boost libraries. + + * configure.ac: Here. + Use boost.m4's features instead of duplicating them. + Do not explictly look for the Boost Preprocessor (Boost.PP) + Library, as we do not directly use it. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the handling of Magick++. * m4/oln-with-lib.m4 (_OLN_WITH_LIB): Make all arguments diff --git a/configure.ac b/configure.ac index 02cd8bd..de405e9 100644 --- a/configure.ac +++ b/configure.ac @@ -199,38 +199,10 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## Boost ## ## ----- ## -oln_have_boost_preprocessor=no -oln_have_boost_tuple=no - -if test "x$with_boost" != xno; then - # Is Boost installed? - BOOST_REQUIRE([], oln_have_boost=no) - - if test "x$oln_have_boost" != xno; then - - # Preprocessor - BOOST_FIND_HEADER([boost/preprocessor/repetition/repeat.hpp], - oln_have_boost_preprocessor=no, - oln_have_boost_preprocessor=yes) - if test "x$oln_have_boost_preprocessor" = xyes; then - AC_DEFINE([HAVE_BOOST_PREPROCESSOR], 1, - [Define to 1 if we can use Boost Preprocessor.]) - fi - - # Tuple - BOOST_FIND_HEADER([boost/tuple/tuple.hpp], - oln_have_boost_tuple=no, - oln_have_boost_tuple=yes) - if test "x$oln_have_boost_tuple" = xyes; then - AC_DEFINE([HAVE_BOOST_TUPLE], 1, - [Define to 1 if we can use Boost Tuple.]) - fi - fi -fi +BOOST_TUPLE +AM_CONDITIONAL([HAVE_BOOST_TUPLE], + [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -AM_CONDITIONAL([HAVE_BOOST_PREPROCESSOR], - [test "x$oln_have_boost_preprocessor" = xyes]) -AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$oln_have_boost_tuple" = xyes]) ## ---------------- ## @@ -669,7 +641,6 @@ Build system type: $build Option Enabled and available ------------------------------------------------------------------------------- -Boost Preprocessor --with-boost=@<:@=DIR@:>@ $oln_have_boost_preprocessor Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm -- 1.5.6.5

1 0

last-svn-commit-504-g6e8b5fe Revamp the handling of Magick++.
by Roland Levillain 21 Oct '10

21 Oct '10

* m4/oln-with-lib.m4 (_OLN_WITH_LIB): Make all arguments mandatory. (OLN_WITH_LIB_PKG_CONFIG, _OLN_WITH_LIB_PKG_CONFIG): New macros. * configure.ac: Use OLN_WITH_LIB_PKG_CONFIG to handle Magick++ --- ChangeLog | 9 +++++ configure.ac | 44 +----------------------- m4/oln-with-lib.m4 | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index e62355c..76dbf12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the handling of Magick++. + + * m4/oln-with-lib.m4 (_OLN_WITH_LIB): Make all arguments + mandatory. + (OLN_WITH_LIB_PKG_CONFIG, _OLN_WITH_LIB_PKG_CONFIG): New macros. + * configure.ac: Use OLN_WITH_LIB_PKG_CONFIG to handle Magick++ + 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> Have configure be terser. diff --git a/configure.ac b/configure.ac index 09b1fa4..02cd8bd 100644 --- a/configure.ac +++ b/configure.ac @@ -191,9 +191,6 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## External libraries. ## ## -------------------- ## -# Prepare calls to pkg-config -PKG_PROG_PKG_CONFIG - ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) @@ -249,45 +246,8 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) ## Magick++. ## ## --------- ## -# FIXME: We should handle Magick++ both with Magick++-config and -# pkg-config? instead of OLN_WITH_LIB. See how other projects handle -# this. - - -AC_ARG_WITH([magickxx], - [AC_HELP_STRING([--with-magickxx], - [enable magickxx support (default)])], - [with_magickxx=$withval], - [with_magickxx='yes']) - -oln_have_magickxx=no - -if test "x$with_magickxx" != xno; then - # Try to use ImageMagick from a specified path. - if test "x$with_magickxx" != xyes; then - AC_MSG_CHECKING([with given path $with_magickxx]) - OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], - [MAGICKXX]) - fi - - # Check with pkg-config if previous test failed or if no path have - # been passed through --with-magickxx argument. - if test "x$oln_have_magickxx" = xno; then - PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, - oln_have_magickxx=no) - - if test "x$oln_have_magickxx" = xyes; then - AC_DEFINE([HAVE_MAGICKXX], 1, - [Define to 1 if we can use libMagick++]) - # Use standard variable names. - MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" - MAGICKXX_LDFLAGS="$MAGICKXX_LIBS" - AC_SUBST(MAGICKXX_CPPFLAGS) - AC_SUBST(MAGICKXX_LDFLAGS) - fi - fi -fi - +OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], + [MAGICKXX], [], [ImageMagick++]) AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) #------------------------------------------------------------ diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 780923c..01530b9 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -1,6 +1,7 @@ # -*- Autoconf -*- -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE) # # This file is part of Olena. # @@ -61,7 +62,7 @@ m4_default([$5], m4_toupper([$3])),dnl # _OLN_WITH_LIB(PACKAGE, HEADER, LIBRARY, SHELL_NAME, CPP_NAME, -# [OTHER-LIBRARIES]) +# OTHER-LIBRARIES) # ------------------------------------------------------------- # Actual implementation of OLN_WITH_LIB. AC_DEFUN([_OLN_WITH_LIB], @@ -101,3 +102,94 @@ AC_DEFUN([_OLN_WITH_LIB], AM_CONDITIONAL([HAVE_$5], [test x$oln_have_$4 = xyes]) AC_LANG_POP([C++]) ])# _OLN_WITH_LIB + + + +# FIXME: Factor the following macros with the previous ones. + + +# OLN_WITH_LIB_PKG_CONFIG(PACKAGE, HEADER, LIBRARY, [SHELL_NAME], [CPP_NAME], +# [OTHER-LIBRARIES], [MODULE]) +# --------------------------------------------------------------------------- +# Like OLN_WITH_LIB, except that `pkg-config' is first tried to look +# for the module (library) named MODULE. If this first step fails +# (because `pkg-config' is missing, or not working, or cannot find +# MODULE), use a fall-back code similar to OLN_WITH_LIB's. +# +# If not given, MODULE defaults to PACKAGE. +# +# Example of use: +# +# OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], +# [MAGICKXX], [], [ImageMagick++]) +# +AC_DEFUN([OLN_WITH_LIB_PKG_CONFIG], +[dnl Do some sanity checking of the arguments. +m4_if([$1], , [AC_FATAL([$0: missing argument 1])])dnl +m4_if([$2], , [AC_FATAL([$0: missing argument 2])])dnl +m4_if([$3], , [AC_FATAL([$0: missing argument 3])])dnl +_OLN_WITH_LIB_PKG_CONFIG([$1], [$2], [$3],dnl +dnl Process optional arguments. +m4_default([$4], m4_tolower([$3])),dnl +m4_default([$5], m4_toupper([$3])),dnl +[$6],dnl +m4_default([$7], [$1]))dnl +])# OLN_WITH_LIB_PKG_CONFIG + +# _OLN_WITH_LIB_PKG_CONFIG(PACKAGE, HEADER, LIBRARY, SHELL_NAME, CPP_NAME, +# OTHER-LIBRARIES, MODULE) +# ------------------------------------------------------------------------ +# Actual implementation of OLN_WITH_LIB_PKG_CONFIG. +AC_DEFUN([_OLN_WITH_LIB_PKG_CONFIG], +[dnl + AC_REQUIRE([AC_PROG_CXX]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_LANG_PUSH([C++]) + AC_ARG_WITH([$4], + [AC_HELP_STRING([--with-$4@<:@=DIR@:>@], + [use $1 (DIR = prefix for $1 installation)])]) + $5_CPPFLAGS='' + $5_LDFLAGS='' + if test "x$with_$4" != xno; then + # First try with pkg-config. + PKG_CHECK_EXISTS([$7], [oln_with_lib_$4_uses_pkg_config=yes]) + if test x$oln_with_lib_$4_uses_pkg_config = xyes; then + # `pkg-config' seems to work and has been able to find the library; + # use it. + PKG_CHECK_MODULES([$5], [$7], + [oln_have_$4=yes + AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1]) + # Define CPPFLAGS and LDFLAGS. + $5_CPPFLAGS="$$5_CFLAGS" + $5_LDFLAGS="$$5_LIBS"]) + else + # `pkg-config' is absent, unusable or is unable to find the library; + # use our fall-back code. + if test -n "$with_$4"; then + $5_CPPFLAGS="-I${with_$4}/include" + $5_LDFLAGS="-L${with_$4}/lib" + fi + oln_save_CPPFLAGS=$CPPFLAGS + oln_save_LDFLAGS=$LDFLAGS + CPPFLAGS="$$5_CPPFLAGS $CPPFLAGS" + LDFLAGS="$$5_LDFLAGS $LDFLAGS" + oln_have_$4=no + AC_CHECK_HEADER([$2], + [AC_CHECK_LIB([$3], + [main], + [oln_have_$4=yes + $5_LDFLAGS="$$5_LDFLAGS -l$3 $6" + AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1])], + [], [$6] + )] + ) + CPPFLAGS=$oln_save_CPPFLAGS + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS" + fi + fi + AC_SUBST([$5_CPPFLAGS]) + AC_SUBST([$5_LDFLAGS]) + AM_CONDITIONAL([HAVE_$5], [test x$oln_have_$4 = xyes]) + AC_LANG_POP([C++]) +])# _OLN_WITH_LIB_PKG_CONFIG -- 1.5.6.5

1 0

last-svn-commit-493-gb63755a Make use of value::next routine in Scribo.
by Guillaume Lazzara 21 Oct '10

21 Oct '10

* scribo/core/component_set.hh, * scribo/core/line_set.hh, * scribo/core/object_links.hh, * scribo/debug/highlight_text_area.hh, * scribo/filter/object_groups_with_holes.hh, * scribo/filter/objects_with_holes.hh, * scribo/postprocessing/fill_object_holes.hh, * scribo/table/internal/align_lines.hh: Use value::next to replace evil casts. --- scribo/ChangeLog | 14 ++++++++++++++ scribo/scribo/core/component_set.hh | 7 ++++--- scribo/scribo/core/line_set.hh | 2 +- scribo/scribo/core/object_links.hh | 4 ++-- scribo/scribo/debug/highlight_text_area.hh | 2 +- scribo/scribo/filter/object_groups_with_holes.hh | 5 ++--- scribo/scribo/filter/objects_with_holes.hh | 11 +++++------ scribo/scribo/postprocessing/fill_object_holes.hh | 6 +++--- scribo/scribo/table/internal/align_lines.hh | 2 +- 9 files changed, 33 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 986678e..3a365b4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make use of value::next routine in Scribo. + + * scribo/core/component_set.hh, + * scribo/core/line_set.hh, + * scribo/core/object_links.hh, + * scribo/debug/highlight_text_area.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/table/internal/align_lines.hh: Use value::next to replace + evil casts. + 2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> Fix namespace ambiguities. diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index 937ba4f..77cbaa5 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -37,6 +37,7 @@ # include <mln/data/fill.hh> # include <mln/util/array.hh> +# include <mln/value/next.hh> # include <mln/accu/pair.hh> # include <mln/accu/center.hh> @@ -315,7 +316,7 @@ namespace scribo { typedef mln_site(L) P; - infos_.reserve(value::next(ncomps_)); + infos_.reserve(mln::value::next(ncomps_)); infos_.append(component_info()); // Component 0, i.e. the background. for_all_comp_data(i, attribs) @@ -333,7 +334,7 @@ namespace scribo { typedef mln_site(L) P; - infos_.reserve(value::next(ncomps_)); + infos_.reserve(mln::value::next(ncomps_)); infos_.append(component_info()); // Component 0, i.e. the background. for_all_comp_data(i, attribs) @@ -509,7 +510,7 @@ namespace scribo mln_concrete(L) component_set<L>::valid_comps_image_() const { - mln::util::array<bool> f(value::next(this->data_->ncomps_)); + mln::util::array<bool> f(mln::value::next(this->data_->ncomps_)); f(0) = true; for_all_comps(c, (*this)) diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 5dca629..6ef3294 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -244,7 +244,7 @@ namespace scribo // FIXME: object_groups should store the relation 'group -> comp'. mln::util::array< mln::util::array<component_id_t> > - group_to_comps(unsigned(n_groups) + 1); + group_to_comps(value::next(n_groups)); // 1st pass - Compute data. diff --git a/scribo/scribo/core/object_links.hh b/scribo/scribo/core/object_links.hh index 09e1cfe..af7dc38 100644 --- a/scribo/scribo/core/object_links.hh +++ b/scribo/scribo/core/object_links.hh @@ -148,7 +148,7 @@ namespace scribo template <typename L> object_links<L>::object_links(const component_set<L>& components) { - data_ = new data_t(components, unsigned(components.nelements()) + 1); + data_ = new data_t(components, value::next(components.nelements())); } @@ -156,7 +156,7 @@ namespace scribo object_links<L>::object_links(const component_set<L>& components, unsigned value) { - data_ = new data_t(components, unsigned(components.nelements()) + 1, + data_ = new data_t(components, value::next(components.nelements()), value); } diff --git a/scribo/scribo/debug/highlight_text_area.hh b/scribo/scribo/debug/highlight_text_area.hh index 1ff673e..5fc9329 100644 --- a/scribo/scribo/debug/highlight_text_area.hh +++ b/scribo/scribo/debug/highlight_text_area.hh @@ -263,7 +263,7 @@ namespace scribo initialize(mask, input); data::fill(mask, false); - mln::util::array<mln_box(I)> bbox(unsigned(components.nelements()) + 1); + mln::util::array<mln_box(I)> bbox(value::next(components.nelements())); for_all_comps(i, components) if (components(i).is_valid()) diff --git a/scribo/scribo/filter/object_groups_with_holes.hh b/scribo/scribo/filter/object_groups_with_holes.hh index e833092..b86b10e 100644 --- a/scribo/scribo/filter/object_groups_with_holes.hh +++ b/scribo/scribo/filter/object_groups_with_holes.hh @@ -172,13 +172,12 @@ namespace scribo // Will store the first background component id associated // to a group. util::array<unsigned> bg_comps( - static_cast<unsigned>(components.nelements()) + 1, 0); + value::next(components.nelements()), 0); // Will 'True' if a group has at least two background // components. fun::i2v::array<bool> - to_keep(static_cast<unsigned>(components.nelements()) + 1, - false); + to_keep(value::next(components.nelements()), false); const L& lbl = components.labeled_image(); diff --git a/scribo/scribo/filter/objects_with_holes.hh b/scribo/scribo/filter/objects_with_holes.hh index fdad0d9..09eaad5 100644 --- a/scribo/scribo/filter/objects_with_holes.hh +++ b/scribo/scribo/filter/objects_with_holes.hh @@ -173,10 +173,10 @@ namespace scribo L bboxes_ima; util::array<util::set<unsigned> > bg_comps( - static_cast<unsigned>(components.nelements()) + 1); + value::next(components.nelements())); fun::i2v::array<bool> - to_keep(static_cast<unsigned>(components.nelements()) + 1, + to_keep(value::next(components.nelements()), false); const L& lbl = components.labeled_image(); @@ -337,13 +337,12 @@ namespace scribo L bboxes_ima; util::array<unsigned> bg_comps( - static_cast<unsigned>(components.nelements()) + 1, 0); + value::next(components.nelements()), 0); util::array<bool> bg_comps_done( - static_cast<unsigned>(components.nelements()) + 1, false); + value::next(components.nelements()), false); fun::i2v::array<bool> - to_keep(static_cast<unsigned>(components.nelements()) + 1, - false); + to_keep(value::next(components.nelements()), false); const L& lbl = components.labeled_image(); diff --git a/scribo/scribo/postprocessing/fill_object_holes.hh b/scribo/scribo/postprocessing/fill_object_holes.hh index 14416be..ea77fb6 100644 --- a/scribo/scribo/postprocessing/fill_object_holes.hh +++ b/scribo/scribo/postprocessing/fill_object_holes.hh @@ -174,12 +174,12 @@ namespace scribo L bboxes_ima; util::array<unsigned> bg_comps( - unsigned(components.nelements()) + 1, 0); + value::next(components.nelements()), 0); util::array<bool> bg_comps_done( - unsigned(components.nelements()) + 1, false); + value::next(components.nelements()), false); mln::fun::i2v::array<bool> - to_keep(unsigned(components.nelements()) + 1, false); + to_keep(value::next(components.nelements()), false); const L& lbl = components.labeled_image(); diff --git a/scribo/scribo/table/internal/align_lines.hh b/scribo/scribo/table/internal/align_lines.hh index 01f9c39..7b31548 100644 --- a/scribo/scribo/table/internal/align_lines.hh +++ b/scribo/scribo/table/internal/align_lines.hh @@ -142,7 +142,7 @@ namespace scribo // Init box2line mln::util::array<int> - box2line(unsigned(lines.nelements()) + 1, -1); + box2line(value::next(lines.nelements()), -1); // Find the line with the highest element count. unsigned max_nelts = 0; -- 1.5.6.5

1 0

last-svn-commit-492-ga913e1f Add value::next routine.
by Guillaume Lazzara 21 Oct '10

21 Oct '10

* mln/value/label.hh: Include next routine. * mln/value/next.hh: New. --- milena/ChangeLog | 8 +++ milena/mln/value/{cast.hh => next.hh} | 92 +++++++++++++++++++++------------ scribo/scribo/core/component_set.hh | 17 ++++--- 3 files changed, 77 insertions(+), 40 deletions(-) copy milena/mln/value/{cast.hh => next.hh} (59%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1eedf26..a5da997 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add value::next routine. + + * mln/value/label.hh: Include next routine. + + * mln/value/next.hh: New. + 2010-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Temporarily disable static tests on Magick::Quantum type size. diff --git a/milena/mln/value/cast.hh b/milena/mln/value/next.hh similarity index 59% copy from milena/mln/value/cast.hh copy to milena/mln/value/next.hh index 0f7939b..e1dac48 100644 --- a/milena/mln/value/cast.hh +++ b/milena/mln/value/next.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,16 +23,14 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_CAST_HH -# define MLN_VALUE_CAST_HH +#ifndef MLN_VALUE_NEXT_HH +# define MLN_VALUE_NEXT_HH -/*! \file - * - * \brief Definition of the mln::value::cast routine. - */ +/// \file +/// +/// Return a given value incremented by 1. -# include <mln/core/concept/value.hh> -# include <mln/value/equiv.hh> +# include <mln/value/label.hh> namespace mln @@ -41,59 +39,87 @@ namespace mln namespace value { + template <typename V> + V + next(const V&); - /// Cast a value \p src from type \c Src to type \c Dest. - template <typename Dest, typename Src> - Dest cast(const Src& src); +# ifndef MLN_INCLUDE_ONLY -# ifndef MLN_INCLUDE_ONLY + // Implementations - namespace internal + namespace implementation { - template <typename S> + namespace generic + { + + template <typename V> + inline + V + next(const V& v) + { + return v + 1; + } + + } // end of namespace mln::value::implementation::generic + + + template <unsigned n> inline - const S& - cast_(const void*, const S& src) + mln::value::label<n> + next_label(const mln::value::label<n>& v) { - return src; + return v.next(); } - template <typename O, typename S> + } // end of namespace mln::value::implementation + + + + // Dispatch + + namespace internal + { + + template <unsigned n> inline - const S& - cast_(const Object<O>*, const S& src) + label<n> + next_dispatch(const label<n>& v) { - return src; + return implementation::next_label(v); } - template <typename V, typename S> + + template <typename V> inline - mln_value_equiv(S) - cast_(const Value<V>*, const S& src) + V + next_dispatch(const V& v) { - return mln::value::equiv(src); + return implementation::generic::next(v); } } // end of namespace mln::value::internal - template <typename Dest, typename Src> + + // Facade + + template <typename V> inline - Dest cast(const Src& src) + V + next(const V& v) { - // FIXME: Add static_cast<Dest>? - // FIXME: Add exact()? - return static_cast<Dest>(internal::cast_(&src, src)); + return internal::next_dispatch(v); } + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::value } // end of namespace mln - -#endif // ! MLN_VALUE_CAST_HH +#endif // ! MLN_VALUE_NEXT_HH diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index b8445eb..937ba4f 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -115,6 +115,9 @@ namespace scribo typedef mln_result(center_accu_t) center_t; + typedef internal::component_set_data<L> data_t; + typedef data_t* id_t; + public: /// Constructors @@ -190,7 +193,7 @@ namespace scribo const mln::util::array<scribo::component_info>& infos_() const; /// Unique set Id. - unsigned id_() const; + id_t id_() const; /// Read/Write access to the underlying labeled image. @@ -212,7 +215,7 @@ namespace scribo /// Duplicate the underlying image and create a new component_set. void init_(const component_set<L>& model); - mln::util::tracked_ptr< internal::component_set_data<L> > data_; + mln::util::tracked_ptr<data_t> data_; }; @@ -312,7 +315,7 @@ namespace scribo { typedef mln_site(L) P; - infos_.reserve(static_cast<unsigned>(ncomps_) + 1); + infos_.reserve(value::next(ncomps_)); infos_.append(component_info()); // Component 0, i.e. the background. for_all_comp_data(i, attribs) @@ -330,7 +333,7 @@ namespace scribo { typedef mln_site(L) P; - infos_.reserve(static_cast<unsigned>(ncomps_) + 1); + infos_.reserve(value::next(ncomps_)); infos_.append(component_info()); // Component 0, i.e. the background. for_all_comp_data(i, attribs) @@ -485,10 +488,10 @@ namespace scribo template <typename L> inline - unsigned + typename component_set<L>::id_t component_set<L>::id_() const { - return (unsigned)data_.ptr_; + return data_.ptr_; } @@ -506,7 +509,7 @@ namespace scribo mln_concrete(L) component_set<L>::valid_comps_image_() const { - mln::util::array<bool> f(unsigned(this->data_->ncomps_) + 1); + mln::util::array<bool> f(value::next(this->data_->ncomps_)); f(0) = true; for_all_comps(c, (*this)) -- 1.5.6.5

1 0

last-svn-commit-503-g283a487 Have configure be terser.
by Roland Levillain 20 Oct '10

20 Oct '10

* configure.ac: Remove intermediate messages. Add option `--enable-verbose', and show the final summary only when it is turned on. Use escaped version of `[' and `]' in message. Document this option... * README (Verbose Display): ...here. --- ChangeLog | 11 +++++ README | 12 ++++++ configure.ac | 124 ++++++++++++++++++++-------------------------------------- 3 files changed, 66 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91e0c50..e62355c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + Have configure be terser. + + * configure.ac: Remove intermediate messages. + Add option `--enable-verbose', and show the final summary only + when it is turned on. + Use escaped version of `[' and `]' in message. + Document this option... + * README (Verbose Display): ...here. + +2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + Ensure paths passed to `--with-*' options are visited before others. * m4/oln-with-lib.m4 (OLN_WITH_LIB): Here. diff --git a/README b/README index 8b99acd..cc49a02 100644 --- a/README +++ b/README @@ -157,6 +157,18 @@ environment CONFIG_SITE to set up a configuration environment (see Autoconf's manual). +Verbose Display +=============== + +A more verbose display can be turned on by passing the +`--enable-verbose' flag to configure: + + % ../configure --enable-verbose + +Before configuring files, configure will display a summary of the +configuration step. + + Installation Path ================= diff --git a/configure.ac b/configure.ac index 5ea0ac8..09b1fa4 100644 --- a/configure.ac +++ b/configure.ac @@ -194,11 +194,6 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Prepare calls to pkg-config PKG_PROG_PKG_CONFIG -AC_MSG_RESULT([]) -AC_MSG_RESULT([]) -AC_MSG_RESULT([Checking external libraries]) -AC_MSG_RESULT([-------------------------------------------------------------------------------]) - ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) @@ -211,10 +206,6 @@ oln_have_boost_preprocessor=no oln_have_boost_tuple=no if test "x$with_boost" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* Boost]) - AC_MSG_RESULT([-------]) - # Is Boost installed? BOOST_REQUIRE([], oln_have_boost=no) @@ -249,12 +240,6 @@ AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$oln_have_boost_tuple" = xyes]) ## CFITSIO library. ## ## ---------------- ## -if test "x$with_cfitsio" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* libcfitsio]) - AC_MSG_RESULT([------------]) -fi - OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) @@ -278,14 +263,9 @@ AC_ARG_WITH([magickxx], oln_have_magickxx=no if test "x$with_magickxx" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* libMagick++]) - AC_MSG_RESULT([---------------]) - # Try to use ImageMagick from a specified path. if test "x$with_magickxx" != xyes; then AC_MSG_CHECKING([with given path $with_magickxx]) - AC_MSG_RESULT([]) OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) fi @@ -293,11 +273,8 @@ if test "x$with_magickxx" != xno; then # Check with pkg-config if previous test failed or if no path have # been passed through --with-magickxx argument. if test "x$oln_have_magickxx" = xno; then - AC_MSG_CHECKING([with pkg-config]) - AC_MSG_RESULT([]) PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, oln_have_magickxx=no) - AC_MSG_RESULT([]) if test "x$oln_have_magickxx" = xyes; then AC_DEFINE([HAVE_MAGICKXX], 1, @@ -322,10 +299,6 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) oln_have_qt=no if test "x$with_qt" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* Qt]) - AC_MSG_RESULT([----]) - AT_WITH_QT([+xml], [], [], AC_MSG_WARN([Qt dependent programs will be disabled.])) @@ -346,12 +319,6 @@ AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_qt" = xyes]) ## Tesseract. ## ## ---------- ## -if test "x$with_tesseract" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* Tesseract]) - AC_MSG_RESULT([-----------]) -fi - OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) @@ -360,12 +327,6 @@ OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], ## TIFF library. ## ## ------------- ## -if test "x$with_tiff" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* libtiff]) - AC_MSG_RESULT([---------]) -fi - OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) @@ -373,25 +334,11 @@ OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) ## GDCM library (Grassroots DiCom). ## ## -------------------------------- ## -if test "x$with_gdcm" != xno; then - AC_MSG_RESULT([]) - AC_MSG_RESULT([* libgdcm]) - AC_MSG_RESULT([---------]) -fi - OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]) - - -AC_MSG_RESULT([]) -AC_MSG_RESULT([-------------------------------------------------------------------------------]) -AC_MSG_RESULT([]) -AC_MSG_RESULT([]) - - ## ---------------------------- ## ## (Bundled) trimesh2 library. ## ## ---------------------------- ## @@ -735,12 +682,19 @@ if test -z "$TOOLS_CXXFLAGS"; then fi fi -AC_MSG_RESULT([-------------------------------------------------------------------------------]) -AC_MSG_RESULT([Update Olena configuration]) -AC_OUTPUT +## ----------------- ## +## Verbose display. ## +## ----------------- ## + +# Do not print this information by default, since `configure' outputs +# should be kept short. Longer explanations are always available in +# config.log. -AC_MSG_RESULT([ +AC_ARG_ENABLE([verbose], + [AS_HELP_STRING([--enable-verbose], [enable verbose display])], + [if test "x$enable_verbose" != xno; then + AC_MSG_RESULT([ ------------------------------------------------------------------------------- Configuration summary. @@ -753,17 +707,17 @@ Build system type: $build ================ - Option Enabled and available + Option Enabled and available ------------------------------------------------------------------------------- -Boost Preprocessor --with-boost=[DIR] $oln_have_boost_preprocessor -Boost Tuple --with-boost=[DIR] $oln_have_boost_tuple -CFITSIO --with-cfitsio[=DIR] $oln_have_cfitsio -GDCM --with-gdcm[=DIR] $oln_have_gdcm -Magick++ --with-magickxx $oln_have_magickxx -Qt --with-qt $oln_have_qt -Tesseract --with-tesseract[=DIR] $oln_have_tesseract -TIFF --with-tiff[=DIR] $oln_have_tiff -Trimesh --enable-trimesh $enable_trimesh +Boost Preprocessor --with-boost=@<:@=DIR@:>@ $oln_have_boost_preprocessor +Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple +CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio +GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm +Magick++ --with-magickxx $oln_have_magickxx +Qt --with-qt $oln_have_qt +Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract +TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff +Trimesh --enable-trimesh $enable_trimesh ------------------------------------------------------------------------------- @@ -774,10 +728,10 @@ Trimesh --enable-trimesh $enable_trimesh =========== - Option Enabled + Option Enabled ------------------------------------------------------------------------------- -Scribo --enable-scribo $enable_scribo -Swilena --enable-swilena $enable_swilena +Scribo --enable-scribo $enable_scribo +Swilena --enable-swilena $enable_swilena ------------------------------------------------------------------------------- @@ -788,10 +742,10 @@ Swilena --enable-swilena $enable_swilena ============= - Option Enabled + Option Enabled ------------------------------------------------------------------------------- -Apps --enable-apps $enable_apps -Tools --enable-tools $enable_tools +Apps --enable-apps $enable_apps +Tools --enable-tools $enable_tools ------------------------------------------------------------------------------- @@ -808,13 +762,13 @@ Options used to compile and link: LIBS = $MAGICK_LIBS CXX = $CXX CXXFLAGS = $CXXFLAGS - PKG_CONFIG = $PKG_CONFIG - QT_PATH = $QT_PATH - QMAKE = $QMAKE - MOC = $MOC - UIC = $UIC - RCC = $RCC - BOOST_ROOT = $BOOST_ROOT + PKG_CONFIG = $PKG_CONFIG + QT_PATH = $QT_PATH + QMAKE = $QMAKE + MOC = $MOC + UIC = $UIC + RCC = $RCC + BOOST_ROOT = $BOOST_ROOT MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS MAGICKXX_LIBS = $MAGICKXX_LDFLAGS SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS @@ -824,9 +778,17 @@ Options used to compile and link: ******************************************************************************* -Olena is configured as stated above. Please verify that this configuration +Olena is configured as stated above. Please verify that this configuration matches your expectations. Then, type 'make' to build Olena and 'make install' to install it on your system. ]) +fi]) + + +## -------- ## +## Output. ## +## -------- ## + +AC_OUTPUT -- 1.5.6.5

1 0

last-svn-commit-502-gf8e324b Ensure paths passed to `--with-*' options are visited before others.
by Roland Levillain 20 Oct '10

20 Oct '10

* m4/oln-with-lib.m4 (OLN_WITH_LIB): Here. --- ChangeLog | 6 ++++++ m4/oln-with-lib.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffd8eec..91e0c50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + Ensure paths passed to `--with-*' options are visited before others. + + * m4/oln-with-lib.m4 (OLN_WITH_LIB): Here. + +2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + * m4/oln-with-lib.m4: Revert the previous changes. 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 4f939cb..780923c 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -80,8 +80,8 @@ AC_DEFUN([_OLN_WITH_LIB], fi oln_save_CPPFLAGS=$CPPFLAGS oln_save_LDFLAGS=$LDFLAGS - CPPFLAGS="$CPPFLAGS $$5_CPPFLAGS" - LDFLAGS="$LDFLAGS $$5_LDFLAGS" + CPPFLAGS="$$5_CPPFLAGS $CPPFLAGS" + LDFLAGS="$$5_LDFLAGS $LDFLAGS" oln_have_$4=no AC_CHECK_HEADER([$2], [AC_CHECK_LIB([$3], -- 1.5.6.5

1 0

last-svn-commit-501-g46eae02 m4/oln-with-lib.m4: Revert the previous changes.
by Roland Levillain 20 Oct '10

20 Oct '10

--- ChangeLog | 4 ++++ m4/oln-with-lib.m4 | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca5ca4d..ffd8eec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + * m4/oln-with-lib.m4: Revert the previous changes. + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> Update HACKING. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 64ee629..4f939cb 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -1,7 +1,6 @@ # -*- Autoconf -*- -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE) +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -74,20 +73,17 @@ AC_DEFUN([_OLN_WITH_LIB], [use $1 (DIR = prefix for $1 installation)])]) $5_CPPFLAGS='' $5_LDFLAGS='' - base_inc_dir='' - oln_have_$4=no if test "x$with_$4" != xno; then if test -n "$with_$4"; then - base_inc_dir="${with_$4}/include/" - $5_CPPFLAGS="-I${base_inc_dir}" + $5_CPPFLAGS="-I${with_$4}/include" $5_LDFLAGS="-L${with_$4}/lib" fi oln_save_CPPFLAGS=$CPPFLAGS oln_save_LDFLAGS=$LDFLAGS CPPFLAGS="$CPPFLAGS $$5_CPPFLAGS" LDFLAGS="$LDFLAGS $$5_LDFLAGS" - header="${base_inc_dir}$2" - AC_CHECK_HEADER([$header], + oln_have_$4=no + AC_CHECK_HEADER([$2], [AC_CHECK_LIB([$3], [main], [oln_have_$4=yes -- 1.5.6.5

1 0

last-svn-commit-498-g949f1cb Fix `link' name lookup in Scribo.
by Roland Levillain 20 Oct '10

20 Oct '10

* src/text_in_picture.cc: Help the C++ compiler not to mix up scribo::primitive::link with unistd.h's link(2). --- scribo/ChangeLog | 7 +++++++ scribo/src/text_in_picture.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f9fc04..c4692cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + Fix `link' name lookup in Scribo. + + * src/text_in_picture.cc: Help the C++ compiler not to mix up + scribo::primitive::link with unistd.h's link(2). + 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 8f530db..5be498a 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -334,7 +334,7 @@ int main(int argc, char* argv[]) /// linking potential components timer_.restart(); mln::util::couple<object_links<L>, object_links<L> > - links = link::left_right(filtered_components); + links = scribo::primitive::link::left_right(filtered_components); object_links<L>& left_link = links.first(); object_links<L>& right_link = links.second(); @@ -370,8 +370,8 @@ int main(int argc, char* argv[]) // Validating left and right links. timer_.restart(); - object_links<L> - merged_links = link::merge_double_link(left_link, right_link); + object_links<L> merged_links = + scribo::primitive::link::merge_double_link(left_link, right_link); t_ = timer_; std::cout << "Right/Left Validation. " << t_ << std::endl; -- 1.5.6.5

1 0

Re: [Olena-patches] [Olena] #43: Fix the initialization of all global constants.
by Olena Trac 18 Oct '10

18 Oct '10

#43: Fix the initialization of all global constants. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: reopened Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Description changed by levill_r: Old description: > * Use extern const ref, not static (really?) > * Move implementation into another file (e.g., `foo.hcc`) > * Provide a `globals.hcc` including all `.hcc` files (convenience > shortcut). > * Tell users (a entry in the FAQ would be useful) to include each > needed `.hcc` file '''once''' per program. New description: * Use extern const ref, not static (really?) * Move implementation into another file (e.g., `foo.hcc`) * Provide a `globals.hcc` including all `.hcc` files (convenience shortcut). * Tell users (a entry in the FAQ would be useful) to include each needed `.hcc` file '''once''' per program. Don't forget to grep the uses of macro `MLN_WO_GLOBAL_VARS` in the code. -- -- Ticket URL: <https://trac.lrde.org/olena/ticket/43#comment:6> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0