September 2011 - Olena-patches

last-svn-commit-989-g7520529 Prevent g++ 4.2 from issuing bad code for constrained-connectivity.
by Roland Levillain 13 Sep '11

13 Sep '11

* apps/constrained-connectivity/Makefile.am (constrained_connectivity_CXXFLAGS): New. Append $(STRICT_ALIASING_CXXFLAGS). --- milena/ChangeLog | 8 ++++++++ milena/apps/constrained-connectivity/Makefile.am | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3823664..8014d4b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2011-09-13 Roland Levillain <roland(a)lrde.epita.fr> + + Prevent g++ 4.2 from issuing bad code for constrained-connectivity. + + * apps/constrained-connectivity/Makefile.am + (constrained_connectivity_CXXFLAGS): New. + Append $(STRICT_ALIASING_CXXFLAGS). + 2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> Fix the return type of mln::Function<E>::operator=. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 84a6ed2..c0dfb0d 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -22,6 +22,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = constrained-connectivity constrained_connectivity_SOURCES = constrained-connectivity.cc +constrained_connectivity_CXXFLAGS = $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS) TESTS = test-constrained-connectivity -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-989-g7520529
by git＠lrde.epita.fr 13 Sep '11

13 Sep '11

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 next-next has been updated via 75205293d6ff1424f8bccbdfc37b725fd0d48878 (commit) from 901e408114a91853c2d63d512ebc9920ecd339d5 (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 ----------------------------------------------------------------- 7520529 Prevent g++ 4.2 from issuing bad code for constrained-connectivity. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 ++++++++ milena/apps/constrained-connectivity/Makefile.am | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-988-g901e408 Fix the return type of mln::Function<E>::operator=.
by Roland Levillain 12 Sep '11

12 Sep '11

* mln/core/concept/function.hh: Here. --- milena/ChangeLog | 6 ++++++ milena/mln/core/concept/function.hh | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3549cff..3823664 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Fix the return type of mln::Function<E>::operator=. + + * mln/core/concept/function.hh: Here. + +2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Stop warning about Debian's g++ 4.2 compiler issues. * mln/data/memcpy_.hh diff --git a/milena/mln/core/concept/function.hh b/milena/mln/core/concept/function.hh index 6153997..5b6c15a 100644 --- a/milena/mln/core/concept/function.hh +++ b/milena/mln/core/concept/function.hh @@ -72,11 +72,10 @@ namespace mln Function(); Function(const Function&); - /* Workaround for Apple's llvm-gcc 4.2.1 (Mac OS Lion 10.7.1) + /* Workaround for Apple's llvm-gcc 4.2.1 (Mac OS X Lion 10.7.1) Apple's llvm-gcc has a bug causing memmove() errors if the copy - constructor is not declared along with operator=(). - */ + constructor is not declared along with operator=(). */ Function& operator=(const Function&); }; @@ -231,7 +230,7 @@ namespace mln template <typename E> inline - Function& + Function<E>& Function<E>::operator=(const Function&) { return *this; -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-988-g901e408
by git＠lrde.epita.fr 12 Sep '11

12 Sep '11

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 next-next has been updated via 901e408114a91853c2d63d512ebc9920ecd339d5 (commit) from c71f5f39bcb6608f9f55ba0e367a5bee5ab78e0c (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 ----------------------------------------------------------------- 901e408 Fix the return type of mln::Function<E>::operator=. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 6 ++++++ milena/mln/core/concept/function.hh | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next-next updated: last-svn-commit-987-gc71f5f3
by git＠lrde.epita.fr 12 Sep '11

12 Sep '11

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 next-next has been updated via c71f5f39bcb6608f9f55ba0e367a5bee5ab78e0c (commit) via bb65e6448ce06c519c7a92227d913fce49735d9a (commit) via cc4ad3f633f2c85ab2ca90aeea18c01c9d2db32b (commit) via 2bad7aebee22febe5fd6681911ba887a0d92d132 (commit) via 210ab543e021001a7d922efc11dcbb4237603bf3 (commit) via 563d81e05e8703387d21212a3b45cb6714e8715d (commit) via e9095c75f75d111afd2d6a254b45e8acfd68cffa (commit) from c760a8e92a6869ba1a5bce54216dc437ef4e5bbb (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 ----------------------------------------------------------------- c71f5f3 Stop warning about Debian's g++ 4.2 compiler issues. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 16 ++++++++ Makefile.am | 28 +++++++++++++ distrib/macports/Portfile.in | 41 ++++++++++++++++++++ milena/ChangeLog | 20 ++++++++++ milena/mln/core/concept/function.hh | 17 ++++++++- milena/mln/data/memcpy_.hh | 19 +++++---- milena/mln/value/builtin/carrays.hh | 5 +- scribo/ChangeLog | 27 +++++++++++++ scribo/demo/viewer/Makefile.am | 4 +- .../{shared => viewer}/icons/olena_smaller.jpg | Bin 8028 -> 8028 bytes scribo/demo/viewer/viewer.qrc | 2 +- scribo/scribo/text/paragraphs_closing.hh | 4 +- scribo/src/content_in_doc.cc | 2 +- scribo/src/contest/DAE-2011/Makefile.am | 26 ++++++------- scribo/src/contest/hdlac-2011/Makefile.am | 17 ++++---- scribo/src/debug/Makefile.am | 18 ++++----- scribo/src/debug/show_lines_boldness.cc | 3 - scribo/src/debug/show_text_lines.cc | 2 - scribo/src/debug/show_text_lines_wo_seps.cc | 2 - scribo/src/scribo-cli.in | 2 +- 20 files changed, 197 insertions(+), 58 deletions(-) create mode 100644 distrib/macports/Portfile.in copy scribo/demo/{shared => viewer}/icons/olena_smaller.jpg (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-987-gc71f5f3 Stop warning about Debian's g++ 4.2 compiler issues.
by Roland Levillain 12 Sep '11

12 Sep '11

* mln/data/memcpy_.hh (mln::data::impl_::memcpy__<Pd, Ps>(Pd&, const Ps&, std::size_t)): Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/data/memcpy_.hh | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 02b9e65..3549cff 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + + Stop warning about Debian's g++ 4.2 compiler issues. + + * mln/data/memcpy_.hh + (mln::data::impl_::memcpy__<Pd, Ps>(Pd&, const Ps&, std::size_t)): + Here. + 2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/value/builtin/carrays.hh: Fix a compilation error with diff --git a/milena/mln/data/memcpy_.hh b/milena/mln/data/memcpy_.hh index 77701b2..7453fab 100644 --- a/milena/mln/data/memcpy_.hh +++ b/milena/mln/data/memcpy_.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -89,16 +89,17 @@ namespace mln return; } - /* FIXME: Careful, the code generated for this function by g++ - 4.2 with high a optimization level (`-O3') and without + /* Careful, the code generated for this function by g++ 4.2 + with a high optimization level (`-O3') and without `-fno-strict-aliasing' might be wrong (at least with Debian's g++ 4.2 on IA-32)! Note that Debian's g++ 4.0, - 4.1, 4.3 and 4.4 are fine. */ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) -# if __GNUC__ == 4 && __GNUC_MINOR__ == 2 -# warning The code generated by g++ 4.2 on Debian GNU/Linux 5.0 for IA-32 for this function might be wrong. -# endif -#endif + 4.1, 4.3 and 4.4 are fine. + + We used to trigger a warning when g++ 4.2 was detected, but + we no longer do this since this warning was popping in + virtually every compiler output and because this bug is + limited to some specific use cases. Moreover, g++ 4.2 will + be less and less used over time. */ if (sizeof(mln_value(Id)) == 1) { std::memcpy((void*) (&dest.val()), // violent casts -- 1.7.2.5

1 0

branch unstable/scribo updated: last-svn-commit-986-gbb65e64
by lazzara＠lrde.epita.fr 12 Sep '11

12 Sep '11

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 unstable/scribo has been updated via bb65e6448ce06c519c7a92227d913fce49735d9a (commit) via cc4ad3f633f2c85ab2ca90aeea18c01c9d2db32b (commit) via 2bad7aebee22febe5fd6681911ba887a0d92d132 (commit) via 210ab543e021001a7d922efc11dcbb4237603bf3 (commit) via 563d81e05e8703387d21212a3b45cb6714e8715d (commit) via e9095c75f75d111afd2d6a254b45e8acfd68cffa (commit) via c760a8e92a6869ba1a5bce54216dc437ef4e5bbb (commit) via 4ff49763f12452473b5819e00a775ee66f17b2d3 (commit) from 571b25c281f3e2cace5f2a0c96f251e7a977f6e6 (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 ----------------------------------------------------------------- bb65e64 mln/value/builtin/carrays.hh: Fix a compilation error with Apple's clang 2.1. cc4ad3f Workaround for Apple's llvm-gcc 4.2.1 on Mac OS Lion 10.7.1 2bad7ae Fix Portfile related dependencies. 210ab54 Small fixes in Scribo. 563d81e More fixes in Scribo build system. e9095c7 Generate a valid Portfile for MacPorts support. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 16 ++ Makefile.am | 28 +++ distrib/macports/Portfile.in | 41 ++++ milena/ChangeLog | 12 + milena/mln/core/concept/function.hh | 17 ++- milena/mln/value/builtin/carrays.hh | 5 +- scribo/ChangeLog | 74 +++++++ scribo/demo/viewer/Makefile.am | 4 +- .../{shared => viewer}/icons/olena_smaller.jpg | Bin 8028 -> 8028 bytes scribo/demo/viewer/viewer.qrc | 2 +- scribo/scribo/text/paragraphs_closing.hh | 4 +- scribo/src/content_in_doc.cc | 2 +- scribo/src/contest/DAE-2011/Makefile.am | 26 +- scribo/src/contest/hdlac-2011/Makefile.am | 8 +- scribo/src/debug/Makefile.am | 36 ++- scribo/src/debug/show_lines_boldness.cc | 3 - scribo/src/debug/show_text_lines.cc | 2 - scribo/src/debug/show_text_lines_wo_seps.cc | 2 - scribo/src/scribo-cli.in | 2 +- scribo/tests/unit_test/Makefile.am | 13 +- scribo/tests/unit_test/cond_tests_magickxx | 27 +++ scribo/tests/unit_test/cond_tests_magickxx_qt | 2 + .../cond_tests_magickxx_qt_tesseract_tiff | 1 - .../tests/unit_test/cond_tests_magickxx_tesseract | 2 + .../unit_test/cond_tests_magickxx_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_qt | 2 - .../tests/unit_test/cond_tests_qt_tesseract_tiff | 1 - scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 - scribo/tests/unit_test/unit-tests.mk | 232 +++++++++++++------- 29 files changed, 432 insertions(+), 134 deletions(-) create mode 100644 distrib/macports/Portfile.in copy scribo/demo/{shared => viewer}/icons/olena_smaller.jpg (100%) create mode 100644 scribo/tests/unit_test/cond_tests_magickxx create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_qt create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_tesseract delete mode 100644 scribo/tests/unit_test/cond_tests_qt_tesseract_tiff hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-986-gbb65e64 mln/value/builtin/carrays.hh: Fix a compilation error with Apple's clang 2.1.
by Guillaume Lazzara 12 Sep '11

12 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/value/builtin/carrays.hh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1236ea1..02b9e65 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/value/builtin/carrays.hh: Fix a compilation error with + Apple's clang 2.1. + +2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Workaround for Apple's llvm-gcc 4.2.1 on Mac OS Lion 10.7.1 * mln/core/concept/function.hh: Add operator=() in Function diff --git a/milena/mln/value/builtin/carrays.hh b/milena/mln/value/builtin/carrays.hh index a245683..3ad2721 100644 --- a/milena/mln/value/builtin/carrays.hh +++ b/milena/mln/value/builtin/carrays.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -69,7 +70,7 @@ namespace mln { std::ostringstream s; s << value_<T>::name() << '[' << n << ']'; - return s.str(); + return s.str().c_str(); } }; -- 1.7.2.5

1 0

last-svn-commit-985-gcc4ad3f Workaround for Apple's llvm-gcc 4.2.1 on Mac OS Lion 10.7.1
by Guillaume Lazzara 12 Sep '11

12 Sep '11

* mln/core/concept/function.hh: Add operator=() in Function concept class. --- milena/ChangeLog | 7 +++++++ milena/mln/core/concept/function.hh | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f6e355d..1236ea1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Workaround for Apple's llvm-gcc 4.2.1 on Mac OS Lion 10.7.1 + + * mln/core/concept/function.hh: Add operator=() in Function + concept class. + 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix devel-refman output directory. diff --git a/milena/mln/core/concept/function.hh b/milena/mln/core/concept/function.hh index e4ba741..6153997 100644 --- a/milena/mln/core/concept/function.hh +++ b/milena/mln/core/concept/function.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -70,6 +71,13 @@ namespace mln protected: Function(); Function(const Function&); + + /* Workaround for Apple's llvm-gcc 4.2.1 (Mac OS Lion 10.7.1) + + Apple's llvm-gcc has a bug causing memmove() errors if the copy + constructor is not declared along with operator=(). + */ + Function& operator=(const Function&); }; @@ -221,6 +229,13 @@ namespace mln { } + template <typename E> + inline + Function& + Function<E>::operator=(const Function&) + { + return *this; + } // Function_n2v. -- 1.7.2.5

1 0

last-svn-commit-984-g2bad7ae Fix Portfile related dependencies.
by Guillaume Lazzara 12 Sep '11

12 Sep '11

* Makefile.am: Improve Portfile dependencies. * distrib/macports/Portfile.in: Add package dependencies. --- ChangeLog | 8 ++++++++ Makefile.am | 2 +- distrib/macports/Portfile.in | 8 +++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e0ea05..1909858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Portfile related dependencies. + + * Makefile.am: Improve Portfile dependencies. + + * distrib/macports/Portfile.in: Add package dependencies. + 2011-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> Generate a valid Portfile for MacPorts support. diff --git a/Makefile.am b/Makefile.am index 636f10b..66dc10c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ do_subst = sed -e 's|@packagename[@]|$(PACKAGE_TARNAME)|g' \ -e "s|@package_sha1[@]|`openssl sha1 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" \ -e "s|@package_rmd160[@]|`openssl rmd160 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" -$(PORTFILE): dist $(top_srcdir)/distrib/macports/Portfile.in Makefile +$(PORTFILE): $(top_srcdir)/distrib/macports/Portfile.in Makefile dist rm -f $@ $@.tmp rm -Rf distrib srcdir=''; \ diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index 129a5e8..54e45eb 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -20,15 +20,17 @@ checksums md5 @package_md5@ \ sha1 @package_sha1@ \ rmd160 @package_rmd160@ -depends_lib port:GraphicsMagick \ +depends_lib port:ImageMagick \ port:tiff supported_archs i386 x86_64 variant scribo description {Add a DIA framework} { depends_lib-append port:tesseract \ - port:qt4-mac \ - port:fop + port:qt4-mac \ + port:fop \ + port:libxslt + configure.args-append --enable-scribo } -- 1.7.2.5

1 0