Olena-patches December 2010

olena-patches@lrde.epita.fr

5 participants
75 discussions

last-svn-commit-722-g749568d Regen generated .mk files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 12 ++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 23afe4d..9f50cc9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated .mk files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/cond_tests_tesseract_tiff: Add conditional diff --git a/scribo/headers.mk b/scribo/headers.mk index 5585ccc..a388d28 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -201,6 +201,10 @@ scribo/text/extract_lines.hh \ scribo/text/look_like_text_lines.hh \ scribo/text/merging.hh \ scribo/text/recognition.hh \ +scribo/toolchain/internal/content_in_doc_functor.hh \ +scribo/toolchain/internal/text_in_doc_functor.hh \ +scribo/toolchain/internal/text_in_doc_preprocess_functor.hh \ +scribo/toolchain/internal/toolchain_functor.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ scribo/toolchain/text_in_doc_preprocess.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index bd8b787..7ddd085 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -31,11 +31,19 @@ if HAVE_TESSERACT if HAVE_TIFF check_PROGRAMS += \ scribo_text_recognition \ +scribo_toolchain_internal_content_in_doc_functor \ +scribo_toolchain_internal_text_in_doc_functor \ scribo_toolchain_text_in_doc scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_text_recognition_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_text_recognition_SOURCES = scribo_text_recognition.cc +scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc +scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_internal_text_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_internal_text_in_doc_functor_SOURCES = scribo_toolchain_internal_text_in_doc_functor.cc scribo_toolchain_text_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_toolchain_text_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_text_in_doc_SOURCES = scribo_toolchain_text_in_doc.cc @@ -238,6 +246,8 @@ scribo_text_clean_inplace \ scribo_text_extract_lines \ scribo_text_look_like_text_lines \ scribo_text_merging \ +scribo_toolchain_internal_text_in_doc_preprocess_functor \ +scribo_toolchain_internal_toolchain_functor \ scribo_toolchain_text_in_doc_preprocess \ scribo_toolchain_text_in_picture \ scribo_upsampling_bs2x \ @@ -437,6 +447,8 @@ scribo_text_clean_inplace_SOURCES = scribo_text_clean_inplace.cc scribo_text_extract_lines_SOURCES = scribo_text_extract_lines.cc scribo_text_look_like_text_lines_SOURCES = scribo_text_look_like_text_lines.cc scribo_text_merging_SOURCES = scribo_text_merging.cc +scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc +scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc scribo_toolchain_text_in_picture_SOURCES = scribo_toolchain_text_in_picture.cc scribo_upsampling_bs2x_SOURCES = scribo_upsampling_bs2x.cc -- 1.5.6.5

13 years, 4 months

branch next-build-test updated: last-svn-commit-721-g1ee88c2

by lazzara＠lrde.epita.fr

13 years, 4 months

last-svn-commit-721-g1ee88c2 tests/unit_test/cond_tests_tesseract_tiff: Add conditional unit-tests.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/tests/unit_test/cond_tests_tesseract_tiff | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 04e5ec1..23afe4d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/cond_tests_tesseract_tiff: Add conditional + unit-tests. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix unit-tests in Scribo. * scribo/toolchain/internal/content_in_doc_functor.hh, diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index 5424dbd..c55f4c1 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,2 +1,4 @@ scribo/text/recognition.hh +scribo/toolchain/internal/content_in_doc_functor.hh +scribo/toolchain/internal/text_in_doc_functor.hh scribo/toolchain/text_in_doc.hh -- 1.5.6.5

13 years, 4 months

branch next-build-test updated: last-svn-commit-720-g619aa0e

by lazzara＠lrde.epita.fr

13 years, 4 months

last-svn-commit-720-g619aa0e Fix unit-tests in Scribo.

by Guillaume Lazzara

