August 2010 - Olena-patches

last-svn-commit-461-gbd5519b Fix tests in Milena.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* mln/draw/dashed_line.hh, * mln/fun/n2v/white_gaussian.hh, * mln/fun/v2v/rgb_to_int_u.hh, * mln/io/dump/get_header.hh, * mln/io/raw/get_header.hh: Add missing includes. * tests/topo/skeleton/crest.cc: Fix reference results since a bug have been fixed. * tests/unit_test/cond_tests_qt: Add conditional tests. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 16 ++++++++++++++++ milena/mln/draw/dashed_line.hh | 2 +- milena/mln/fun/n2v/white_gaussian.hh | 4 ++-- milena/mln/fun/v2v/rgb_to_int_u.hh | 7 ++++++- milena/mln/io/dump/get_header.hh | 1 + milena/mln/io/raw/get_header.hh | 1 + milena/tests/topo/skeleton/crest.cc | 10 +++++----- milena/tests/unit_test/cond_tests_qt | 2 ++ milena/tests/unit_test/unit-tests.mk | 18 ++++++++++++++---- 9 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_qt diff --git a/milena/ChangeLog b/milena/ChangeLog index b149b2b..f960f53 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix tests in Milena. + + * mln/draw/dashed_line.hh, + * mln/fun/n2v/white_gaussian.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/io/dump/get_header.hh, + * mln/io/raw/get_header.hh: Add missing includes. + + * tests/topo/skeleton/crest.cc: Fix reference results since a bug + have been fixed. + + * tests/unit_test/cond_tests_qt + * tests/unit_test/unit-tests.mk + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing traces. * mln/convert/to_qimage.hh, diff --git a/milena/mln/draw/dashed_line.hh b/milena/mln/draw/dashed_line.hh index 6b0d244..4a31ae9 100644 --- a/milena/mln/draw/dashed_line.hh +++ b/milena/mln/draw/dashed_line.hh @@ -35,7 +35,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/site_set/p_line2d.hh> # include <mln/core/image/imorph/safe.hh> -# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> diff --git a/milena/mln/fun/n2v/white_gaussian.hh b/milena/mln/fun/n2v/white_gaussian.hh index 53afbf6..55d6cc1 100644 --- a/milena/mln/fun/n2v/white_gaussian.hh +++ b/milena/mln/fun/n2v/white_gaussian.hh @@ -34,7 +34,7 @@ # include <ctime> # include <mln/core/concept/function.hh> - +# include <mln/math/sqrt.hh> namespace mln @@ -86,7 +86,7 @@ namespace mln } X = X - 25.f; /* set mean to 0 */ - X = X * sqrt(12 / 50.f); /* adjust variance to 1 */ + X = X * math::sqrt(12 / 50.f); /* adjust variance to 1 */ return sigma * X; }; diff --git a/milena/mln/fun/v2v/rgb_to_int_u.hh b/milena/mln/fun/v2v/rgb_to_int_u.hh index d04dbf0..1be1ae2 100644 --- a/milena/mln/fun/v2v/rgb_to_int_u.hh +++ b/milena/mln/fun/v2v/rgb_to_int_u.hh @@ -1,4 +1,5 @@ -// 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. // @@ -27,6 +28,10 @@ #ifndef MLN_FUN_V2V_RGB_TO_INT_U_HH # define MLN_FUN_V2V_RGB_TO_INT_U_HH +# include <mln/core/concept/function.hh> +# include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> + namespace mln { diff --git a/milena/mln/io/dump/get_header.hh b/milena/mln/io/dump/get_header.hh index 2cfb4cb..2eaffdd 100644 --- a/milena/mln/io/dump/get_header.hh +++ b/milena/mln/io/dump/get_header.hh @@ -38,6 +38,7 @@ # include <mln/core/box_runstart_piter.hh> # include <mln/core/pixel.hh> # include <mln/data/memcpy_.hh> +# include <mln/util/array.hh> namespace mln { diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/raw/get_header.hh index c263cff..b969b2c 100644 --- a/milena/mln/io/raw/get_header.hh +++ b/milena/mln/io/raw/get_header.hh @@ -38,6 +38,7 @@ # include <mln/core/box_runstart_piter.hh> # include <mln/core/pixel.hh> # include <mln/data/memcpy_.hh> +# include <mln/util/array.hh> namespace mln { diff --git a/milena/tests/topo/skeleton/crest.cc b/milena/tests/topo/skeleton/crest.cc index 894894f..993854e 100644 --- a/milena/tests/topo/skeleton/crest.cc +++ b/milena/tests/topo/skeleton/crest.cc @@ -1,4 +1,5 @@ -// 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. // @@ -33,17 +34,16 @@ # include <mln/transform/distance_front.hh> # include <mln/value/int_u8.hh> - int main() { using namespace mln; bool ref_dat[][9] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 1, 0, 0, 0 }, - { 0, 0, 0, 0, 1, 1, 0, 1, 0 }, - { 0, 1, 1, 1, 1, 1, 0, 1, 0 }, + { 0, 0, 0, 0, 1, 1, 0, 0, 0 }, + { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, { 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 1, 0, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; bool in_dat[][9] = { { 0, 0, 0, 0, 1, 1, 1, 0, 0 }, diff --git a/milena/tests/unit_test/cond_tests_qt b/milena/tests/unit_test/cond_tests_qt new file mode 100644 index 0000000..8783d35 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_qt @@ -0,0 +1,2 @@ +mln/convert/to_qimage.hh +mln/convert/to_qimage_nocopy.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index bc0b6df..31dddae 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -53,6 +53,20 @@ mln_io_magick_save_SOURCES = mln_io_magick_save.cc endif HAVE_MAGICKXX # Starting a conditional unit test list. +if HAVE_QT +check_PROGRAMS += \ +mln_convert_to_qimage \ +mln_convert_to_qimage_nocopy + +mln_convert_to_qimage_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +mln_convert_to_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +mln_convert_to_qimage_SOURCES = mln_convert_to_qimage.cc +mln_convert_to_qimage_nocopy_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +mln_convert_to_qimage_nocopy_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc +endif HAVE_QT + +# Starting a conditional unit test list. if HAVE_TIFF check_PROGRAMS += \ mln_io_tiff_all \ @@ -223,8 +237,6 @@ mln_convert_to_fun \ mln_convert_to_image \ mln_convert_to_p_array \ mln_convert_to_p_set \ -mln_convert_to_qimage \ -mln_convert_to_qimage_nocopy \ mln_convert_to_upper_window \ mln_convert_to_window \ mln_core_a_point_of \ @@ -1545,8 +1557,6 @@ mln_convert_to_fun_SOURCES = mln_convert_to_fun.cc mln_convert_to_image_SOURCES = mln_convert_to_image.cc mln_convert_to_p_array_SOURCES = mln_convert_to_p_array.cc mln_convert_to_p_set_SOURCES = mln_convert_to_p_set.cc -mln_convert_to_qimage_SOURCES = mln_convert_to_qimage.cc -mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc mln_convert_to_upper_window_SOURCES = mln_convert_to_upper_window.cc mln_convert_to_window_SOURCES = mln_convert_to_window.cc mln_core_a_point_of_SOURCES = mln_core_a_point_of.cc -- 1.5.6.5

