Olena-patches July 2014

olena-patches@lrde.epita.fr

2 participants
36 discussions

olena: olena-2.0-950-g5420cc6 Update copyright notices in Olena.
by Roland Levillain 08 Jul '14

08 Jul '14

* doc/Doxyfile.in, * doc/mainpage.dox: Here. --- ChangeLog | 8 ++++++++ doc/Doxyfile.in | 4 ++-- doc/mainpage.dox | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7363fa7..7f39c90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-07-08 Roland Levillain <roland(a)lrde.epita.fr> + + Update copyright notices in Olena. + + * doc/Doxyfile.in, + * doc/mainpage.dox: + Here. + 2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> Pacify Clang w.r.t. unknown compiler flags. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index c77557d..befdce3 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,5 +1,5 @@ -# Copyright (C) 2011, 2012, 2013 EPITA Research and Development Laboratory -# (LRDE) +# Copyright (C) 2011, 2012, 2013, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 52f9c1e..032a081 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -58,6 +58,23 @@ </center> - */ + \section copyright Copyright and License. + + Copyright (C) 2011, 2012, 2013, 2014 EPITA Research and Development + (LRDE). + + This documentation is part of Olena. + Olena is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, version 2 of the License. + + Olena is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Olena. If not, see <http://www.gnu.org/licenses/>. + */ -- 1.7.10.4

1 0

olena: branch master updated: olena-2.0-949-g57da1e9
by git＠lrde.epita.fr 03 Jul '14