* scribo/toolchain/internal/content_in_doc_functor.hh, * scribo/toolchain/internal/text_in_doc_functor.hh: Fix guards. * scribo/toolchain/internal/toolchain_functor.hh: Add a missing include. --- scribo/ChangeLog | 10 ++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 2 +- .../toolchain/internal/text_in_doc_functor.hh | 2 +- .../scribo/toolchain/internal/toolchain_functor.hh | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 40f7db0..04e5ec1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix unit-tests in Scribo. + + * scribo/toolchain/internal/content_in_doc_functor.hh, + * scribo/toolchain/internal/text_in_doc_functor.hh: Fix guards. + + * scribo/toolchain/internal/toolchain_functor.hh: Add a missing + include. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/Makefile.am (SUBDIRS): Fix invalid assignment. 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index 5459487..12e5137 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_PREPROCESS_FUNCTOR_HH +#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH # include <mln/io/ppm/save.hh> diff --git a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh index 701f1e6..fdbee90 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_PREPROCESS_FUNCTOR_HH +#ifndef SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_FUNCTOR_HH # include <mln/io/ppm/save.hh> diff --git a/scribo/scribo/toolchain/internal/toolchain_functor.hh b/scribo/scribo/toolchain/internal/toolchain_functor.hh index d10ea28..a29dafa 100644 --- a/scribo/scribo/toolchain/internal/toolchain_functor.hh +++ b/scribo/scribo/toolchain/internal/toolchain_functor.hh @@ -26,6 +26,8 @@ #ifndef SCRIBO_TOOLCHAIN_INTERNAL_TOOLCHAIN_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_TOOLCHAIN_FUNCTOR_HH +# include <iostream> + namespace scribo { -- 1.5.6.5

13 years, 4 months

branch next-build-test updated: last-svn-commit-719-g5306e4e

