Olena-patches February 2012

olena-patches@lrde.epita.fr

3 participants
78 discussions

olena-2.0-89-g498e1f3 Revamp documentation directory structure.

by Guillaume Lazzara

* doc/groups/accu.dox, * doc/groups/graph.dox, * doc/groups/images.dox, * doc/groups/main.dox, * doc/groups/neighb.dox, * doc/groups/site_set.dox, * doc/groups/util.dox, * doc/groups/win.dox: Move... * doc/mln/accu/accu.dox, * doc/mln/core/image/images.dox, * doc/mln/core/neighb.dox, * doc/mln/core/site_set/site_set.dox, * doc/mln/main.dox, * doc/mln/util/graph.dox, * doc/mln/util/util.dox, * doc/mln/win/win.dox: ... Here. --- milena/ChangeLog | 22 ++++++++++++++++++++ milena/doc/{groups => mln/accu}/accu.dox | 0 milena/doc/{groups => mln/core/image}/images.dox | 0 milena/doc/{groups => mln/core}/neighb.dox | 0 .../doc/{groups => mln/core/site_set}/site_set.dox | 0 milena/doc/{groups => mln}/main.dox | 0 milena/doc/{groups => mln/util}/graph.dox | 0 milena/doc/{groups => mln/util}/util.dox | 0 milena/doc/{groups => mln/win}/win.dox | 0 9 files changed, 22 insertions(+), 0 deletions(-) rename milena/doc/{groups => mln/accu}/accu.dox (100%) rename milena/doc/{groups => mln/core/image}/images.dox (100%) rename milena/doc/{groups => mln/core}/neighb.dox (100%) rename milena/doc/{groups => mln/core/site_set}/site_set.dox (100%) rename milena/doc/{groups => mln}/main.dox (100%) rename milena/doc/{groups => mln/util}/graph.dox (100%) rename milena/doc/{groups => mln/util}/util.dox (100%) rename milena/doc/{groups => mln/win}/win.dox (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 74830a4..0551275 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Revamp documentation directory structure. + + * doc/groups/accu.dox, + * doc/groups/graph.dox, + * doc/groups/images.dox, + * doc/groups/main.dox, + * doc/groups/neighb.dox, + * doc/groups/site_set.dox, + * doc/groups/util.dox, + * doc/groups/win.dox: Move... + + * doc/mln/accu/accu.dox, + * doc/mln/core/image/images.dox, + * doc/mln/core/neighb.dox, + * doc/mln/core/site_set/site_set.dox, + * doc/mln/main.dox, + * doc/mln/util/graph.dox, + * doc/mln/util/util.dox, + * doc/mln/win/win.dox: ... Here. + +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix path to data. * doc/Doxyfile.in, diff --git a/milena/doc/groups/accu.dox b/milena/doc/mln/accu/accu.dox similarity index 100% rename from milena/doc/groups/accu.dox rename to milena/doc/mln/accu/accu.dox diff --git a/milena/doc/groups/images.dox b/milena/doc/mln/core/image/images.dox similarity index 100% rename from milena/doc/groups/images.dox rename to milena/doc/mln/core/image/images.dox diff --git a/milena/doc/groups/neighb.dox b/milena/doc/mln/core/neighb.dox similarity index 100% rename from milena/doc/groups/neighb.dox rename to milena/doc/mln/core/neighb.dox diff --git a/milena/doc/groups/site_set.dox b/milena/doc/mln/core/site_set/site_set.dox similarity index 100% rename from milena/doc/groups/site_set.dox rename to milena/doc/mln/core/site_set/site_set.dox diff --git a/milena/doc/groups/main.dox b/milena/doc/mln/main.dox similarity index 100% rename from milena/doc/groups/main.dox rename to milena/doc/mln/main.dox diff --git a/milena/doc/groups/graph.dox b/milena/doc/mln/util/graph.dox similarity index 100% rename from milena/doc/groups/graph.dox rename to milena/doc/mln/util/graph.dox diff --git a/milena/doc/groups/util.dox b/milena/doc/mln/util/util.dox similarity index 100% rename from milena/doc/groups/util.dox rename to milena/doc/mln/util/util.dox diff --git a/milena/doc/groups/win.dox b/milena/doc/mln/win/win.dox similarity index 100% rename from milena/doc/groups/win.dox rename to milena/doc/mln/win/win.dox -- 1.7.2.5

12 years, 2 months

olena-2.0-84-ga11e843 doc/Makefile.am: Add more missing files in EXTRA_DIST.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ doc/Makefile.am | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f27ac5..271da13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add more missing files in EXTRA_DIST. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Add missing files in EXTRA_DIST. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8da072b..1b5835a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -57,6 +57,7 @@ REFMAN_IMAGES = \ $(srcdir)/images/logo.jpg EXTRA_DIST = \ + $(DOXYFILE).in \ $(REFMAN_IMAGES) \ $(srcdir)/images/olena_layers.svg @@ -79,7 +80,6 @@ REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/get_sources.dox \ $(srcdir)/subdoc_footer.html \ contributors.html \ - lrde_olena.html \ $(REFMAN_IMAGES) EXTRA_DIST += $(REFMAN_deps) @@ -162,6 +162,13 @@ lrde_olena.html: lrde_olena.bib -noabstract -nofooter -labelname -nodoc -linebreak -nf urllrde PDF lrde_olena.bib +EXTRA_DIST += \ + lrde_olena.cite \ + lrde_olena.html \ + lrde_olena.html \ + lrde_olena.bib \ + lrde_olena_bib.html + MAINTAINERCLEANFILES += lrde_olena.cite \ lrde_olena.bib \ lrde_olena_bib.html \ -- 1.7.2.5

12 years, 2 months

olena-2.0-83-g5f172d8 Change path to .bib files.

by Guillaume Lazzara

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 4 ++-- scribo/doc/Makefile.am | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9b2c772..e1d6df4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Change path to .bib files. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 1986828..bd28b0f 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -124,8 +124,8 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 -CITE_BIB_FILES = @top_srcdir@/doc/doc \ - @top_srcdir@/doc/olena +CITE_BIB_FILES = @abs_srcdir@/doc/doc \ + @abs_srcdir@/doc/olena LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- # configuration options related to source browsing diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 3963182..bef0fa5 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -63,6 +63,7 @@ edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' \ + -e 's,@abs_srcdir\@,$(abs_srcdir),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@srcdir\@,$(srcdir),g' \ -e 's,@builddir\@,$(builddir),g' -- 1.7.2.5

12 years, 2 months

olena-2.0-82-gea3eefc doc/Makefile.am: Add missing files in EXTRA_DIST.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ff3c35..1f27ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add missing files in EXTRA_DIST. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Fix dependencies in Makefiles. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a45e4e..8da072b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -82,7 +82,7 @@ REFMAN_deps = $(srcdir)/footer.html \ lrde_olena.html \ $(REFMAN_IMAGES) - +EXTRA_DIST += $(REFMAN_deps) # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. -- 1.7.2.5

12 years, 2 months

olena-2.0-81-g6f2cda0 tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid filename.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/tests/binarization/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f272efe..9b2c772 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid + filename. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix deprecated dist files. diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index a2962bb..bab3e35 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ - niblack.res.pbm \ + niblack.ref.pbm \ sauvola_ms.ref.pbm \ sauvola.ref.pbm \ otsu.ref.pbm -- 1.7.2.5

12 years, 2 months

olena-2.0-80-g125c7e3 doc/Makefile.am: Fix deprecated dist files.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d44e98b..f272efe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Fix deprecated dist files. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Improve Scribo documentation. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 6469ab9..3963182 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -195,9 +195,6 @@ EXTRA_DIST += \ $(DOXYFILE).in \ doxyfuns.sty \ scribo.sty \ - tools/clearbanner.sh \ - tools/sample_utils.hh \ - tools/split_sample.sh \ tools/todoxygen.sh -- 1.7.2.5

12 years, 2 months

olena-2.0-79-gaa02dac Fix doxygen warnings.

by Guillaume Lazzara

* mln/accu/compute.hh, * mln/convert/to_p_set.hh, * mln/data/compute.hh, * mln/debug/filename.hh, * mln/labeling/blobs.hh, * mln/morpho/tree/filter/all.hh: Here. --- milena/ChangeLog | 11 +++++++++++ milena/mln/accu/compute.hh | 4 ++-- milena/mln/convert/to_p_set.hh | 2 +- milena/mln/data/compute.hh | 12 +++++++----- milena/mln/debug/filename.hh | 4 ++-- milena/mln/labeling/blobs.hh | 10 +++++----- milena/mln/morpho/tree/filter/all.hh | 5 +++-- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 30bf771..a2d5f9e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix doxygen warnings. + + * mln/accu/compute.hh, + * mln/convert/to_p_set.hh, + * mln/data/compute.hh, + * mln/debug/filename.hh, + * mln/labeling/blobs.hh, + * mln/morpho/tree/filter/all.hh: Here. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Update generated .mk files. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 9c0e6b1..bf513f9 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -46,8 +46,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a An accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); @@ -62,8 +62,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a A meta accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); diff --git a/milena/mln/convert/to_p_set.hh b/milena/mln/convert/to_p_set.hh index 3f5f8c4..46cd5e7 100644 --- a/milena/mln/convert/to_p_set.hh +++ b/milena/mln/convert/to_p_set.hh @@ -69,7 +69,7 @@ namespace mln p_set<P> to_p_set(const std::set<P, C>& s); - /// Convert any site set \p ps into a 'mln::p_set' site set. + /// Convert any site set \p ps into a 'mln::p_set<>' site set. template <typename S> p_set<mln_psite(S)> to_p_set(const Site_Set<S>& ps); diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 0ab146e..6fe4925 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -42,9 +42,9 @@ namespace mln namespace data { - /// Compute an accumulator onto the pixel values of the image \p input. - /// Be ware that the given accumulator won't be modified and won't - /// store any result. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. Be ware that the given accumulator won't be + /// modified and won't store any result. /// /// \param[in] a An accumulator. /// \param[in] input The input image. @@ -57,7 +57,8 @@ namespace mln compute(const Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in, out] a An accumulator. /// \param[in] input The input image. @@ -70,7 +71,8 @@ namespace mln compute(Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in] a A meta-accumulator. /// \param[in] input The input image. diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index 1fc268b..954e516 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -50,9 +50,9 @@ namespace mln ** ** Where: ** - `filename_prefix` can be set through the global variable - ** debug::internal::filename_prefix. + ** debug::internal::filename_prefix. ** - `postfix_id` is autoincremented by default. Its value can be - forced. + forced. ** - `filename` is the given filename */ std::string diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index 12462c8..ce06b7d 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -48,11 +48,11 @@ namespace mln namespace labeling { - /// Connected component labeling of the binary objects of a binary - /// image. + /// \brief Connected component labeling of the binary objects of a + /// binary image. /// - /// \param[in] input The input image. - /// \param[in] nbh The connexity of the objects. + /// \param[in] input The input image. + /// \param[in] nbh The connexity of the objects. /// \param[out] nlabels The Number of labels. Its value is set in the /// algorithms. /// \return The label image. @@ -61,7 +61,7 @@ namespace mln /// /// A fast queue is used so that the algorithm is not recursive and /// can handle large binary objects (blobs). - /// + // template <typename I, typename N, typename L> mln_ch_value(I, L) blobs(const Image<I>& input, const Neighborhood<N>& nbh, diff --git a/milena/mln/morpho/tree/filter/all.hh b/milena/mln/morpho/tree/filter/all.hh index 1271b06..97b0e92 100644 --- a/milena/mln/morpho/tree/filter/all.hh +++ b/milena/mln/morpho/tree/filter/all.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. // @@ -27,7 +28,7 @@ # define MLN_MORPHO_TREE_FILTER_ALL_HH /** -** \file mln/morpho/tree/filter.hh +** \file ** ** Methods to handle component tree filtering strategies with ** non-increasing attribute. Nevertheless, it works on increasing -- 1.7.2.5