1 0

last-svn-commit-460-g4d1677c Add missing traces.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* mln/convert/to_qimage.hh, * mln/convert/to_qimage_nocopy.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/convert/to_qimage.hh | 3 +++ milena/mln/convert/to_qimage_nocopy.hh | 4 +++- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4b07835..b149b2b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing traces. + + * mln/convert/to_qimage.hh, + * mln/convert/to_qimage_nocopy.hh: Here. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh index c87771e..b5b22ae 100644 --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -279,11 +279,14 @@ namespace mln inline QImage to_qimage(const Image<I>& ima_) { + trace::entering("convert::to_qimage"); + const I& ima = exact(ima_); mln_precondition(ima.is_valid()); QImage output = internal::to_qimage_dispatch(ima); + trace::exiting("convert::to_qimage"); return output; } diff --git a/milena/mln/convert/to_qimage_nocopy.hh b/milena/mln/convert/to_qimage_nocopy.hh index fbae2f6..91a96ad 100644 --- a/milena/mln/convert/to_qimage_nocopy.hh +++ b/milena/mln/convert/to_qimage_nocopy.hh @@ -27,7 +27,6 @@ /// /// Convert a Milena image to a Qimage. - #ifndef MLN_CONVERT_TO_QIMAGE_NOCOPY_HH # define MLN_CONVERT_TO_QIMAGE_NOCOPY_HH @@ -162,11 +161,14 @@ namespace mln inline QImage to_qimage_nocopy(const Image<I>& ima_) { + trace::entering("convert::to_qimage_nocopy"); + const I& ima = exact(ima_); mln_precondition(ima.is_valid()); QImage output = internal::to_qimage_nocopy_dispatch(ima); + trace::exiting("convert::to_qimage_nocopy"); return output; } -- 1.5.6.5