03 Jul '14

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 master has been updated via 57da1e99c69a221ade8fa03618c375f9c1911fe9 (commit) via da8c21e754112ae065f55afc9b5c984f5c2a9f1e (commit) via a1301988f345ac246f6c6b8ed093199a98660ed5 (commit) via 66af424442dfb14899b5c79dbb32e0c292868185 (commit) via fde7fd80907e6f2a96405a5fe2a06ec28a3ae530 (commit) via d9a99008a427830e698bacad581d5a700893e88a (commit) via fb1480141c217ec5ada4ef49ad744bdffd1c23f7 (commit) from 3157bd264fa50b842046b688faba75b8797bab02 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: .gitignore | 30 ++++++++++++++++++++ ChangeLog | 17 +++++++++++ build-aux/.gitignore | 21 -------------- configure.ac | 8 +++--- doc/.gitignore | 9 ------ m4/.gitignore | 5 ---- milena/ChangeLog | 12 ++++++++ milena/doc/ref-guide.tex | 8 +++--- milena/tests/io/pdf/load.cc | 26 +++++++++++++++-- old/README | 2 ++ {milena => old}/doc/oldies/2006__tour_1.txt | 0 {milena => old}/doc/oldies/2006__tour_2.txt | 0 {milena => old}/doc/oldies/2007__tour.cc | 0 {milena => old}/doc/oldies/2008__tour1.cc | 0 {milena => old}/doc/oldies/2008__tour1_extra.cc | 0 {milena => old}/doc/oldies/2008__tour2.cc | 0 {milena => old}/doc/oldies/2008__tour3.cc | 0 .../technical.old/designs/properties/values.txt | 0 .../technical.old/designs/site_psite_piter/README | 0 {milena/doc => old}/tutorial.old/design/Makefile | 0 {milena/doc => old}/tutorial.old/design/design.tex | 0 .../tutorial.old/design/include/imagetours.tex | 0 .../tutorial.old/design/include/properties.tex | 0 .../doc => old}/tutorial.old/doxyfile_tuto.local | 0 {milena/doc => old}/tutorial.old/image_types.txt | 0 {milena/doc => old}/tutorial.old/image_values.txt | 0 {milena/doc => old}/tutorial.old/images_tour.txt | 0 {milena/doc => old}/tutorial.old/slides.tex | 0 scribo/ChangeLog | 18 ++++++++++++ scribo/scribo/debug/logger.hh | 5 ++++ scribo/scribo/filter/objects_thick.hh | 6 ++-- scribo/scribo/primitive/extract/cells.hh | 6 ++-- scribo/scribo/primitive/extract/lines_h_single.hh | 6 ++-- scribo/scribo/primitive/extract/lines_v_single.hh | 6 ++-- scribo/src/primitive/group/group_from_rag.cc | 4 +-- 35 files changed, 130 insertions(+), 59 deletions(-) delete mode 100644 build-aux/.gitignore delete mode 100644 doc/.gitignore delete mode 100644 m4/.gitignore create mode 100644 old/README rename {milena => old}/doc/oldies/2006__tour_1.txt (100%) rename {milena => old}/doc/oldies/2006__tour_2.txt (100%) rename {milena => old}/doc/oldies/2007__tour.cc (100%) rename {milena => old}/doc/oldies/2008__tour1.cc (100%) rename {milena => old}/doc/oldies/2008__tour1_extra.cc (100%) rename {milena => old}/doc/oldies/2008__tour2.cc (100%) rename {milena => old}/doc/oldies/2008__tour3.cc (100%) rename {milena/doc => old}/technical.old/designs/properties/values.txt (100%) rename {milena/doc => old}/technical.old/designs/site_psite_piter/README (100%) rename {milena/doc => old}/tutorial.old/design/Makefile (100%) rename {milena/doc => old}/tutorial.old/design/design.tex (100%) rename {milena/doc => old}/tutorial.old/design/include/imagetours.tex (100%) rename {milena/doc => old}/tutorial.old/design/include/properties.tex (100%) rename {milena/doc => old}/tutorial.old/doxyfile_tuto.local (100%) rename {milena/doc => old}/tutorial.old/image_types.txt (100%) rename {milena/doc => old}/tutorial.old/image_values.txt (100%) rename {milena/doc => old}/tutorial.old/images_tour.txt (100%) rename {milena/doc => old}/tutorial.old/slides.tex (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-949-g57da1e9
by git＠lrde.epita.fr 03 Jul '14

03 Jul '14

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 has been updated via 57da1e99c69a221ade8fa03618c375f9c1911fe9 (commit) via da8c21e754112ae065f55afc9b5c984f5c2a9f1e (commit) from a1301988f345ac246f6c6b8ed093199a98660ed5 (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 ----------------------------------------------------------------- 57da1e9 Remove mentions to `oldies' in the Milena reference guide. da8c21e Move old documentation files to old/doc. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 6 ++++++ milena/doc/ref-guide.tex | 8 ++++---- old/README | 2 ++ {milena => old}/doc/oldies/2006__tour_1.txt | 0 {milena => old}/doc/oldies/2006__tour_2.txt | 0 {milena => old}/doc/oldies/2007__tour.cc | 0 {milena => old}/doc/oldies/2008__tour1.cc | 0 {milena => old}/doc/oldies/2008__tour1_extra.cc | 0 {milena => old}/doc/oldies/2008__tour2.cc | 0 {milena => old}/doc/oldies/2008__tour3.cc | 0 .../doc => old}/technical.old/designs/properties/values.txt | 0 .../doc => old}/technical.old/designs/site_psite_piter/README | 0 {milena/doc => old}/tutorial.old/design/Makefile | 0 {milena/doc => old}/tutorial.old/design/design.tex | 0 {milena/doc => old}/tutorial.old/design/include/imagetours.tex | 0 {milena/doc => old}/tutorial.old/design/include/properties.tex | 0 {milena/doc => old}/tutorial.old/doxyfile_tuto.local | 0 {milena/doc => old}/tutorial.old/image_types.txt | 0 {milena/doc => old}/tutorial.old/image_values.txt | 0 {milena/doc => old}/tutorial.old/images_tour.txt | 0 {milena/doc => old}/tutorial.old/slides.tex | 0 21 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 old/README rename {milena => old}/doc/oldies/2006__tour_1.txt (100%) rename {milena => old}/doc/oldies/2006__tour_2.txt (100%) rename {milena => old}/doc/oldies/2007__tour.cc (100%) rename {milena => old}/doc/oldies/2008__tour1.cc (100%) rename {milena => old}/doc/oldies/2008__tour1_extra.cc (100%) rename {milena => old}/doc/oldies/2008__tour2.cc (100%) rename {milena => old}/doc/oldies/2008__tour3.cc (100%) rename {milena/doc => old}/technical.old/designs/properties/values.txt (100%) rename {milena/doc => old}/technical.old/designs/site_psite_piter/README (100%) rename {milena/doc => old}/tutorial.old/design/Makefile (100%) rename {milena/doc => old}/tutorial.old/design/design.tex (100%) rename {milena/doc => old}/tutorial.old/design/include/imagetours.tex (100%) rename {milena/doc => old}/tutorial.old/design/include/properties.tex (100%) rename {milena/doc => old}/tutorial.old/doxyfile_tuto.local (100%) rename {milena/doc => old}/tutorial.old/image_types.txt (100%) rename {milena/doc => old}/tutorial.old/image_values.txt (100%) rename {milena/doc => old}/tutorial.old/images_tour.txt (100%) rename {milena/doc => old}/tutorial.old/slides.tex (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-947-ga130198
by git＠lrde.epita.fr 03 Jul '14

03 Jul '14

1 0

olena: olena-2.0-947-ga130198 Address more compiler warnings in Scribo.
by Roland Levillain 03 Jul '14

03 Jul '14

* scribo/debug/logger.hh (scribo::debug::internal::logger_::log_image) [!SCRIBO_NDEBUG]: Avoid warnings about unused arguments in non-debug mode. * scribo/filter/objects_thick.hh (scribo::filter::objects_thick) * scribo/primitive/extract/cells.hh (scribo::primitive::extract::cells) * scribo/primitive/extract/lines_h_single.hh (scribo::primitive::extract::lines_h_single) * scribo/primitive/extract/lines_v_single.hh (scribo::primitive::extract::lines_v_single) * src/primitive/group/group_from_rag.cc (scribo::filter::graph_edges): Avoid warnings about unused arguments. --- scribo/ChangeLog | 18 ++++++++++++++++++ scribo/scribo/debug/logger.hh | 5 +++++ scribo/scribo/filter/objects_thick.hh | 6 +++--- scribo/scribo/primitive/extract/cells.hh | 6 +++--- scribo/scribo/primitive/extract/lines_h_single.hh | 6 +++--- scribo/scribo/primitive/extract/lines_v_single.hh | 6 +++--- scribo/src/primitive/group/group_from_rag.cc | 4 ++-- 7 files changed, 37 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 033dce2..d9609a5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,21 @@ +2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + + Address more compiler warnings in Scribo. + + * scribo/debug/logger.hh + (scribo::debug::internal::logger_::log_image) [!SCRIBO_NDEBUG]: + Avoid warnings about unused arguments in non-debug mode. + * scribo/filter/objects_thick.hh (scribo::filter::objects_thick) + * scribo/primitive/extract/cells.hh + (scribo::primitive::extract::cells) + * scribo/primitive/extract/lines_h_single.hh + (scribo::primitive::extract::lines_h_single) + * scribo/primitive/extract/lines_v_single.hh + (scribo::primitive::extract::lines_v_single) + * src/primitive/group/group_from_rag.cc + (scribo::filter::graph_edges): + Avoid warnings about unused arguments. + 2014-07-02 Roland Levillain <roland(a)lrde.epita.fr> Update Scribo's NEWS file. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 25e5ade..e82c282 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -398,6 +398,11 @@ namespace scribo logger_::log_image(Level dbg_level, const Image& ima, const char *name) { + // Avoid warnings about unused arguments in non-debug mode. + (void) dbg_level; + (void) ima; + (void) name; + # ifndef SCRIBO_NDEBUG if (level_ < dbg_level) return; diff --git a/scribo/scribo/filter/objects_thick.hh b/scribo/scribo/filter/objects_thick.hh index c3e238c..45f8bc0 100644 --- a/scribo/scribo/filter/objects_thick.hh +++ b/scribo/scribo/filter/objects_thick.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -137,7 +137,7 @@ namespace scribo mln_concrete(I) objects_thick(const Image& input_, const Neighborhood<N>& nbh_, - const V& label_type, + const V& /* label_type */, unsigned max_thickness) { mln_trace("scribo::filter::objects_thick"); diff --git a/scribo/scribo/primitive/extract/cells.hh b/scribo/scribo/primitive/extract/cells.hh index beca189..d878a67 100644 --- a/scribo/scribo/primitive/extract/cells.hh +++ b/scribo/scribo/primitive/extract/cells.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -84,7 +84,7 @@ namespace scribo mln::util::couple<mln::util::array<box<mln_site(I)> >, mln::util::array<box<mln_site(I)> > > cells(const Image& input_, - const Neighborhood<N>& nbh_, const V& label_type) + const Neighborhood<N>& nbh_, const V& /* label_type */) { mln_trace("scribo::primitive::cells"); diff --git a/scribo/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh index ab262ab..6e93b4e 100644 --- a/scribo/scribo/primitive/extract/lines_h_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_single.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -146,7 +146,7 @@ namespace scribo template <typename I, typename N, typename V> component_set<mln_ch_value(I,V)> lines_h_single(const Image& input_, - const Neighborhood<N>& nbh_, const V& nlines, + const Neighborhood<N>& nbh_, const V& /* nlines */, unsigned min_line_length, float w_h_ratio) { diff --git a/scribo/scribo/primitive/extract/lines_v_single.hh b/scribo/scribo/primitive/extract/lines_v_single.hh index c2ab1ca..321e880 100644 --- a/scribo/scribo/primitive/extract/lines_v_single.hh +++ b/scribo/scribo/primitive/extract/lines_v_single.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -143,7 +143,7 @@ namespace scribo template <typename I, typename N, typename V> component_set<mln_ch_value(I,V)> lines_v_single(const Image& input_, - const Neighborhood<N>& nbh_, const V& nlines, + const Neighborhood<N>& nbh_, const V& /* nlines */, unsigned min_line_length, float h_w_ratio) { diff --git a/scribo/src/primitive/group/group_from_rag.cc b/scribo/src/primitive/group/group_from_rag.cc index 86ea1b1..4064fc8 100644 --- a/scribo/src/primitive/group/group_from_rag.cc +++ b/scribo/src/primitive/group/group_from_rag.cc @@ -139,8 +139,8 @@ namespace scribo template <typename P, typename V, typename G, typename F, typename FP> edge_image<void,bool,G> graph_edges(const vertex_image<P,V,G>& v_ima, - const Function<F>& edge_values, - const Function<FP>& predicate) + const Function<F>& /* edge_values */, + const Function<FP>& /* predicate */) { typedef edge_image<void,bool,util::graph> e_filter_t; e_filter_t e_filter = mln::make::edge_image(v_ima, dist()); -- 1.7.10.4

1 0

olena: olena-2.0-946-g66af424 Pacify Clang w.r.t. unknown compiler flags.
by Roland Levillain 03 Jul '14

03 Jul '14

* configure.ac: Do not add `-Wno-unused-local-typedefs' to WARNINGS_CXXFLAGS if it is accepted by the compiler but produces a warning. --- ChangeLog | 8 ++++++++ configure.ac | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d6c1a1..7363fa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + Pacify Clang w.r.t. unknown compiler flags. + + * configure.ac: Do not add `-Wno-unused-local-typedefs' to + WARNINGS_CXXFLAGS if it is accepted by the compiler but produces a + warning. + +2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + Help configure find Poppler on OS X with the MacPorts. * configure.ac: Use OLN_WITH_LIB instead of diff --git a/configure.ac b/configure.ac index d6b4128..bd9e2c6 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,8 @@ esac # concept checking means in Milena (`-Wunused-local-typedefs' is # enabled by `-Wall' in GCC since version 4.8). AX_CHECK_COMPILE_FLAG([-Wno-unused-local-typedefs], - [WARNINGS_CXXFLAGS="$WARNINGS_CXXFLAGS -Wno-unused-local-typedefs"]) + [WARNINGS_CXXFLAGS="$WARNINGS_CXXFLAGS -Wno-unused-local-typedefs"], [:], + [-Werror]) # ------------------------------ # -- 1.7.10.4

1 0

olena: olena-2.0-945-gfde7fd8 Disable some tests depending on Poppler for compatibility reasons.
by Roland Levillain 03 Jul '14

03 Jul '14

* tests/io/pdf/load.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/io/pdf/load.cc | 26 ++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index be1ca39..2480741 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + + Disable some tests depending on Poppler for compatibility reasons. + + * tests/io/pdf/load.cc: Here. + 2014-07-02 Roland Levillain <roland(a)lrde.epita.fr> Add a NEWS file to Milena. diff --git a/milena/tests/io/pdf/load.cc b/milena/tests/io/pdf/load.cc index c517784..2ae9220 100644 --- a/milena/tests/io/pdf/load.cc +++ b/milena/tests/io/pdf/load.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,23 +23,30 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +// Exercise mln::io::pdf::load. + #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/load.hh> #include <mln/io/pdf/load.hh> + #include "tests/data.hh" + int main() { using namespace mln; + // FIXME: Disabled (see below). +#if 0 image2d<value::rgb8> page0, page1, page2, page3; io::ppm::load(page0, MLN_TESTS_IMG_DIR "/example-0.ppm"); io::ppm::load(page1, MLN_TESTS_IMG_DIR "/example-1.ppm"); io::ppm::load(page2, MLN_TESTS_IMG_DIR "/example-2.ppm"); io::ppm::load(page3, MLN_TESTS_IMG_DIR "/example-3.ppm"); +#endif // Loading full PDF. { @@ -47,20 +54,29 @@ int main() io::pdf::load(arr, MLN_TESTS_IMG_DIR "/example.pdf", 75); mln_assertion(arr.size() == 4); + /* FIXME: Disabled, as various versions/installations of poppler + produce slightly different images (namely, version 0.18.4 on + Debian GNU/Linux 7.5 and version 0.24.5 from the MacPorts). This + might be caused by different font configurations, too. */ +#if 0 mln_assertion(arr[0] == page0); mln_assertion(arr[1] == page1); mln_assertion(arr[2] == page2); mln_assertion(arr[3] == page3); +#endif } - // Loading a page range + // Loading a page range. { util::array<image2d<value::rgb8> > arr; io::pdf::load(arr, MLN_TESTS_IMG_DIR "/example.pdf", 1, 2, 75); mln_assertion(arr.size() == 2); + // FIXME: Disabled (see above). +#if 0 mln_assertion(arr[0] == page1); mln_assertion(arr[1] == page2); +#endif } // Loading specific pages. @@ -72,8 +88,11 @@ int main() io::pdf::load(arr, MLN_TESTS_IMG_DIR "/example.pdf", pages, 75); mln_assertion(arr.size() == 2); + // FIXME: Disabled (see above). +#if 0 mln_assertion(arr[0] == page1); mln_assertion(arr[1] == page3); +#endif } // Loading a specific page. @@ -82,7 +101,10 @@ int main() io::pdf::load(ima, MLN_TESTS_IMG_DIR "/example.pdf", 3, 75); mln_assertion(ima.is_valid()); + // FIXME: Disabled (see above). +#if 0 mln_assertion(ima == page3); +#endif } } -- 1.7.10.4

1 0

olena: olena-2.0-944-gd9a9900 Help configure find Poppler on OS X with the MacPorts.
by Roland Levillain 03 Jul '14

03 Jul '14

* configure.ac: Use OLN_WITH_LIB instead of OLN_WITH_LIB_PKG_CONFIG to find the `poppler-cpp' package, as the latter incorrectly sets compile and link flags on OS X when using the MacPorts. --- ChangeLog | 9 +++++++++ configure.ac | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22b9db4..0d6c1a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + + Help configure find Poppler on OS X with the MacPorts. + + * configure.ac: Use OLN_WITH_LIB instead of + OLN_WITH_LIB_PKG_CONFIG to find the `poppler-cpp' package, as the + latter incorrectly sets compile and link flags on OS X when using + the MacPorts. + 2014-07-02 Roland Levillain <roland(a)lrde.epita.fr> Update Olena's NEWS file. diff --git a/configure.ac b/configure.ac index f007fe0..d6b4128 100644 --- a/configure.ac +++ b/configure.ac @@ -306,9 +306,8 @@ OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) # Poppler library. # # ----------------- # -OLN_WITH_LIB_PKG_CONFIG([poppler-cpp], [poppler/cpp/poppler-version.h], [poppler-cpp], - [poppler], [POPPLER]) - +OLN_WITH_LIB([poppler-cpp], [poppler/cpp/poppler-version.h], [poppler-cpp], + [poppler], [POPPLER]) # --------------------------------- # # GDCM library (Grassroots DiCom). # -- 1.7.10.4

1 0

olena: olena-2.0-943-gfb14801 Simplify .gitignore files.
by Roland Levillain 03 Jul '14

03 Jul '14

--- .gitignore | 30 ++++++++++++++++++++++++++++++ build-aux/.gitignore | 21 --------------------- doc/.gitignore | 9 --------- m4/.gitignore | 5 ----- 4 files changed, 30 insertions(+), 35 deletions(-) delete mode 100644 build-aux/.gitignore delete mode 100644 doc/.gitignore delete mode 100644 m4/.gitignore diff --git a/.gitignore b/.gitignore index 82de41e..4777b21 100644 --- a/.gitignore +++ b/.gitignore @@ -38,8 +38,38 @@ Makefile.in /libtool /stamp-h1 +/build-aux/ar-lib +/build-aux/config.guess +/build-aux/config.sub +/build-aux/depcomp +/build-aux/diffs.patch +/build-aux/*.elc +/build-aux/elisp-comp +/build-aux/install-sh +/build-aux/*.log +/build-aux/ltmain.sh +/build-aux/*Makefile +/build-aux/*Makefile?in +/build-aux/mdate-sh +/build-aux/missing +/build-aux/*.patch +/build-aux/patches* +/build-aux/py-compile +/build-aux/*.rej +/build-aux/*TAGS +/build-aux/test-driver +/build-aux/texinfo.tex + +/doc/Doxyfile_user /doc/contributors.html /doc/lrde_olena.bib /doc/lrde_olena.cite /doc/lrde_olena.html /doc/lrde_olena_bib.html +/doc/user-refman + +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 diff --git a/build-aux/.gitignore b/build-aux/.gitignore deleted file mode 100644 index 14ddc68..0000000 --- a/build-aux/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -/ar-lib -/config.guess -/config.sub -/depcomp -/diffs.patch -/*.elc -/elisp-comp -/install-sh -/*.log -/ltmain.sh -/*Makefile -/*Makefile?in -/mdate-sh -/missing -/*.patch -/patches* -/py-compile -/*.rej -/*TAGS -/test-driver -/texinfo.tex diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 9b600ce..0000000 --- a/doc/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/Doxyfile_user -/user-refman -/user-refman.pdf - -/Doxyfile_devel -/devel-refman -/devel-refman.pdf - -/figures/*.png diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 94e6f26..0000000 --- a/m4/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/libtool.m4 -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 -- 1.7.10.4

1 0

olena: olena-2.0-949-g57da1e9 Remove mentions to `oldies' in the Milena reference guide.
by Roland Levillain 03 Jul '14

03 Jul '14

* doc/ref-guide.tex: Here. --- milena/ChangeLog | 6 ++++++ milena/doc/ref-guide.tex | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2480741..02fc285 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to `oldies' in the Milena reference guide. + + * doc/ref-guide.tex: Here. + +2014-07-03 Roland Levillain <roland(a)lrde.epita.fr> + Disable some tests depending on Poppler for compatibility reasons. * tests/io/pdf/load.cc: Here. diff --git a/milena/doc/ref-guide.tex b/milena/doc/ref-guide.tex index b26929a..8b07ed4 100644 --- a/milena/doc/ref-guide.tex +++ b/milena/doc/ref-guide.tex @@ -1,5 +1,5 @@ -%% Copyright (C) 2009, 2011 EPITA Research and Development Laboratory -%% (LRDE) +%% Copyright (C) 2009, 2011, 2013, 2014 EPITA Research and Development +%% Laboratory (LRDE). %% %% This file is part of Olena. %% @@ -82,7 +82,8 @@ %==================================== \chapter*{Copyright} -Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +Copyright (C) 2009, 2011, 2013, 2014 EPITA Research and Development +Laboratory (LRDE). This document is part of Olena. @@ -227,7 +228,6 @@ Olena's tarball is structured as follow: \begin{itemize} \item benchmark: set of benchmark. \item examples: more examples. - \item oldies: partialy not updated documentation. Not recommended for new users. \item technical: technical doc. \item tutorial: code sample and tutorial. \end{itemize} -- 1.7.10.4

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches July 2014