12 years, 2 months

olena-2.0-78-gf4ec946 Update generated .mk files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 31ffb7c..30bf771 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Update generated .mk files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new figure on the main page. * doc/img/genericity.png, diff --git a/milena/headers.mk b/milena/headers.mk index db0c05f..1b7af21 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -33,6 +33,7 @@ mln/accu/math/all.hh \ mln/accu/math/count.hh \ mln/accu/math/essential.hh \ mln/accu/math/sum.hh \ +mln/accu/math/sumpow.hh \ mln/accu/max_site.hh \ mln/accu/nil.hh \ mln/accu/p.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 3a14188..ab8af7c 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -125,6 +125,7 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_inf \ mln_accu_math_sum \ +mln_accu_math_sumpow \ mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ @@ -1455,6 +1456,7 @@ mln_accu_math_count_SOURCES = mln_accu_math_count.cc mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc mln_accu_math_inf_SOURCES = mln_accu_math_inf.cc mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc +mln_accu_math_sumpow_SOURCES = mln_accu_math_sumpow.cc mln_accu_math_sup_SOURCES = mln_accu_math_sup.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc mln_accu_nil_SOURCES = mln_accu_nil.cc -- 1.7.2.5

12 years, 2 months

olena-2.0-77-g149c03d Fix dependencies in Makefiles.