1 0

last-svn-commit-459-g951bfdd build-aux/build_unit_test.sh: Add more comments.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aaf78d..b985ffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * build-aux/build_unit_test.sh: Add more comments. + 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> Handle libgdcmCommon's dependencies. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 15310ff..65ba103 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -33,8 +33,13 @@ ## "cond_tests_*" files must be created in the directory where ## unit-test.mk is generated (usually the unit-tests directory). ## -## WARNING: don't forget to add "cond_tests_*" files in the COND_TESTS +## WARNINGS: +## --------- +## * Don't forget to add "cond_tests_*" files in the COND_TESTS ## variable in the right Makefile.am. +## +## * ALWAYS end "cond_tests_*" files with a new line! +## ## FIXME: Don't use `echo -n', as echo's options are not portable. ## -- 1.5.6.5

1 0

last-svn-commit-458-gca40829 Handle libgdcmCommon's dependencies.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* configure.ac: Pass more libraries to OLN_WITH_LIB when searching for libgdcmCommon. --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca2698f..8aaf78d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle libgdcmCommon's dependencies. + + * configure.ac: Pass more libraries to OLN_WITH_LIB when searching + for libgdcmCommon. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Display a summary of the configuration when the build directory is ready. diff --git a/configure.ac b/configure.ac index 594856f..916221b 100644 --- a/configure.ac +++ b/configure.ac @@ -273,7 +273,7 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([* libgdcm]) AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], - [-lgdcmzlib]) + [-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]) ## ---------- ## ## Tesseract. ## -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-457-g00d8fa3
by lazzara＠lrde.epita.fr 11 Aug '10

