* doc/Doxyfile.in: add doc/tutorial/img to IMAGE_PATH. * doc/doc.mk: Set the path to doc/tutorial/img in a variable. * doc/tutorial/Makefile.am: Add IMG_SRCDIR to to TEXINPUTS. * img/small-enlarged.png, * img/small.png: move... * doc/tutorial/img/small-enlarged.png, * doc/tutorial/img/small.png: ... here. * doc/tutorial/samples/accu-wrong-instanciation.cc.raw: use a different accumulator. * doc/tutorial/tools/sample_utils.hh: do not include all io headers. --- milena/ChangeLog | 20 ++++++++++++++++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/doc.mk | 2 ++ milena/doc/tutorial/Makefile.am | 2 +- milena/{ => doc/tutorial}/img/small-enlarged.png | Bin 91556 -> 91556 bytes milena/{ => doc/tutorial}/img/small.png | Bin 22653 -> 22653 bytes .../samples/accu-wrong-instanciation.cc.raw | 2 +- milena/doc/tutorial/tools/sample_utils.hh | 4 +++- 8 files changed, 28 insertions(+), 4 deletions(-) rename milena/{ => doc/tutorial}/img/small-enlarged.png (100%) rename milena/{ => doc/tutorial}/img/small.png (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e26f8d4..6f46274 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,23 @@ +2009-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Small fixes for doc generation. + + * doc/Doxyfile.in: add doc/tutorial/img to IMAGE_PATH. + + * doc/doc.mk: Set the path to doc/tutorial/img in a variable. + + * doc/tutorial/Makefile.am: Add IMG_SRCDIR to to TEXINPUTS. + + * img/small-enlarged.png, + * img/small.png: move... + * doc/tutorial/img/small-enlarged.png, + * doc/tutorial/img/small.png: ... here. + + * doc/tutorial/samples/accu-wrong-instanciation.cc.raw: use a + different accumulator. + + * doc/tutorial/tools/sample_utils.hh: do not include all io headers. + 2009-02-26 Fabien Freling &lt;fabien.freling(a)lrde.epita.fr&gt; Add int_u12 type and fix DICOM support. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index cda47dc..5d657a4 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -96,7 +96,7 @@ EXAMPLE_PATH = @top_srcdir@/milena/doc/tutorial/samples \ @top_srcdir@/milena/doc/tutorial/outputs EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = @top_srcdir@/milena/img \ +IMAGE_PATH = @top_srcdir@/milena/doc/tutorial/img \ @top_srcdir@/milena/doc/tutorial/figures \ @top_builddir@/milena/doc/tutorial/figures INPUT_FILTER = diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index b41750d..938c4c3 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -4,10 +4,12 @@ include $(top_srcdir)/milena/tests/tests.mk AM_CPPFLAGS += -I$(top_srcdir)/milena/doc/tutorial/tools + TUTORIAL_SRCDIR = $(top_srcdir)/milena/doc/tutorial OUTPUTS_SRCDIR = $(TUTORIAL_SRCDIR)/outputs FIGURES_SRCDIR = $(TUTORIAL_SRCDIR)/figures SAMPLES_SRCDIR = $(TUTORIAL_SRCDIR)/samples +IMG_SRCDIR = $(TUTORIAL_SRCDIR)/img TUTORIAL_BUILDDIR = $(top_builddir)/milena/doc/tutorial OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index ceb4534..53c9521 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = samples .PHONY: tutorial tuto_html include $(top_srcdir)/milena/doc/doc.mk -TEXINPUTS = $(TUTORIAL_SRCDIR):$(TUTORIAL_BUILDDIR):$(OUTPUTS_SRCDIR): +TEXINPUTS = $(TUTORIAL_SRCDIR):$(TUTORIAL_BUILDDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR): tutorial: data fig-convert TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex diff --git a/milena/img/small-enlarged.png b/milena/doc/tutorial/img/small-enlarged.png similarity index 100% rename from milena/img/small-enlarged.png rename to milena/doc/tutorial/img/small-enlarged.png diff --git a/milena/img/small.png b/milena/doc/tutorial/img/small.png similarity index 100% rename from milena/img/small.png rename to milena/doc/tutorial/img/small.png diff --git a/milena/doc/tutorial/samples/accu-wrong-instanciation.cc.raw b/milena/doc/tutorial/samples/accu-wrong-instanciation.cc.raw index 25e943d..895c9f4 100644 --- a/milena/doc/tutorial/samples/accu-wrong-instanciation.cc.raw +++ b/milena/doc/tutorial/samples/accu-wrong-instanciation.cc.raw @@ -1 +1 @@ -level::compute(accu::meta::bbox, ima); +level::compute(accu::meta::max, ima); diff --git a/milena/doc/tutorial/tools/sample_utils.hh b/milena/doc/tutorial/tools/sample_utils.hh index 36536ba..d819cff 100644 --- a/milena/doc/tutorial/tools/sample_utils.hh +++ b/milena/doc/tutorial/tools/sample_utils.hh @@ -29,7 +29,9 @@ # define DOC_TUTORIAL_TOOLS_SAMPLE_UTILS_HH # include <mln/core/image/image2d.hh> -# include <mln/io/all.hh> +# include <mln/io/pbm/all.hh> +# include <mln/io/pgm/all.hh> +# include <mln/io/ppm/all.hh> namespace doc { -- 1.5.6.5