by Guillaume Lazzara

* Makefile.am, * doc/Makefile.am: Here. --- ChangeLog | 7 +++++++ Makefile.am | 11 ++++++++--- doc/Makefile.am | 25 +++++++++++++++---------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index c30b9ff..1ff3c35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix dependencies in Makefiles. + + * Makefile.am, + * doc/Makefile.am: Here. + +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Path to Olena logo. * doc/logo.jpg: Move... diff --git a/Makefile.am b/Makefile.am index 677a9c3..ef6090a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = build-aux doc external milena +SUBDIRS = build-aux external milena if ENABLE_SWILENA SUBDIRS += swilena @@ -27,6 +27,11 @@ if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO +# We rely on Automake to ensure that the documentions are generated in +# the right order. Here, we make sure that the general documentation +# will be generated after milena's and scribo'd documentation. +SUBDIRS += doc + # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = pretty-check tests $(LOCAL_RECURSIVE_TARGETS): diff --git a/doc/Makefile.am b/doc/Makefile.am index 099b497..8a45e4e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -35,9 +35,6 @@ TEXI2DVI_FLAGS += \ -I $(srcdir) -I $(srcdir)/outputs -I $(srcdir)/outputs/split \ -I $(srcdir)/img -I $(srcdir)/examples/split -# Additional files for LaTeX compilations. -DOC_PACKAGES = doxyfuns.sty milena.sty - # ----------------------- # # User Reference Manual. # @@ -55,27 +52,38 @@ DOXYFILE_USER = Doxyfile_user # Images -REFMAN_IMAGES = $(srcdir)/images/olena_layers.png -EXTRA_DIST = $(REFMAN_IMAGES) +REFMAN_IMAGES = \ + $(srcdir)/images/olena_layers.png \ + $(srcdir)/images/logo.jpg + +EXTRA_DIST = \ + $(REFMAN_IMAGES) \ + $(srcdir)/images/olena_layers.svg # Documentation content REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/header.html \ $(srcdir)/doxygen.css \ $(srcdir)/mainpage.dox \ + $(srcdir)/about.dox \ $(srcdir)/DoxygenLayout.xml \ $(srcdir)/modules_list.dox \ $(srcdir)/olena.bib \ + $(srcdir)/lrde.bib \ + $(srcdir)/doc.bib \ $(srcdir)/contributors.dox \ $(srcdir)/bibliography.dox \ $(srcdir)/license.dox \ $(srcdir)/license_commercial.dox \ $(srcdir)/online_resources.dox \ $(srcdir)/get_sources.dox \ + $(srcdir)/subdoc_footer.html \ contributors.html \ lrde_olena.html \ $(REFMAN_IMAGES) + + # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. # @@ -142,13 +150,13 @@ contributors.html: $(top_srcdir)/AUTHORS ## Bibliography. ## ## -------------- ## -# Warning: also generate lrde_olena.cite +# Warning: also generates lrde_olena.cite lrde_olena.bib: bib2bib -s plain -oc lrde_olena.cite -ob lrde_olena.bib -c \ 'project = "Image" or project = "Olena"' \ -s year -r $(srcdir)/lrde.bib -# Warning: also generate lrde_olena_bib.html +# Warning: also generates lrde_olena_bib.html lrde_olena.html: lrde_olena.bib bibtex2html -s plain -nokeywords -citefile lrde_olena.cite \ -noabstract -nofooter -labelname -nodoc -linebreak -nf urllrde PDF lrde_olena.bib @@ -163,11 +171,8 @@ MAINTAINERCLEANFILES += lrde_olena.cite \ ## Cleaning. ## ## ---------- ## -MAINTAINERCLEANFILES += $(dist_pdf_DATA) - maintainer-clean-local: -rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) - -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) -for d in $(DATA_html_dirs); do \ rm -rf $$d.tmp $(srcdir)/$$d; \ done -- 1.7.2.5