11 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next has been updated via 00d8fa3b631df334782cc755a0a1bbc3af1e8d35 (commit) via 6ca68abdb08224a001fbdd838a6bbffb58b902ba (commit) via a9958fa777ee5686c5a923311aab1caa793ab89a (commit) via be773a94ff966b4008cb3ce086bdaa3a679cf8a5 (commit) from 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 00d8fa3 configure.ac: Display a summary of the configuration when the build directory is ready. 6ca68ab configure.ac: Set oln_with_* variables correctly a9958fa headers.mk: Regen. be773a9 Regen headers.mk and unit-tests.mk in Scribo. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++ configure.ac | 95 ++++++++++++++++++++++++++++++++-- milena/ChangeLog | 4 ++ milena/headers.mk | 25 +++++++++ scribo/ChangeLog | 7 +++ scribo/headers.mk | 4 -- scribo/tests/unit_test/unit-tests.mk | 2 +- 7 files changed, 136 insertions(+), 10 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-457-g00d8fa3 configure.ac: Display a summary of the configuration when the build directory is ready.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 5 +++ configure.ac | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8a1e37..ca2698f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Display a summary of the configuration when the + build directory is ready. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Set oln_with_* variables correctly. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 9c9e263..594856f 100644 --- a/configure.ac +++ b/configure.ac @@ -655,5 +655,87 @@ if test -z "$TOOLS_CXXFLAGS"; then fi fi - +AC_MSG_RESULT([-------------------------------------------------------------]) +AC_MSG_RESULT([Update Olena configuration]) AC_OUTPUT + + + +AC_MSG_RESULT([ +Olena is configured as follows. Please verify that this configuration +matches your expectations. + +Host system type: $host +Build system type: $build + +================ +| Dependencies | +================ + + + Option Value +------------------------------------------------------------------------------- +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 +------------------------------------------------------------------------------- + + + + +=========== +| Modules | +=========== + + + Option Value +------------------------------------------------------------------------------- +Scribo --enable-scribo $enable_scribo +Swilena --enable-swilena $enable_swilena +------------------------------------------------------------------------------- + + + + +============= +| Utilities | +============= + + + Option Value +------------------------------------------------------------------------------- +Apps --enable-apps $enable_apps +Tools --enable-tools $enable_tools +------------------------------------------------------------------------------- + + + +Options used to compile and link: + PREFIX = $PREFIX_DIR + EXEC-PREFIX = $EXEC_PREFIX_DIR + VERSION = $PACKAGE_VERSION + CC = $CC + CFLAGS = $CFLAGS + CPPFLAGS = $MAGICK_CPPFLAGS + DEFS = $DEFS + LDFLAGS = $LDFLAGS + LIBS = $MAGICK_LIBS + CXX = $CXX + CXXFLAGS = $CXXFLAGS + PKG_CONFIG = $PKG_CONFIG + QT_PATH = $QT_PATH + QMAKE = $QMAKE + MOC = $MOC + UIC = $UIC + RCC = $RCC + MAGICKXX_CFLAGS = $MAGICKXX_CFLAGS + MAGICKXX_LIBS = $MAGICKXX_LIBS + SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS + APPS_CXXFLAGS = $APPS_CXXFLAGS + TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS + +]) -- 1.5.6.5

1 0

last-svn-commit-456-g6ca68ab configure.ac: Set oln_with_* variables correctly
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 4 ++++ configure.ac | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a3e7db..b8a1e37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Set oln_with_* variables correctly. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Require Qt 4.x minimum to enable the use of Qt. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index e782d82..9c9e263 100644 --- a/configure.ac +++ b/configure.ac @@ -234,7 +234,7 @@ if test "x$with_magickxx" != 'xyes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-magickxx=$with_magickxx " fi -have_magickxx='no' +oln_have_magickxx='no' MAGICKXX_CFLAGS="" MAGICKXX_LIBS="" MAGICKXX_PKG="" @@ -242,11 +242,11 @@ if test "x$with_magickxx" = 'xyes'; then AC_MSG_RESULT([]) AC_MSG_RESULT([* libMagick++]) AC_MSG_RESULT([---------------]) - PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], have_magickxx=yes, have_magickxx=no) + PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, oln_have_magickxx=no) AC_MSG_RESULT([]) fi -if test "$have_magickxx" = 'yes'; then +if test "$oln_have_magickxx" = 'yes'; then AC_DEFINE([HAVE_MAGICKXX], 1, [Define to 1 if we can use libMagick++]) # Use standard variable names. MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" @@ -255,7 +255,7 @@ if test "$have_magickxx" = 'yes'; then AC_SUBST(MAGICKXX_LDFLAGS) fi -AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') +AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = 'xyes') #------------------------------------------------------------ @@ -292,6 +292,8 @@ OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], AC_MSG_RESULT([]) AC_MSG_RESULT([* Qt]) AC_MSG_RESULT([----]) + +oln_have_qt='no' AT_WITH_QT([+xml], [], [], AC_MSG_WARN([Qt dependent programs will be disabled.])) @@ -299,6 +301,7 @@ 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' fi AM_CONDITIONAL([HAVE_QT], [test "x$QT_VERSION_MAJOR" == "x4"]) -- 1.5.6.5

1 0