by lazzara＠lrde.epita.fr

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-build-test has been updated via 5306e4e13ab2b4d3caeb58d15b8d1ba0fb99bb9d (commit) via db3466e6f12fca8d9c92ae661ae0b5d053b8e4ba (commit) via 47737dc394d2bb22742e7bd2f964bed0cd950648 (commit) via 626d241b525d8c8339f47db71552fdd507441e20 (commit) via ac6d6f3b631b86ed8c9ff6164ad5730f43037038 (commit) via 93da222f1f71aff9addd237d8bd5d065aba3882f (commit) via 6a4e9c53629433058a6fbbbb012b86b275eda65a (commit) via 7186af46bed3e9755e7c319178fdf677b42efdce (commit) via 0be53fd662d3b5ae1c7d3740e07710df4a95c0a6 (commit) from afe7341edce8ebc4977d31410bb7aaacd33c72aa (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 ----------------------------------------------------------------- 5306e4e Merge remote branch 'remotes/origin/next' into next-build-test ----------------------------------------------------------------------- Summary of changes: AUTHORS | 6 +- ChangeLog | 10 +++ m4/autotroll.m4 | 3 + milena/ChangeLog | 60 +++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 +- milena/mln/core/concept/value_set.hh | 5 +- milena/mln/core/site_set/p_complex_piter.hh | 6 +- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/core/site_set/p_n_faces_piter.hh | 83 ++++++++++++++------------- milena/mln/morpho/tree/data.hh | 5 +- milena/mln/trace/warning.hh | 10 ++-- milena/mln/util/array.hh | 8 +- milena/mln/util/fibonacci_heap.hh | 40 +++++++------- swilena/ChangeLog | 9 +++ swilena/python/Makefile.am | 12 ++-- 15 files changed, 176 insertions(+), 89 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 4 months

last-svn-commit-719-g5306e4e Merge remote branch 'remotes/origin/next' into next-build-test

by Guillaume Lazzara

This is a merge commit message of the following branches: Merge: afe7341... db3466e... AUTHORS | 6 +- ChangeLog | 10 +++ m4/autotroll.m4 | 3 + milena/ChangeLog | 60 +++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 +- milena/mln/core/concept/value_set.hh | 5 +- milena/mln/core/site_set/p_complex_piter.hh | 6 +- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/core/site_set/p_n_faces_piter.hh | 83 ++++++++++++++------------- milena/mln/morpho/tree/data.hh | 5 +- milena/mln/trace/warning.hh | 10 ++-- milena/mln/util/array.hh | 8 +- milena/mln/util/fibonacci_heap.hh | 40 +++++++------- swilena/ChangeLog | 9 +++ swilena/python/Makefile.am | 12 ++-- 15 files changed, 176 insertions(+), 89 deletions(-) diff --cc ChangeLog index a8f671e,b63a9a3..b565a26 --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,13 +1,26 @@@ + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Honor `--without-qt' in configure. + + * m4/autotroll.m4: Here. + + 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + + * AUTHORS: Clean up whitespace. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure scribo/demo/xml2doc directory. + +2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-upload.sh: Upload tarball for branch next-build-test. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Use tar-ustar to allow filenames with more than 99 + characters. + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. diff --cc milena/ChangeLog index dd33710,9f07662..0fb0b2b --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,25 -1,63 +1,85 @@@ + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Work around g++ 4.5 deficiencies to compile Milena. + + * mln/core/concept/proxy.hxx + (internal::helper_unproxy_rec< P, true >::P_) + (internal::helper_unproxy_rec< const P, true >::P_): + Remove these intermediate typedefs... + (internal::helper_unproxy_rec< P, true >::ret) + (internal::helper_unproxy_rec< const P, true >::ret): + ...to inline these definitions. + * mln/util/array.hh + (internal::subject_impl<util::array<T>&, E>::operator()) + (internal::subject_impl<util::array<T>&, E>::operator[]) + (internal::subject_impl<const util::array<T>&, E>::operator() const) + (internal::subject_impl<const util::array<T>&, E>::operator[] const): + * mln/core/site_set/p_graph_piter.hh + (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): + Use the exact same return type as in the declaration. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix forward declarations in complex piters. + + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_n_faces_piter.hh: + Here. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Rename parameter `P' as `G' (geometry) in p_n_faces_piters. + + * mln/core/site_set/p_complex_piter.hh: Here. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the type of the underlying site of p_n_faces_piters. + + * mln/core/site_set/p_n_faces_piter.hh + (mln::p_n_faces_fwd_piter, mln::p_n_faces_bkd_piter): + Change the third parameter of the base class from `P' to + `mln_site(P)'. + + 2010-07-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix output streams uses. + + * mln/core/concept/value_set.hh + (operator<<(std::ostream&, const Value_Set<E>&)) + * mln/morpho/tree/data.hh + (operator<< (std::ostream&, const tree::data<I, S>&)): + Use the stream passed as argument instead of std::cout. + * mln/util/fibonacci_heap.hh + (mln::util::internal::fibonacci_heap_node::print_): Take an output + stream as argument instead of using the standard output. + (mln::util::fibonacci_heap::print_): Rename first argument from + `cout' to `ostr' prevent confusions with std::cout. + * mln/trace/warning.hh (mln::trace::warning): Print warnings on + the standard error instead of the standard ourput. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle more global vars with MLN_WO_GLOBAL_VARS + + * mln/canvas/browsing/depth_first_search.hh, + * mln/debug/filename.hh, + * mln/debug/quiet.hh, + * mln/labeling/colorize.hh, + * mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards. + +2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick + instead of ImageMagick. + +2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a fastest implementation in io::magick. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Use pointers to access image data. + 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> Handle properly non 8-bit Magick::Quantum's. hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 4 months

branch next-build-test updated: last-svn-commit-710-gafe7341

by lazzara＠lrde.epita.fr

13 years, 4 months

last-svn-commit-710-gafe7341 demo/Makefile.am (SUBDIRS): Fix invalid assignmens.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4b4f375..40f7db0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/Makefile.am (SUBDIRS): Fix invalid assignment. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/Makefile.am: Add a file dependency. 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index 2d55093..328f17e 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -15,15 +15,17 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. +SUBDIRS = + if HAVE_QT -SUBDIRS = review +SUBDIRS += review if HAVE_MAGICKXX -SUBDIRS = viewer +SUBDIRS += viewer endif HAVE_MAGICKXX -- 1.5.6.5

13 years, 4 months

last-svn-commit-709-ge30fdda demo/xml2doc/Makefile.am: Add a file dependency.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7d0a372..4b4f375 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/xml2doc/Makefile.am: Add a file dependency. + 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> Temporary fix PDF rendering. diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index f6ab232..946b208 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -43,7 +43,8 @@ BUILT_SOURCES = common.moc.cc \ noinst_HEADERS = common.hh \ image_crop.hh \ loader.hh \ - xml_transform.hh + xml_transform.hh \ + datarootdir.hh # Generated files noinst_gen_files = datarootdir.hh -- 1.5.6.5

13 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches December 2010