12 years, 2 months

olena-2.0-76-g1106703 Fix Path to Olena logo.

by Guillaume Lazzara

* doc/logo.jpg: Move... * doc/images/logo.jpg: ... here. * doc/Doxyfile.in, * milena/doc/Doxyfile.in, * scribo/doc/Doxyfile.in: Fix path. --- ChangeLog | 11 +++++++++++ doc/Doxyfile.in | 2 +- doc/{ => images}/logo.jpg | Bin 7477 -> 7477 bytes milena/doc/Doxyfile.in | 2 +- scribo/doc/Doxyfile.in | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) rename doc/{ => images}/logo.jpg (100%) diff --git a/ChangeLog b/ChangeLog index 2c8eb1c..c30b9ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Path to Olena logo. + + * doc/logo.jpg: Move... + * doc/images/logo.jpg: ... here. + + * doc/Doxyfile.in, + * milena/doc/Doxyfile.in, + * scribo/doc/Doxyfile.in: Fix path. + +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix titles. * doc/contributors.dox, diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 777a6ac..51b712a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -22,7 +22,7 @@ PROJECT_NAME = "Olena" PROJECT_NUMBER = "@PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/logo.jpg b/doc/images/logo.jpg similarity index 100% rename from doc/logo.jpg rename to doc/images/logo.jpg diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5cbaaef..b695b77 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -23,7 +23,7 @@ PROJECT_NAME = "Milena" PROJECT_NUMBER = "@PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 4207145..1986828 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -22,7 +22,7 @@ PROJECT_NAME = "Scribo" PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English -- 1.7.2.5

12 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2012