last-svn-commit-455-ga9958fa headers.mk: Regen.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bc6cbd1..4b07835 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> Fix tests in Milena. diff --git a/milena/headers.mk b/milena/headers.mk index 6ee6d7f..b483024 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -159,6 +159,8 @@ mln/convert/to_fun.hh \ mln/convert/to_image.hh \ mln/convert/to_p_array.hh \ mln/convert/to_p_set.hh \ +mln/convert/to_qimage.hh \ +mln/convert/to_qimage_nocopy.hh \ mln/convert/to_upper_window.hh \ mln/convert/to_window.hh \ mln/core/a_point_of.hh \ @@ -447,6 +449,7 @@ mln/data/replace.hh \ mln/data/saturate.hh \ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ +mln/data/split.hh \ mln/data/stretch.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ @@ -462,6 +465,7 @@ mln/debug/format.hh \ mln/debug/histo.hh \ mln/debug/iota.hh \ mln/debug/iota.spe.hh \ +mln/debug/mosaic.hh \ mln/debug/println.hh \ mln/debug/println.spe.hh \ mln/debug/println_with_border.hh \ @@ -470,10 +474,13 @@ mln/debug/put_word.hh \ mln/debug/quiet.hh \ mln/debug/slices_2d.hh \ mln/debug/superpose.hh \ +mln/debug/z_order.hh \ mln/display/all.hh \ mln/display/essential.hh \ mln/draw/all.hh \ mln/draw/box.hh \ +mln/draw/box_plain.hh \ +mln/draw/dashed_line.hh \ mln/draw/essential.hh \ mln/draw/line.hh \ mln/draw/plot.hh \ @@ -507,6 +514,8 @@ mln/fun/internal/resolve.hh \ mln/fun/internal/selector.hh \ mln/fun/internal/x2x_linear_impl.hh \ mln/fun/meta/impl.hh \ +mln/fun/n2v/all.hh \ +mln/fun/n2v/white_gaussian.hh \ mln/fun/ops.hh \ mln/fun/p2b/all.hh \ mln/fun/p2b/antilogy.hh \ @@ -546,6 +555,8 @@ mln/fun/v2v/inc.hh \ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ +mln/fun/v2v/qt_rgb_to_int_u.hh \ +mln/fun/v2v/rgb_to_int_u.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ mln/fun/v2w2v/all.hh \ @@ -591,6 +602,7 @@ mln/geom/chamfer.hh \ mln/geom/complex_geometry.hh \ mln/geom/delta.hh \ mln/geom/essential.hh \ +mln/geom/horizontal_symmetry.hh \ mln/geom/max_col.hh \ mln/geom/max_ind.hh \ mln/geom/max_row.hh \ @@ -612,6 +624,7 @@ mln/geom/size1d.hh \ mln/geom/size2d.hh \ mln/geom/size3d.hh \ mln/geom/translate.hh \ +mln/geom/vertical_symmetry.hh \ mln/graph/all.hh \ mln/graph/attribute/card.hh \ mln/graph/attribute/representative.hh \ @@ -624,6 +637,7 @@ mln/histo/all.hh \ mln/histo/array.hh \ mln/histo/compute.hh \ mln/histo/compute.spe.hh \ +mln/histo/equalize.hh \ mln/histo/essential.hh \ mln/histo/point_from_value.hh \ mln/io/abort.hh \ @@ -632,8 +646,10 @@ mln/io/cloud/all.hh \ mln/io/cloud/load.hh \ mln/io/cloud/save.hh \ mln/io/dicom/all.hh \ +mln/io/dicom/get_header.hh \ mln/io/dicom/load.hh \ mln/io/dump/all.hh \ +mln/io/dump/get_header.hh \ mln/io/dump/load.hh \ mln/io/dump/save.hh \ mln/io/essential.hh \ @@ -682,6 +698,10 @@ mln/io/ppm/load.hh \ mln/io/ppm/save.hh \ mln/io/ppms/all.hh \ mln/io/ppms/load.hh \ +mln/io/raw/all.hh \ +mln/io/raw/get_header.hh \ +mln/io/raw/load.hh \ +mln/io/raw/save.hh \ mln/io/tiff/all.hh \ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ @@ -706,6 +726,7 @@ mln/labeling/relabel.hh \ mln/labeling/superpose.hh \ mln/labeling/value.hh \ mln/labeling/value.spe.hh \ +mln/labeling/value_and_compute.hh \ mln/labeling/wrap.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ @@ -972,6 +993,7 @@ mln/set/inter.hh \ mln/set/sym_diff.hh \ mln/set/uni.hh \ mln/set/unique.hh \ +mln/subsampling/antialiased.hh \ mln/tag/all.hh \ mln/tag/essential.hh \ mln/tag/init.hh \ @@ -1198,6 +1220,7 @@ mln/value/internal/gray_f.hh \ mln/value/internal/integer.hh \ mln/value/internal/iterable_set.hh \ mln/value/internal/limits.hh \ +mln/value/internal/make_generic_name.hh \ mln/value/internal/value_like.hh \ mln/value/interval.hh \ mln/value/label.hh \ @@ -1209,6 +1232,7 @@ mln/value/mixin.hh \ mln/value/ops.hh \ mln/value/other.hh \ mln/value/proxy.hh \ +mln/value/qt/rgb32.hh \ mln/value/rgb.hh \ mln/value/rgb16.hh \ mln/value/rgb8.hh \ @@ -1236,6 +1260,7 @@ mln/win/octagon2d.hh \ mln/win/rectangle2d.hh \ mln/win/segment1d.hh \ mln/win/shift.hh \ +mln/win/sline3d.hh \ mln/win/sphere3d.hh \ mln/win/sym.hh \ mln/win/vline2d.hh \ -- 1.5.6.5

