- Olena-patches

last-svn-commit-13-g9ae11a0 Stop make from recurring in doc/ref_guide.
by Roland Levillain 01 Apr '10

01 Apr '10

* doc/ref_guide/Makefile.am: Rename as... * doc/ref_guide/ref_guide.mk: ...this. Adjust. * doc/doc.mk (doc_dir): New variable. * doc/Makefile.am: Include doc/ref_guide/ref_guide.mk. (SUBDIRS): Remove ref_guide. ($(srcdir)/ref_guide/ref_guide.hh): Remove target. (ref-guide-pdf, ref-guide-html): Remove (phony) targets. --- milena/ChangeLog | 13 ++++ milena/doc/Makefile.am | 29 ++++------ milena/doc/doc.mk | 10 +++- milena/doc/ref_guide/{Makefile.am => ref_guide.mk} | 61 +++++++++---------- 4 files changed, 62 insertions(+), 51 deletions(-) rename milena/doc/ref_guide/{Makefile.am => ref_guide.mk} (60%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 94663ec..ddd3c3f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -15,6 +15,19 @@ 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Stop make from recurring in doc/ref_guide. + + * doc/ref_guide/Makefile.am: Rename as... + * doc/ref_guide/ref_guide.mk: ...this. + Adjust. + * doc/doc.mk (doc_dir): New variable. + * doc/Makefile.am: Include doc/ref_guide/ref_guide.mk. + (SUBDIRS): Remove ref_guide. + ($(srcdir)/ref_guide/ref_guide.hh): Remove target. + (ref-guide-pdf, ref-guide-html): Remove (phony) targets. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Get rid of Make targets `fake-doc' and `void-doc'. * doc/Makefile.am, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d80a1c..e79129a 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -22,14 +22,16 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ examples \ - ref_guide \ technical \ tutorial \ white_paper - DOXYGEN = doxygen +# Initialiaze variables. +EXTRA_DIST = +dist_doc_DATA = +CLEANFILES = .PHONY: doc \ @@ -39,7 +41,6 @@ DOXYGEN = doxygen ref-doc-devel-pdf ref-doc-devel-html \ tutorial-pdf tutorial-html \ white-paper-pdf white-paper-html \ - ref-guide-pdf ref-guide-html \ examples data-regen fig-convert @@ -58,17 +59,15 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html \ ref-doc-devel-html -## ----------------------------------------------------------------- ## -## Shared dependencies on the products of tutorial/ and ref_guide/. ## -## ----------------------------------------------------------------- ## +## -------------------------------------------------- ## +## Shared dependencies on the products of tutorial/. ## +## -------------------------------------------------- ## # FIXME: Maintaining dependencies across directories is too # complicated. Simplify. EXTRA_DEPS = $(srcdir)/tutorial/tutorial.hh $(srcdir)/ref_guide/ref_guide.hh $(srcdir)/tutorial/tutorial.hh: fig-convert cd tutorial && $(MAKE) $(AM_MAKEFLAGS) tutorial-html -$(srcdir)/ref_guide/ref_guide.hh: fig-convert - cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) ref-guide-html ## ----------------------- ## ## Doxygen documentation. ## @@ -142,14 +141,10 @@ white-paper-html: ## Reference Guide. ## ## ----------------- ## -ref-guide-pdf: fig-convert - cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ +include $(srcdir)/ref_guide/ref_guide.mk -ref-guide-html: fig-convert - cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ - -# FIXME: Adresse the construction of examples (see examples/Makefile.am). +# FIXME: Adress the construction of examples (see examples/Makefile.am). data-regen: cd examples && $(MAKE) $(AM_MAKEFLAGS) $@ @@ -160,7 +155,7 @@ fix-refdata: # Make sure the figures are the first files in EXTRA_DIST. # Make the 'fake-doc' rule works correctly. -EXTRA_DIST = +EXTRA_DIST += $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp include $(srcdir)/figures/figures.mk @@ -244,7 +239,7 @@ include $(srcdir)/examples/examples.mk include $(srcdir)/outputs/outputs.mk -dist_doc_DATA = $(USER_REFMAN_PDF) +dist_doc_DATA += $(USER_REFMAN_PDF) # Installing a directory located in the source dir is not supported by # Automake by default, so we cannot add `USER_REFMAN_HTML' to @@ -293,7 +288,7 @@ EXTRA_DIST += \ tools/split_sample.sh \ tools/todoxygen.sh -CLEANFILES = \ +CLEANFILES += \ Doxyfile_user \ Doxyfile_user_pdf \ Doxyfile_devel \ diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index eb9290a..161d893 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -1,6 +1,6 @@ -# -*- Automake -*- +# -*- Automake -*- -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -34,3 +34,9 @@ FIGURES_SRCDIR = $(DOC_SRCDIR)/figures EXAMPLES_SRCDIR = $(DOC_SRCDIR)/examples SPLIT_EXAMPLES_SRCDIR = $(EXAMPLES_SRCDIR)/split IMG_SRCDIR = $(DOC_SRCDIR)/img + +# FIXME: Adjust when $(DOC_SRCDIR) is renamed or removed. +# +# FIXME: Careful, `doc_dir' is close to `docdir', which is reserved by +# Automake. Change this name? +doc_dir = $(DOC_SRCDIR) diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/ref_guide.mk similarity index 60% rename from milena/doc/ref_guide/Makefile.am rename to milena/doc/ref_guide/ref_guide.mk index fa953e4..1a9ff12 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/ref_guide.mk @@ -1,3 +1,5 @@ +# -*- Automake -*- + # Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,16 +17,16 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. # -.PHONY: ref-guide ref-guide-html - -include $(top_srcdir)/milena/doc/doc.mk +.PHONY: ref-guide ref-guide-html ref-guide-pdf -TEXINPUTS ="$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):\ +ref_guide_TEXINPUTS = "$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):\ $(SPLIT_OUTPUTS_SRCDIR):$(IMG_SRCDIR):$(SPLIT_EXAMPLES_SRCDIR):" ref-guide: ref-guide-html ref-guide-pdf +ref_guide_dir = $(doc_dir)/ref_guide + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -52,43 +54,38 @@ ref-guide: ref-guide-html ref-guide-pdf # Intermediate product for the various doc targets of the parent # directory. # -# This is not a bug: REF_GUIDE_HH is meant to have a `.hh' -# extension, since it is later parsed by Doxygen, which complains -# about `.html' files. -REF_GUIDE_HH = $(srcdir)/ref_guide.hh +# This is not a bug: REF_GUIDE_HH is meant to have a `.hh' extension, +# since it is later parsed by Doxygen, which complains about `.html' +# files. +REF_GUIDE_HH = $(ref_guide_dir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) -$(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp - $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) +$(REF_GUIDE_HH): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp + $(doc_dir)/tools/todoxygen.sh $< $(ref_guide_dir) $(doc_dir) # Final product. -REF_GUIDE_PDF = $(srcdir)/ref_guide.pdf +REF_GUIDE_PDF = $(ref_guide_dir)/ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) -$(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - test "$(top_srcdir)" == "$(top_builddir)" \ - || mv -f $(builddir)/ref_guide.pdf $(srcdir) +$(REF_GUIDE_PDF): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< \ + test x"$(ref_guide_dir)" != x. \ + && mv -f ref_guide.pdf $(ref_guide_dir) -# FIXME: Regenerating figures.stamp requires make to go back to the -# parent directory. We already do the opposite (descending from -# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update -# tutorial.hh). This is not sound. We probably want to put together -# somes of these files, and maybe get rid of some directories, or at -# least move most of the Makefile machinery into -# milena/doc/Makefile.am. -$(srcdir)/../figures.stamp: - cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert +dist_doc_DATA += $(REF_GUIDE_PDF) -dist_doc_DATA = $(REF_GUIDE_PDF) - -EXTRA_DIST = \ - ref_guide.tex \ +EXTRA_DIST += \ + $(ref_guide_dir)/ref_guide.tex \ $(REF_GUIDE_HH) -CLEANFILES = \ +# FIXME: Remove `ref_guide.aux ref_guide.toc ref_guide.log +# ref_guide.bbl ref_guide.out *blg *.lot' when texi2dvi is used. +# +# FIXME: Why is $(REF_GUIDE_PDF) listed here? It should be +# automatically cleaned. I'm not sure either about the rest of +# CLEANFILES. +CLEANFILES += \ ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out \ *blg *.lot \ $(REF_GUIDE_PDF) \ -- 1.5.6.5

1 0

last-svn-commit-14-g7f55f7c configure.ac: Do not configure milena/doc/ref_guide/Makefile.
by Roland Levillain 01 Apr '10

01 Apr '10

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4808918..218a079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/ref_guide/Makefile. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Stop pruning Makefiles under milena/doc/. * Makefile.am (LRDE_STRIPPED_DIST_FILES): Remove diff --git a/configure.ac b/configure.ac index f46a22d..4608585 100644 --- a/configure.ac +++ b/configure.ac @@ -252,7 +252,6 @@ AC_CONFIG_FILES([ milena/Makefile milena/doc/Makefile milena/doc/examples/Makefile - milena/doc/ref_guide/Makefile milena/doc/technical/Makefile milena/doc/tutorial/Makefile milena/doc/white_paper/Makefile -- 1.5.6.5

1 0

branch revamp-doc-build updated: last-svn-commit-120-g66a2888
by git＠lrde.epita.fr 01 Apr '10

01 Apr '10

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 revamp-doc-build has been updated discards 03002924aa13a0fd442126fbc461bf6627d7ed65 (commit) discards f169fdf50e40d6e594d3f558bf5a787919389d3f (commit) discards b210a23a619d8b60140303e6d77ca22055e89413 (commit) discards c5030284d69e258859b9285c3c4dd3301e1e6b68 (commit) discards ae36e6d9046126ee62f2db47f9eea112c756c0e0 (commit) discards 69369199c9d503a2b43197667362e61b800802fa (commit) discards a905428829ba2c107f10afdbaf697f4c106dc155 (commit) discards d6ecf0a225db980ac0f10eab9cdbd35f78e2fb9a (commit) discards 5412e23a30e60d05c639dc40e7c5c5b89dd2f5cd (commit) discards 90d6a929458957381ba27375e073f6f545360e8e (commit) discards 1d78b388eee0807fd010a4020e381387f232c389 (commit) discards 5ec3f5f0887869c29986c48ab4bb4863cca2ba93 (commit) discards 0339d12b88507580a87311d2538eebc079384094 (commit) discards 56082952387e69ec8c31a8f5b3519700551803dd (commit) discards 9dc3bc6c84e37bbb33d01c7b1094d8394b202a9f (commit) discards 75d3ad83be574c7724c64a4a5bb368579dc93d30 (commit) discards 2c83b3cffdfcb61a883b262f838a30bb5e9d35cb (commit) discards 67329fa81dd02786b86ace2b702ff9d179586d9a (commit) discards 67339bfbfc41528fb4daf61a11b2da9499d75793 (commit) discards 44985028aa2736b98961e514e6163bd813242ccc (commit) discards 9729ffbdabda1a9b3a7255142d1aba8f657d9507 (commit) discards d9609f2b13fbd7dc9c49a04c94c1129ccd56ada3 (commit) discards e54763c030a5e6fea6cc79f593c67e6ace2faf40 (commit) discards ef6cf9cfd139ccdbd613847e8cd8484b0a42aaf5 (commit) discards 8869ca10476286d66734b857661c4a34f082a276 (commit) discards 78b36b9fc99784c296061266e563076364d32808 (commit) discards 6f28095b9a93ce36a0c8acba4122e66e781fd21c (commit) discards 2ec1c8cd1608687b140cc400d6d85c743a8dcdd9 (commit) discards 6e3d7ddfe1e0078353d9206110d28617741de580 (commit) discards 901d8eb33b3fbfd20f438ff367867c25847c0550 (commit) discards 1c035cadf79e9e2853752b01eef1566e1b46de23 (commit) discards bac323e4f97d6d0608f5d9e30ba4876db90b1034 (commit) discards 05b14084768907f50860a979aea5d22fe4502c16 (commit) discards b6d23f203d39ba22ec47a805f53f9be73f3bdeea (commit) discards 4c961ee6e2d3a1dec66ca14e3c344ae147a30933 (commit) discards cc8f9baae01d2527b0379e83ff48c0c093526a43 (commit) discards f86b1e780ef05765643405e5b9456c145cd2e96d (commit) discards fc7196b54aaeec4d381b72c298247147fbffad89 (commit) discards 84ab03d11b10f40d7cc3f8562823f89a43e35c64 (commit) discards eb37b34cfef8029a47401313f885f020af1d1b3a (commit) discards 65274cb0cb687be4167a6d3c303d643273e5feae (commit) discards 2efbcf38e5783f19dde0179971b90a7f2d4e4c8c (commit) discards 019eafb15442bac71aa18877205c1850f21216b4 (commit) discards 487066b2c2222f329557aa5084b185ce78d9e78d (commit) discards 412e1c2498db7ea51f721a4976230f087e98f930 (commit) discards d7477b4738064ec3f0285c49fd7a0e2d5a0fdcfb (commit) discards 08596c436254c3bc72df79c602c1a52d088488a1 (commit) discards 8c468bfe4da53ffa905fa964db75e2a919aded01 (commit) discards 5333046f0b1c5e8e9f6c7efff3275ff8c3d9857f (commit) discards deef3451fe6bdf2742c80441f4053fa5d5a4eb38 (commit) discards b435aaefc7a8ced8781ab8802f80cc47e9b5dfdc (commit) discards 9995f2f0f79d27df67c5fe22d0e9ba5e3a19319e (commit) discards f380d4a41bfc75328426c23a4e6403c502613522 (commit) discards 530dab561cbb732eff6bfcfcfd8c1ef670c35976 (commit) discards d4d289f688767b9fdb8eb6cf463b448145fdf1b0 (commit) discards ef57579e4b9cabb6a8740923781404106205c260 (commit) discards f31fd9910bc48e521131d9d40f585789b07da887 (commit) discards e5d6ed0790d5127e3152aabd6c32cf459610ff84 (commit) discards 16b19b728d660cd7628941d3c02a6bf986f11bc8 (commit) discards 57871627ea6df97224ef39b8015d13ce09ee634a (commit) discards 1168f5242f804cecf1a089f982eb5d993928f917 (commit) discards db2104b01afe59e7f9cf72eb0eacbe87d1a65527 (commit) discards 0176b4b2eef3a76141ad58ae1fa80a2925ca86d8 (commit) discards 247e151000cbab8c3c8e5c625adb793738c886f2 (commit) discards b7fc1e76cf4d629def68b7260eb057357a5d50d1 (commit) discards 120298149142b9c6c0a7aaabd79d2b3030115855 (commit) discards dc54b19cb5b39de46f62d04edd7859cb0b35b74a (commit) discards 3f607e8f19d0a6d8473d038d502e04edc4b69490 (commit) discards 1dde4ec3aa06c7cb628b052bade4d1f41e4c8c5e (commit) discards b7b6a7da306ee36e96b3add2bd0843777fbbd003 (commit) discards fb992545b50f0d9b5a0ef5db8a31ecc8eb3db625 (commit) discards 219aa14bfdc6b234bee00304f5f69cee928db99b (commit) discards 45b2ed4e8604b7defe6ba2a56bc5cd859d3c4a7c (commit) discards 9693e15791859df0f34eb9781893c768c85777cc (commit) discards 735e0af754220c01f0d91a44da748c785a688414 (commit) discards b19305ec35a60965caa9f5e059b3ad1ec79ccbb7 (commit) discards fbc3cb2efacf69c7b57eb6a68464011ef745eb3a (commit) discards 51a165bc18b198c09fbe3dbd89d7a615cb513c35 (commit) discards 5fc83d5c255135833e0e5a6a5741bc2f5aa90be0 (commit) discards 31c6ffe0c98a9eebcc62ee0a4d06bca2e4182d7b (commit) discards 17089da3e2238d2d2097b7f4f48153255c3128c2 (commit) discards b370eff1d24c81d6a5267249d1816527c554deb4 (commit) discards 0a5e4a1a52c69b45aebd6caad1caf14eea829997 (commit) discards 13f1c3cbb14148c33a48aff238a050e96c9d993d (commit) discards 1a017e969b927cf1c45c964115d637524a7cea14 (commit) discards 840243a55ded80fa6bb4234581cf07aeaca0e320 (commit) discards 13af895daaeda0e5c287eb221453bcf1ac5db581 (commit) discards 9716b84335ac825ffc5d5d3d25260a85271dc436 (commit) discards 52239ab66b626c87bba167fc0ced5de22a1e86a3 (commit) discards 42f2b7143b8eb75153bd45eb2e27b478cbaff6f7 (commit) discards bd915de6ce66c85f2cea6abe587b4e0889d738b8 (commit) discards 121d1e63a5f73821eb5db52c00171cc1b0a60384 (commit) discards 443d8040881e8081806503f9ee6d0c12d79e46a9 (commit) discards 074db679f12a77060008b2083356808dae4726f5 (commit) discards 6095c472d55ba4b985be03aa156c4514f8110ba6 (commit) discards 8f46c4acb3bab7dcaa4d0e3c520db72819f100ba (commit) discards 9391217aeb63806aa71ebbc16dd286a7ba64d200 (commit) discards 7bc664310010634fd0103995f2913bd451a3140b (commit) discards cde21c235ca8f0ebb9427c8d2e5fd93f83a95923 (commit) discards 32e953218a472843af95dfb11fe234d7b25bf5f4 (commit) discards 3fbbba25264030cacd592d1c3d20c2fe6e7b1ac7 (commit) discards 203f31ea8f8da0a033bca6fa2dc73001b149b5af (commit) discards 8c6dd2918307d23995b78705aae26ddb7b763226 (commit) discards 7ef9ac2318d5c4745373aab60e63c3187b29d6d1 (commit) discards 1b2886ba13c8c524d16f5e4f8e63023b69074b75 (commit) discards 37fc180b3d558b2ca3d1eab376fe152cf9785058 (commit) discards d52b4ebbd49d33bfd684e99bdc65d2d8330fd637 (commit) discards e4a2af56dadfacd947e57f0af503ff427560ab15 (commit) discards c663f700800815a367b9908cb99e035fc05a2762 (commit) discards 0964a8898415b94052ef68d7ef6eb42b3cce4209 (commit) via 66a288802969285cb0bdf97c4737c47db786e02c (commit) via 12dd47935880554c3a3cf24db5cd06de2413ae45 (commit) via e4a1fc8155fbff94835c50f7208de3d9b8c5477a (commit) via 5bb93504bd963799300af770178dee12c8cd487c (commit) via 5d5c643d6beaaf64eda9f0e0634f0ffda72cc886 (commit) via b59137ab61cc11a7d9fa58fd6e87168dda9e9b57 (commit) via 15608e30b32328403b14f4602f87b85c8d56af02 (commit) via cb0b452338b03e470cdec5b68d41b99f75ee9975 (commit) via 4502becc0a7c74d9c36df8b2f607855cb18c77fa (commit) via fe084d58f31ef12a5aac620164c35878ad4f36ce (commit) via 5025e33455e29e74226406c7ceebbcd0cdd17fa5 (commit) via b6b3517c054e387bef3d3a3c371de9b5cdf859fc (commit) via 942c6a807a7881b4115ab63232d39fc42730c6fb (commit) via 422b78ec70dc819e3f9ccb81b7aefed7e413790c (commit) via e8f81c85019744c6c9b993469dfb9da58fc7f13e (commit) via defd509888b0234193712b39f34095952366b72d (commit) via 8116ef19fc52af21a79189f607bce880b600ade5 (commit) via 4faa18c9479d0f5fa0b1780431327141396731ec (commit) via c0a26759095070ff5a69a8c508d7574b6c12b2a5 (commit) via 2199e6c6df1b10ac78e84405273befe20fa6eb96 (commit) via 390b09559fc9faf1131b057fdc12931e33430556 (commit) via c94f5179c33d27d1c3aaf46804e48d5710baeafc (commit) via e5e506be9a2edf6a0d5c184dc2fd0efee09b29c1 (commit) via d637b9962218aa697776ef9bdc509e7e50da0644 (commit) via 084fcc94307783b55e2b77f2d8217ffc68b65702 (commit) via 67c299f41df3d45fd0d6a8e3c777631367626dbe (commit) via 9196858aa3f15eba540420164e21bf929a3f2f53 (commit) via c0e0ae6fee6b9e6e6092647e1a942f1b2e9336c8 (commit) via 642d87acb6320ca145bab0149ee04cef2e3d976b (commit) via 2c4e1e1dd3e2df60cc57a9e0917b5e509fb583ef (commit) via b599cccfd46f95c9337b526e0b172e019aaaa5cb (commit) via 4ee83123b5ef3dd0ba1a0b47ad345aeae3852f22 (commit) via 9b894672a7c13f2f2720d5a425981524e92d707b (commit) via 6c5106c0a059bc80a2abed23021f450335386f1b (commit) via fca542826e4bf7909f343cdcd6a75ed3c7afc478 (commit) via 55f2622b2ccce58bee6d912ee92cb33c873a5392 (commit) via 2152dd039b5e78eaeb179cf19d640aef81ef3330 (commit) via 19eee8ed618cf36f4803e2d3ab823c8e3682fd39 (commit) via ba6a3f88edc827a030919df1ead7b16621008063 (commit) via a4d6bc84bb23a0b58e2e612124876e3dcc1a3f78 (commit) via 8293184f19cedcb42b8a33da195def597db06e6a (commit) via 6b0e5460e1c05d98beb1166a410c5919cc802348 (commit) via 7fe9e76d1693fecdc0f0de4bdcfa62297935561a (commit) via 3fac2c7d82a1bf409d3c012b10f6f98de8f36d97 (commit) via 3e079f7e60ae9d34b471db83a37709ea586166d5 (commit) via 82f86bd0049463e4f53af83742d0d63245825448 (commit) via 55cb496c91c19c956241762d43bca9bc2c522517 (commit) via 378fc00cc34856163226061563ff0cf2f26ac186 (commit) via 8a2626d805c214e0847639c112bc0c19be991033 (commit) via 5ef318c063365486ceacc847858bdfd23d93aaf1 (commit) via 8aae86da7f075b92c9872a0a4e6b2d45c4054b52 (commit) via a8e00b1cee3271cc86191b9cb18103d8f00ed781 (commit) via e89fc5123b67bba9bf2a778a4ceed26ca95132d4 (commit) via 365cdb48620a38fbea0f1b4af15e73935b938e25 (commit) via 1d9cee32593cff25aa6ef8cefc75add9bfd2038f (commit) via 3b9b30f42413743de6a5e868d6aa428f9c6f4f52 (commit) via c16f093945ae2a974a36964501b16d74733fe210 (commit) via f23d9cf9c311e552731dd144af75ac7dcaf92a27 (commit) via d76722cb4eb8feb47c6fa1b5f073b11f421a8194 (commit) via 073d3d953a4c0844363cd495462a7bef70c877b0 (commit) via e126d4ccdf50168c2439913eb47f746cc75b727c (commit) via 4e0645dc40c3b3f66df8ffb1445b47b80fad8a76 (commit) via 63aa7224f25656693c22d5f402f74b62c47728ee (commit) via 428990430d4af2b2f26b1dc6ae4ed3f2dd515c07 (commit) via a1b9977eb88d0b4608a7794031bf04c572f8f2e1 (commit) via 15b0083c5c39692271a1d9690f163598b399c655 (commit) via 71903ba675c551e3bd9073f706c4aaf961da00ce (commit) via fb074a9399bfe05e35a743437e0cd281c557db6e (commit) via f9e6be6b4b26d40873ff9cb309707f12c0ce64a5 (commit) via ab842943d315f2e78e9da8fd3ff79a381d73bc18 (commit) via 6e6e5b7d2ee1be09e8cc6978f41bf3c638028808 (commit) via 2038fc7a5be0586d14916be9980dbf1e897dc64a (commit) via c8e9fa84800ed8848e10366224fa26cdee00345d (commit) via a4af792177bc1187beb2eb1c55c5a2fa5e9a6f87 (commit) via 5440f59412f4158b3c1d73d5fbe77b935ff674ba (commit) via 03ae101e2638983b87f7d49f0cefbdc68e55dc94 (commit) via 512f054e50de04f6d163144a9c1f272dbd047078 (commit) via 0f9327c948c0cf9933a967499150f492fe63094f (commit) via f5190eace449936c1b96389dc249e5605c5abc74 (commit) via 38d31738f248e2aa8b91e4d6608851e1e9476e74 (commit) via d9fedc37413c7aeed75e85fb7c12e906f980aa5a (commit) via 42bc78f899ef2b8f2ea8100b7344c1ebe1ffc911 (commit) via f94a9b43d47fb921845f6ae5ca58cfb1ecd91062 (commit) via 40ff74388c63c2c13d24529249817f9f60d4a703 (commit) via 2e0e1ee3f937ed7de3144df16f00a0e71a70cfb7 (commit) via 2d20a625dd7aadf2e469e5e9837ff903fbbdf79f (commit) via 01ee98f52063896dac40a1e85687259b38429916 (commit) via d510e3e555ae4614d51d8d2fc692753e6cf8626b (commit) via 92124b54d54f4f85169698560e99c82387a66ce8 (commit) via 3e3486096f0f6ba002f6374dafc2fe2a69704493 (commit) via 873492a24aa0368a80567448e46dd05b25d438e0 (commit) via 0f1307f3571fb35b1782ae1f659b48aaeab842fe (commit) via 2e5cd0954a7b9383106589ae907f0271636e85bc (commit) via 6bfa9af7a48fb9674db992197a9a348c1175019f (commit) via cae77fdc1dbd50993c91117ee6e09e6e7c66377c (commit) via 76860ade539a188320cf749486d8d9a646eeead9 (commit) via 9dd6263a3e2212c4841d2de989de00382fa02185 (commit) via e0ecffb4c67d8b01e9ab1dbc6185647d55315663 (commit) via 69c0a1da93b5d8d9287a87b528679c36db331113 (commit) via dc704d34907ddbc7256ac48c4c27d01a258edf20 (commit) via 2aade6999e6deedf85c6b0201e502c1e51492bfb (commit) via ae7290b1239a974997e9caa8f99fef0d89fcca8e (commit) via a4ff06b6a32b65a7e12d8b79fe07fe15939e86ea (commit) via 50d2dc67f522262edccc662bddaaf6ba7fee417a (commit) via 1743cdc3a9ec1175eb556382c484858681c6cebd (commit) via c98d4ae07afc6e2eee02a95b0bdd6825f58ee6c3 (commit) via 7f55f7c8208591422b98ef0d8dbf73738b564ebd (commit) via 9ae11a0ca2f57fefd5c3e15a6c98ee7f11b22f1a (commit) via f382e4a24e8376645c7bf4aac2cfec4f933413c9 (commit) via 808c4e8be9333d74ac480ce7773c2c44af50abc3 (commit) via a32de0fdcfb1292f0eebd37857eeda829acb1bcc (commit) via e44073ea19332cde2bdd69ea5eb515d4cfc0e140 (commit) via fbe0b7f5ec449ab79dfad0b4d285a745f625e41e (commit) via 851beeb4d1256b38ff6d57b2c0f2944fd0479db2 (commit) via 77004f3748794e5990deca22ecbafb173fd44eef (commit) via 08a77f75484a3b12fcee2cf1f1970aefad936362 (commit) via 501c45e68c71fc00982b8b21a629d7b6757272cc (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (03002924aa13a0fd442126fbc461bf6627d7ed65) \ N -- N -- N (66a288802969285cb0bdf97c4737c47db786e02c) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 66a2888 bootstrap: Check for HeVeA instead of TeX4ht. 12dd479 Do not install low-quality HTML documentation. e4a1fc8 Adjust the installation of the HTML documentation. 5bb9350 Move LaTeX sources at the root of doc/; generate HTML in subdirs. 5d5c643 Revert to HeVeA to generate HTML from LaTeX. b59137a No longer generate doc/technical/technical.hh. 15608e3 Fix the regeneration of files in doc/. cb0b452 Fix the Milena distribution. 4502bec Do not distribute the developer (Doxygen) reference manual. fe084d5 Fix the name of the developer (Doxygen) PDF reference manual. 5025e33 Use finer installation variables. b6b3517 Simplify doc/Makefile.am. 942c6a8 doc/Makefile.am: Update FIXMEs. 422b78e Makefile.am (LOCAL_RECURSIVE_TARGETS): Remove doc. e8f81c8 Remove Make aliases in the documentation. defd509 Regen INSTALL using autoreconf. 8116ef1 Move INSTALL's contents to README and HACKING. 4faa18c Regen documentation products. c0a2675 Remove useless regen actions from bootstrap. 2199e6c Have doc/gen-figures-mk generate more Makefile bits. 390b095 Rework doc/gen-figures-mk a bit. c94f517 Add options to boostrap. e5e506b Distribute doc/gen-split-outputs-mk. d637b99 bootstrap: Make a more portable use of mktemp. 084fcc9 Make a more portable use of mktemp. 67c299f Sort inputs of generators to make them deterministic w.r.t. outputs. 9196858 bootstrap: Regen milena/doc/figures.mk. c0e0ae6 Generate the list of figures in the documentation. 642d87a Add a script to generate doc/figures.mk. 2c4e1e1 Use a more uniform style in doc/figures.mk. b599ccc Prepare doc examples for the automated generation of figures.mk. 4ee8312 bootstrap: Various fixes. 9b89467 Typo in doc/. 6c5106c Fix dependencies in doc/. fca5428 Distribute non generated figures in the documentation. 55f2622 Distribute non generated examples in the documentation. 2152dd0 Have ``make maintainer-clean'' remove generated figures in doc/. 19eee8e bootstrap: Regen the list of split outputs of the documentation. ba6a3f8 Generate the list of split outputs in the documentation. a4d6bc8 Prepare doc source files for the automation of output splitting. 8293184 Have split_sample.sh announce the right number of output files. 6b0e546 Fix programs in doc/examples/. 7fe9e76 bootstrap: Be terser. 3fac2c7 bootstrap: Don't remove the automatically collected temp dir. 3e079f7 Update PNG-to-EPS conversion rule. 82f86bd Remove useless paths in texi2dvi invocations. 55cb496 Update cleaning rules in doc/. 378fc00 Add missing dependencies. 8a2626d Ship non generated outputs. 5ef318c bootstrap: Regen the list of outputs of the documentation. 8aae86d Generate the list of outputs in the documentation. a8e00b1 Handle dependencies of generated figures. e89fc51 doc/examples-outputs.mk: Regen. 365cdb4 Prepare for the generation of multiple outputs from doc/ programs. 1d9cee3 bootstrap: Regen the list of outputs rules and timestamps. 3b9b30f Generate doc/examples-outputs.mk using sources in lieu of programs. c16f093 Move bits about programs out of doc/Makefile.am to improve readability. f23d9cf bootstrap: Regen the list of split examples of the documentation. d76722c Generate the list of split examples in the documentation. 073d3d9 bootstrap: Regen the list of examples of the documentation. e126d4c Generate the list of examples in the documentation. 4e0645d Catch up with milena/doc generators. 63aa722 Revamp the conversion of images in the documentation. 4289904 Add a rule to forcefully regen doc/examples-outputs.mk. a1b9977 Ship doc/gen-examples-outputs-mk. 15b0083 Fix the regeneration of HTML outputs. 71903ba Distribute and clean documentation timestamps. fb074a9 Improve doc/'s cleaning rules. f9e6be6 Prevent todoxygen.sh from generating incomplete outputs. ab84294 Adjust todoxygen.sh to TeX4ht outputs. 6e6e5b7 Disable the implicit generation of HTML from LaTeX. 2038fc7 Adapt HTML generation to TeX4ht. c8e9fa8 Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. a4af792 Use texi2dvi to produce HTML from LaTeX. 5440f59 Support HTML outputs in tex.mk. 03ae101 Automake configuration. 512f054 Have bootstrap check for HeVeA 1.10. 0f9327c Split LaTeX-to-HTML rules to clear things up. f5190ea List non generated documentation outputs separately. 38d3173 Use texi2dvi to produce PDF from LaTeX. d9fedc3 Add texi2dvi as well as a Make helper to use it. 42bc78f Merge doc/ Makefile helpers into doc/Makefile.am. f94a9b4 Improve dependencies of some documentation products. 40ff743 Revamp the Makefile machinery in milena/doc/examples/. 2e0e1ee configure.ac: Configure milena/doc/tools/data.hh. 2d20a62 Have documentation's examples not depend on hard-coded paths. 01ee98f Update the documentation's copyright header. d510e3e Have Doxygen generate its outputs in the build directory. 92124b5 Require Doxygen 1.5.6 at bootstrapping time. 3e34860 bootstrap: Fix a typo in an error message. 873492a Reorganize doc/Makefile.am. 0f1307f Have Doxyfile.in generate the user documentation. 2e5cd09 Generate the HTML and LaTeX Doxygen documentation in a single pass. 6bfa9af Shorten the list of files visited by Doxygen. cae77fd apps/graph-morpho/morpho.hh: Help Doxygen compile LaTeX formulas. 76860ad Clean up Doxygen-related Make rules in milena/doc/. 9dd6263 configure.ac: Do not configure milena/doc/examples/Makefile. e0ecffb Stop make from recurring in doc/examples. 69c0a1d Tell Git to ignore files generated in milena/doc/white_paper/figures/. dc704d3 configure.ac: Do not configure milena/doc/white_paper/Makefile. 2aade69 Stop make from recurring in doc/white_paper. ae7290b Tell Git to ignore files generated in milena/doc/technical/. a4ff06b configure.ac: Do not configure milena/doc/technical/Makefile. 50d2dc6 Stop make from recurring in doc/technical. 1743cdc configure.ac: Do not configure milena/doc/tutorial/Makefile. c98d4ae Stop make from recurring in doc/tutorial. 7f55f7c configure.ac: Do not configure milena/doc/ref_guide/Makefile. 9ae11a0 Stop make from recurring in doc/ref_guide. f382e4a Stop pruning Makefiles under milena/doc/. 808c4e8 Get rid of Make targets `fake-doc' and `void-doc'. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 24 ++++++++++++------ ChangeLog | 13 +++++++++ build-aux/extra-recursive-targets.mk | 23 +++++++++-------- build-aux/regen-recursive.mk | 27 ++++++++++--------- external/trimesh/ChangeLog | 6 +++- external/trimesh/gluit/gluit.mk | 2 +- milena/ChangeLog | 15 +++++++++++ milena/apps/mesh-segm-skel/io.hh | 2 + milena/tests/tests-recursive.mk | 36 +++++++++++++------------- milena/tests/tests.mk | 36 +++++++++++++++------------ scribo/ChangeLog | 17 ++++++++++++ scribo/core/object_image.hh | 2 +- scribo/primitive/link/internal/anchors_3.hh | 13 +++++---- scribo/src/binarization/sauvola_ms.cc | 6 ++-- scribo/src/debug/Makefile.am | 7 +++-- scribo/src/primitive/group/Makefile.am | 5 ++- scribo/table/internal/connect_lines.hh | 7 ++--- 17 files changed, 154 insertions(+), 87 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-130-g25eca5a Have Make generate the Swilena Python Shell (sps).
by Roland Levillain 01 Apr '10

01 Apr '10

* python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and sps-local.in. (edit): New. (sps, sps-local): New rules. --- swilena/ChangeLog | 9 +++++++++ swilena/python/Makefile.am | 27 ++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fb854f5..89da33d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + + Have Make generate the Swilena Python Shell (sps). + + * python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and + sps-local.in. + (edit): New. + (sps, sps-local): New rules. + 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> Add a Swilena wrapper for mln::image2d<mln::value::rgb8>. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 44b9210..9693c2e 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -260,7 +260,6 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx ## Swilena Python Shell (sps). ## ## ---------------------------- ## -# FIXME: We might want to rename this shell as something else. python_PYTHON += sps.py # The script to be used in installed distributions. @@ -268,6 +267,32 @@ bin_SCRIPTS = sps # The script to be used in non-installed build trees. noinst_SCRIPTS = sps-local +EXTRA_DIST += sps-common.in sps.in sps-local.in + +# Use Make to generate shell scripts (`sps' and `sps-local') instead +# of `configure', as advised by Autoconf's manual (see section +# ``Installation Directory Variables''). +edit = sed \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ + -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@libdir[@]|$(libdir)|g' \ + -e 's|@pythondir[@]|$(pythondir)|g' \ + -e 's|@PYTHON[@]|$(PYTHON)|g' + +sps sps-local: Makefile $(srcdir)/sps-common.in + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + cp $${srcdir}/sps-common.in $@.tmp; \ + $(edit) $${srcdir}$@.in >>$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +sps: $(srcdir)/sps.in +sps-local: $(srcdir)/sps-local.in + CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) -- 1.5.6.5

1 0

last-svn-commit-129-g7b138bf Stop configuring swilena/python/sps and swilena/python/sps-local.
by Roland Levillain 01 Apr '10

01 Apr '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6b6cd..373a6ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + + Stop configuring swilena/python/sps and swilena/python/sps-local. + + * configure.ac: Here. + 2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Check for HeVeA instead of TeX4ht. diff --git a/configure.ac b/configure.ac index 9b825a7..a3d319e 100644 --- a/configure.ac +++ b/configure.ac @@ -192,15 +192,6 @@ AC_CONFIG_FILES([swilena/Makefile AC_CONFIG_FILES([swilena/run], [chmod +x swilena/run]) -AC_CONFIG_FILES(m4_do([swilena/python/sps], - [:swilena/python/sps-common.in], - [:swilena/python/sps.in]), - [chmod +x swilena/python/sps]) -AC_CONFIG_FILES(m4_do([swilena/python/sps-local], - [:swilena/python/sps-common.in], - [:swilena/python/sps-local.in]), - [chmod +x swilena/python/sps-local]) - dnl<<lrde ## -------- ## ## Scribo. ## -- 1.5.6.5

1 0

Rebasing `revamp-doc-build' on top of `next'
by Roland Levillain 31 Mar '10

31 Mar '10

Since the branch `revamp-doc-build' is pretty stable now, I am going to rebase it on top of `next'. As the branch has many patches (110), please excuse me in advance for the noise.

1 0

branch revamp-doc-build updated: last-svn-commit-113-g0300292
by git＠lrde.epita.fr 31 Mar '10

31 Mar '10

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 revamp-doc-build has been updated via 03002924aa13a0fd442126fbc461bf6627d7ed65 (commit) from f169fdf50e40d6e594d3f558bf5a787919389d3f (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 ----------------------------------------------------------------- 0300292 bootstrap: Check for HeVeA instead of TeX4ht. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ bootstrap | 24 +----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-10-ga32de0f
by git＠lrde.epita.fr 31 Mar '10

31 Mar '10

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 a32de0fdcfb1292f0eebd37857eeda829acb1bcc (commit) from e44073ea19332cde2bdd69ea5eb515d4cfc0e140 (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 ----------------------------------------------------------------- a32de0f Have Scribo compile again. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 17 +++++++++++++++++ scribo/core/object_image.hh | 2 +- scribo/primitive/link/internal/anchors_3.hh | 13 +++++++------ scribo/src/binarization/sauvola_ms.cc | 6 +++--- scribo/src/debug/Makefile.am | 7 ++++--- scribo/src/primitive/group/Makefile.am | 5 +++-- scribo/table/internal/connect_lines.hh | 7 +++---- 7 files changed, 38 insertions(+), 19 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-10-ga32de0f Have Scribo compile again.
by Roland Levillain 31 Mar '10

31 Mar '10

* core/object_image.hh (object_image): Add prefix `mln::'. * primitive/link/internal/anchors_3.hh: Include mln/util/array.hh. Add missing `mln::' prefixes. * src/binarization/sauvola_ms.cc: s/influence_zone_geodesic/influence_zone_geodesic_saturated/. * table/internal/connect_lines.hh: Likewise. Remove a duplicated header inclusion. * src/debug/Makefile.am (bin_PROGRAMS, show_links_several_right_overlap_SOURCES): Disable show_links_several_right_overlap. * src/primitive/group/Makefile.am (bin_PROGRAMS, group_from_rag_SOURCES): Disable group_from_rag. --- scribo/ChangeLog | 17 +++++++++++++++++ scribo/core/object_image.hh | 2 +- scribo/primitive/link/internal/anchors_3.hh | 13 +++++++------ scribo/src/binarization/sauvola_ms.cc | 6 +++--- scribo/src/debug/Makefile.am | 7 ++++--- scribo/src/primitive/group/Makefile.am | 5 +++-- scribo/table/internal/connect_lines.hh | 7 +++---- 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 33307f4..160ced4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,20 @@ +2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> + + Have Scribo compile again. + + * core/object_image.hh (object_image): Add prefix `mln::'. + * primitive/link/internal/anchors_3.hh: Include mln/util/array.hh. + Add missing `mln::' prefixes. + * src/binarization/sauvola_ms.cc: + s/influence_zone_geodesic/influence_zone_geodesic_saturated/. + * table/internal/connect_lines.hh: Likewise. + Remove a duplicated header inclusion. + * src/debug/Makefile.am + (bin_PROGRAMS, show_links_several_right_overlap_SOURCES): Disable + show_links_several_right_overlap. + * src/primitive/group/Makefile.am + (bin_PROGRAMS, group_from_rag_SOURCES): Disable group_from_rag. + 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> Regen SCRIBO's Makefile helpers. diff --git a/scribo/core/object_image.hh b/scribo/core/object_image.hh index a920680..7f672b2 100644 --- a/scribo/core/object_image.hh +++ b/scribo/core/object_image.hh @@ -33,6 +33,6 @@ # include <mln/core/image/imorph/labeled_image.hh> # define object_image(L) \ - labeled_image<L> + mln::labeled_image<L> #endif // ! SCRIBO_CORE_OBJECT_IMAGE_HH diff --git a/scribo/primitive/link/internal/anchors_3.hh b/scribo/primitive/link/internal/anchors_3.hh index 85fa80b..3be9658 100644 --- a/scribo/primitive/link/internal/anchors_3.hh +++ b/scribo/primitive/link/internal/anchors_3.hh @@ -31,6 +31,7 @@ /// Routine providing 3 anchors for neighbor seeking. # include <mln/math/min.hh> +# include <mln/util/array.hh> # include <scribo/core/object_image.hh> @@ -94,7 +95,7 @@ namespace scribo - objects.bbox(current_object).pmin().row(); mln_site(L) sp = objects.bbox(current_object).center(); - def::coord r; + mln::def::coord r; switch (anchor) { @@ -102,10 +103,10 @@ namespace scribo case 0: if (h < 30) r = objects.bbox(current_object).pmin().row() - + math::min(2u, (h + 1) / 2 - 1); + + mln::math::min(2u, (h + 1) / 2 - 1); else r = objects.bbox(current_object).pmin().row() - - math::min(10u, h /10); + - mln::math::min(10u, h /10); break; @@ -118,14 +119,14 @@ namespace scribo case 2: if (h < 30) r = objects.bbox(current_object).pmax().row() - + math::min(2u, (h + 1) / 2 - 1); + + mln::math::min(2u, (h + 1) / 2 - 1); else r = objects.bbox(current_object).pmax().row() - - math::min(10u, h /10); + - mln::math::min(10u, h /10); break; default: - trace::warning("Non handled anchor"); + mln::trace::warning("Non handled anchor"); mln_assertion(anchor > 2); } diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 747bc11..196a15c 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -33,7 +33,7 @@ #include <mln/literal/colors.hh> #include <mln/math/sqr.hh> #include <mln/subsampling/subsampling.hh> -#include <mln/transform/influence_zone_geodesic.hh> +#include <mln/transform/influence_zone_geodesic_saturated.hh> #include <mln/util/timer.hh> #include <mln/value/int_u16.hh> #include <mln/value/int_u8.hh> @@ -359,8 +359,8 @@ int main(int argc, char *argv[]) /// Saving influence zone scale image. - image2d<int_u8> - e_ext = transform::influence_zone_geodesic(e, c8(), mln_max(unsigned)); + image2d<int_u8> e_ext = + transform::influence_zone_geodesic_saturated(e, c8(), mln_max(unsigned)); io::pgm::save(e_ext, "e_ext.pgm"); diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 28839dc..36bbfcb 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -27,7 +27,6 @@ bin_PROGRAMS = \ show_links_center_aligned \ show_links_non_h_aligned \ show_links_several_right \ - show_links_several_right_overlap \ show_links_single_left \ show_links_single_left_dmax_ratio \ show_links_single_right \ @@ -39,7 +38,6 @@ bin_PROGRAMS = \ show_objects_thick \ show_objects_thin - show_left_right_links_validation_SOURCES = show_left_right_links_validation.cc show_links_bbox_h_ratio_SOURCES = show_links_bbox_h_ratio.cc show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc @@ -47,7 +45,6 @@ show_links_bottom_aligned_SOURCES = show_links_bottom_aligned.cc show_links_center_aligned_SOURCES = show_links_center_aligned.cc show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc show_links_several_right_SOURCES = show_links_several_right.cc -show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc show_links_single_left_SOURCES = show_links_single_left.cc show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc show_links_single_right_SOURCES = show_links_single_right.cc @@ -58,3 +55,7 @@ show_objects_large_small_SOURCES = show_objects_large_small.cc show_objects_small_SOURCES = show_objects_small.cc show_objects_thick_SOURCES = show_objects_thick.cc show_objects_thin_SOURCES = show_objects_thin.cc + +## FIXME: Does not compile. +## bin_PROGRAMS += show_links_several_right_overlap +## show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index 83c2306..e52e373 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -24,7 +24,6 @@ bin_PROGRAMS = \ group_from_double_link_filter_non_aligned \ group_from_double_several_links \ group_from_graph \ - group_from_rag \ group_from_several_graph \ group_from_several_left_links \ group_from_single_link @@ -33,8 +32,10 @@ group_from_double_link_SOURCES = group_from_double_link.cc group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc group_from_double_several_links_SOURCES = group_from_double_several_links.cc group_from_graph_SOURCES = group_from_graph.cc -group_from_rag_SOURCES = group_from_rag.cc group_from_several_graph_SOURCES = group_from_several_graph.cc group_from_several_left_links_SOURCES = group_from_several_left_links.cc group_from_single_link_SOURCES = group_from_single_link.cc +## FIXME: Does not compile. +## bin_PROGRAMS += group_from_rag +## group_from_rag_SOURCES = group_from_rag.cc diff --git a/scribo/table/internal/connect_lines.hh b/scribo/table/internal/connect_lines.hh index b2f9273..dda530f 100644 --- a/scribo/table/internal/connect_lines.hh +++ b/scribo/table/internal/connect_lines.hh @@ -35,7 +35,7 @@ # include <mln/data/fill.hh> -# include <mln/transform/influence_zone_geodesic.hh> +# include <mln/transform/influence_zone_geodesic_saturated.hh> # include <mln/morpho/elementary/dilation.hh> # include <mln/util/array.hh> @@ -43,8 +43,6 @@ # include <mln/opt/at.hh> -# include <mln/transform/influence_zone_geodesic.hh> - # include <scribo/core/macros.hh> # include <scribo/core/central_sites.hh> @@ -96,7 +94,8 @@ namespace scribo for_all_elements(i, aligned_lines) opt::at(l, aligned_lines[i]) = aligned_lines[i]; - l = transform::influence_zone_geodesic(l, c2(), max_distance, -1); + l = transform::influence_zone_geodesic_saturated(l, c2(), + max_distance, -1); for_all_components(i, boxes) { -- 1.5.6.5

1 0

last-svn-commit-113-g0300292 bootstrap: Check for HeVeA instead of TeX4ht.
by Roland Levillain 31 Mar '10

31 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 24 +----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 299865a..a62d7bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Check for HeVeA instead of TeX4ht. + 2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> Revert to HeVeA to generate HTML from LaTeX. diff --git a/bootstrap b/bootstrap index 8f7d0c0..1505aa5 100755 --- a/bootstrap +++ b/bootstrap @@ -155,29 +155,7 @@ require $libtoolize 1.5.22 require doxygen 1.5.6 require convert 6.3.7 -# FIXME: Also check these: -# epstopdf -# pgf (how?) - -# Check for TeX4ht. htlatex and friends do not have options like -# `--version', `-version', `-v', etc. Hence this ad hoc procedure. -tempdir=`mktemp -d /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -rf "$tempdir"; exit; } -trap cleanup 0 1 2 3 6 15 -( - cd "$tempdir" - cat >test.tex <<EOF - \documentclass{article} - \begin{document} - Test - \end{document} -EOF - htlatex >/dev/null 2>&1 test.tex -) || fatal "TeX4ht is required" - -# dvipng is required by TeX4ht. -require dvipng 1.11 +require hevea 1.10 -version # Regen files stored in the repository if asked so. -- 1.5.6.5

1 0