1 0

last-svn-commit-454-gbe773a9 Regen headers.mk and unit-tests.mk in Scribo.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 4 ---- scribo/tests/unit_test/unit-tests.mk | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index da50444..f1f4f72 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen headers.mk and unit-tests.mk in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Update READMEs. * README, diff --git a/scribo/headers.mk b/scribo/headers.mk index ce8700a..231742b 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -128,14 +128,11 @@ scribo/primitive/extract/vertical_separators.hh \ scribo/primitive/group/all.hh \ scribo/primitive/group/apply.hh \ scribo/primitive/group/from_double_link.hh \ -scribo/primitive/group/from_double_link_any.hh \ scribo/primitive/group/from_graph.hh \ scribo/primitive/group/from_single_link.hh \ -scribo/primitive/group/from_single_link_robust.hh \ scribo/primitive/internal/all.hh \ scribo/primitive/internal/find_graph_link.hh \ scribo/primitive/internal/find_root.hh \ -scribo/primitive/internal/find_root_robust.hh \ scribo/primitive/internal/have_link_valid.hh \ scribo/primitive/internal/is_link_valid.hh \ scribo/primitive/internal/rd.hh \ @@ -168,7 +165,6 @@ scribo/primitive/link/with_single_left_link_dmax_ratio.hh \ scribo/primitive/link/with_single_right_link.hh \ scribo/primitive/link/with_single_right_link_bottom.hh \ scribo/primitive/link/with_single_right_link_dmax_ratio.hh \ -scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh \ scribo/primitive/link/with_single_right_link_top.hh \ scribo/primitive/link/with_single_up_link.hh \ scribo/primitive/regroup/from_single_left_link.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 82664fa..ec63a26 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -1,6 +1,6 @@ ## Generated by ./build-aux/build_unit_test.sh, do not modify. -check_PROGRAMS = +check_PROGRAMS = # Starting a conditional unit test list. if HAVE_QT -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-453-g013ef3d
by lazzara＠lrde.epita.fr 11 Aug '10

11 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next has been updated via 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit) via 6793cca44120828368141b44d52d589d47c72f72 (commit) from f7bc7e130d7cd61342e2a1bd50433caf8dc251e2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 013ef3d configure.ac: Require Qt 4.x minimum to enable the use of Qt. 6793cca m4/autotroll.m4: Fix an invalid generation of configure with autoconf 2.61. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++++++++ configure.ac | 39 +++++++++++++++++++++++++++++---------- m4/autotroll.m4 | 2 +- 3 files changed, 39 insertions(+), 11 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0