June 2013 - Olena-patches

*****SPAM***** Turn your 2 spare hours in a week to 230 Euro helping others
by olena-patches＠lrde.epita.fr 18 Jun '13

18 Jun '13

We invite you to work in the remote assistant position. This work takes 2-3 hours per week and requires absolutely no investment. The essence of this work for incoming client requests in your city. The starting salary is about ~2000 Euro per month + bonuses. You get paid your salary every 2 weeks and your bonuses after fulfilling each task! We guarantee work for everyone. But we accept applications this week only! Therefore, you should write a request right now. And you will start earning money, starting from next week. Please indicate in the request: Your name: Your Contact number: Your email address: City of residence: Please send the request to my email Doris(a)euroconsultjob.com and I will answer you personally as soon as possible Sincerely, Doris Peterson

1 0

olena: branch next updated: olena-2.0-564-g20559be
by git＠lrde.epita.fr 18 Jun '13

18 Jun '13

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 20559be00fdfd2fbdbdd98f076b876657e5bc6a8 (commit) via 9085e4b7e9e6fe2d0be12bc63d51aa8f25bcdc4f (commit) via d9a6f25af67108cee925ce72374aff349434837d (commit) via 017deaf9e4529abc349e058bce98666e1e432966 (commit) via 808ccde7dce1f632e13c6a6a5165d2fc09bdee84 (commit) via 2e5b2fb984eb222f5b47a1d104ebdf8d56f2321a (commit) via 173a8033a3feee06081e104dba21607f9a521be2 (commit) via f7d160738f1c853ce9533c1bd72ce77b950d81c0 (commit) via f00d513a3c97cba2b5f0a641e0e41f6e05e36b4e (commit) via 0119758928ae548160814ddcd9b2316b0bceac95 (commit) via 480f7d1fa43b0690d4fedc21bf8bab2326c86cb4 (commit) via edc8943687604585b3c202a1a65456ca471f0c1a (commit) from 1935bc36690804e3ee07a7c2344538c9d80287c8 (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: ChangeLog | 39 ++++++++++++++++++++++++++++++++++++++ HACKING | 7 +++++-- bootstrap | 8 +++++++- build-aux/.gitignore | 1 + build-aux/mln_add_file | 8 ++++---- doc/Makefile.am | 34 ++++++++++++++++++++------------- lrde-scmstats.sh | 4 ++-- milena/ChangeLog | 34 +++++++++++++++++++++++++++++++++ milena/doc/Makefile.am | 30 +++++++++++++++++------------ milena/doc/tools/clearbanner.sh | 7 ++++--- milena/doc/tools/todoxygen.sh | 23 +++++++++++----------- milena/mln/debug/trace.hh | 40 ++++++++++++++++++++------------------- milena/mln/util/timer.hh | 15 --------------- scribo/ChangeLog | 19 +++++++++++++++++++ scribo/doc/Makefile.am | 35 +++++++++++++++++++--------------- scribo/doc/tools/todoxygen.sh | 23 +++++++++++----------- 16 files changed, 219 insertions(+), 108 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

*****SPAM***** We offer you a personal decision as to earn more without investment.
by olena-patches＠lrde.epita.fr 18 Jun '13

18 Jun '13

We invite you to work in the remote assistant position. This work takes 2-3 hours per week and requires absolutely no investment. The essence of this work for incoming client requests in your city. The starting salary is about ~2000 Euro per month + bonuses. You get paid your salary every 2 weeks and your bonuses after fulfilling each task! We guarantee work for everyone. But we accept applications this week only! Therefore, you should write a request right now. And you will start earning money, starting from next week. Please indicate in the request: Your name: Your Contact number: Your email address: City of residence: Please send the request to my email Ralph(a)euroconsultjob.com and I will answer you personally as soon as possible Sincerely, Ralph Padgett

1 0

olena: branch build-system-fixes created: olena-2.0-564-g20559be
by git＠lrde.epita.fr 18 Jun '13

18 Jun '13

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 build-system-fixes has been created at 20559be00fdfd2fbdbdd98f076b876657e5bc6a8 (commit) - Log ----------------------------------------------------------------- 20559be Mention bibtex2html and bib2bib as documentation build dependencies. 9085e4b Require bibtex2html 1.95 and bib2bib 1.95. d9a6f25 Work around constraints of TeXLive's bibtex2html on Mac OS X. 017deaf Make mln::util::timer copy-constructible and (copy-)assignable. 808ccde Tell Git to ignore build-aux/test-driver. 2e5b2fb Shell-related portability fixes in Scribo's Makefiles. 173a803 Shell-related portability fixes in Milena's Makefiles. f7d1607 Shell-related portability fixes in Olena's Makefiles. f00d513 Use `perl -pi' instead of `sed -i' in Scribo. 0119758 Use `perl -pi' instead of `sed -i' in Milena. 480f7d1 Use `perl -pi' instead of `sed -i' in Olena. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-564-g20559be Mention bibtex2html and bib2bib as documentation build dependencies.
by Roland Levillain 18 Jun '13

18 Jun '13

* HACKING (Required Software): Here. --- ChangeLog | 6 ++++++ HACKING | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6db62bf..3537bea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + Mention bibtex2html and bib2bib as documentation build dependencies. + + * HACKING (Required Software): Here. + +2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + Require bibtex2html 1.95 and bib2bib 1.95. * bootstrap: Here. diff --git a/HACKING b/HACKING index f453ef0..992ec81 100644 --- a/HACKING +++ b/HACKING @@ -1,4 +1,4 @@ -Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory (LRDE) This file is part of Olena. @@ -83,7 +83,10 @@ the following extra programs if you want to work on the Olena project. - HeVeA 1.10 - - LaTeX2HTML (or at minimum, its `html.sty' style file). + - LaTeX2HTML (or at minimum, its `html.sty' style file), + + - bibtex2html 1.95 or higher (at least the bibtex2html and + bib2bib tools). Note that `bootstrap' checks for the presence of most of these tools. -- 1.7.10.4

1 0

olena: olena-2.0-563-g9085e4b Require bibtex2html 1.95 and bib2bib 1.95.
by Roland Levillain 18 Jun '13

18 Jun '13

* bootstrap: Here. (require): Accept complex command line patterns as third argument to handle bibtex2html's and bib2bib's ``--version'' option. --- ChangeLog | 8 ++++++++ bootstrap | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1423c6..6db62bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + Require bibtex2html 1.95 and bib2bib 1.95. + + * bootstrap: Here. + (require): Accept complex command line patterns as third argument + to handle bibtex2html's and bib2bib's ``--version'' option. + +2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + Work around constraints of TeXLive's bibtex2html on Mac OS X. * doc/Makefile.am (lrde_olena.html): Here. diff --git a/bootstrap b/bootstrap index 1ff12a4..9dbc3ab 100755 --- a/bootstrap +++ b/bootstrap @@ -102,7 +102,8 @@ require () { local option if test $# -eq 3; then option=$3; else option=--version; fi - local version=$($1 $option | sed -n 's/[^0-9.]*$[0-9][0-9.]*$.*/\1/p;q') + local version=$(eval "$1 $option" \ + | sed -n 's/[^0-9.]*$[0-9][0-9.]*$.*/\1/p;q') test x"$version" != x || fatal "$1 (version $2 or better) is required" case $(version_compare "$2" "$version") in @@ -160,6 +161,11 @@ require doxygen 1.5.6 # with both implementations. require convert 1.3.12 -version require hevea 1.10 -version +# Admittedly a bit hacky, but these tools +# 1. display their version numbers on stderr, not stdout; and +# 2. contain a digit ("2") in their name, which disturbs `require'. +require bibtex2html 1.95 "--version 2>&1 | sed 's/bibtex2html//'" +require bib2bib 1.95 "--version 2>&1 | sed 's/bib2bib//'" # Regen files stored in the repository if asked so. -- 1.7.10.4

1 0

olena: olena-2.0-562-gd9a6f25 Work around constraints of TeXLive's bibtex2html on Mac OS X.
by Roland Levillain 18 Jun '13

18 Jun '13

* doc/Makefile.am (lrde_olena.html): Here. --- ChangeLog | 6 ++++++ doc/Makefile.am | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa9606d..e1423c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + + Work around constraints of TeXLive's bibtex2html on Mac OS X. + + * doc/Makefile.am (lrde_olena.html): Here. + 2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> Shell-related portability fixes in Olena's Makefiles. diff --git a/doc/Makefile.am b/doc/Makefile.am index 30fa31d..eeb417c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -166,8 +166,12 @@ lrde_olena.bib: # 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 +# Use the current directory for temporary files, as TeXlive (2012) +# prevents bibtex2html from running bibtex in a temporary directory on +# Mac OS X (see https://www.lri.fr/~filliatr/bibtex2html/) + env TMPDIR=. bibtex2html -s plain -nokeywords \ + -citefile lrde_olena.cite -noabstract -nofooter -labelname \ + -nodoc -linebreak -nf urllrde PDF lrde_olena.bib EXTRA_DIST += \ -- 1.7.10.4

1 0

olena: olena-2.0-561-g017deaf Make mln::util::timer copy-constructible and (copy-)assignable.
by Roland Levillain 18 Jun '13

18 Jun '13

* mln/util/timer.hh: Rely on the default copy constructor and the default (copy-)assignment operator. --- milena/ChangeLog | 7 +++++++ milena/mln/util/timer.hh | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f39e9e5..318d02e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + + Make mln::util::timer copy-constructible and (copy-)assignable. + + * mln/util/timer.hh: Rely on the default copy constructor and + the default (copy-)assignment operator. + 2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> Shell-related portability fixes in Milena's Makefiles. diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 7afff72..adfebef 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -49,13 +49,6 @@ namespace mln timer(); - // Explicit copy constructor (in most cases should not be - // used...). - explicit timer(const timer&); - - // Without impl. - void operator=(const timer&); - ~timer(); void start(); @@ -105,14 +98,6 @@ namespace mln } inline - timer::timer(const timer& t) - { - running_ = t.running_; - start_ = t.start_; - time_ = t.time_; - } - - inline timer::~timer() { reset(); -- 1.7.10.4

1 0

olena: olena-2.0-560-g808ccde Tell Git to ignore build-aux/test-driver.
by Roland Levillain 17 Jun '13

17 Jun '13

--- build-aux/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/.gitignore b/build-aux/.gitignore index e727daf..14ddc68 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -17,4 +17,5 @@ /py-compile /*.rej /*TAGS +/test-driver /texinfo.tex -- 1.7.10.4

1 0

olena: olena-2.0-556-gf00d513 Use `perl -pi' instead of `sed -i' in Scribo.
by Roland Levillain 17 Jun '13

17 Jun '13

* doc/Makefile.am, * doc/tools/todoxygen.sh: Here, as `sed -i' (with no backup file) behaves differently on GNU/Linux and Mac OS X. For more information, see: http://stackoverflow.com/questions/5694228/. --- scribo/ChangeLog | 10 ++++++++++ scribo/doc/Makefile.am | 25 +++++++++++++------------ scribo/doc/tools/todoxygen.sh | 23 ++++++++++++----------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 90de65c..b357b08 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Scribo. + + * doc/Makefile.am, + * doc/tools/todoxygen.sh: + Here, as `sed -i' (with no backup file) behaves differently on + GNU/Linux and Mac OS X. For more information, see: + http://stackoverflow.com/questions/5694228/. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 8579a87..5e0dec9 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,9 +99,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -182,9 +182,9 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ - -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ - $(DEVEL_REFMAN).tmp/html/index.html + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ + $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @mv -f $@.tmp $@ @@ -238,9 +238,9 @@ install-data-local: $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ - `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g;" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ + `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ @@ -265,6 +265,7 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g" \ - -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + perl -pi \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/scribo/doc/tools/todoxygen.sh b/scribo/doc/tools/todoxygen.sh index 0a85632..29199ae 100755 --- a/scribo/doc/tools/todoxygen.sh +++ b/scribo/doc/tools/todoxygen.sh @@ -2,7 +2,8 @@ # todoxygen.sh: Turn HTML files into suitable inputs for doxygen. -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -33,18 +34,18 @@ echo '\htmlonly' >> $out tail -n $tail_line $html >> $out echo '\endhtmlonly */' >> $out -sed -i -e 's/&#XA0/\&nbsp/g' $out -sed -i -e 's/&#X21A6/\&map/g' $out -sed -i -e 's/&#X2019/\&rsquo/g' $out -sed -i -e 's/&#X2192/\&rarr/g' $out -sed -i -e 's/&#X201C/\&ldquo/g' $out -sed -i -e 's/&#X201D/\&rdquo/g' $out -sed -i -e 's/&#X2261/\&equiv/g' $out +perl -pi -e 's/&#XA0/\&nbsp/g' $out +perl -pi -e 's/&#X21A6/\&map/g' $out +perl -pi -e 's/&#X2019/\&rsquo/g' $out +perl -pi -e 's/&#X2192/\&rarr/g' $out +perl -pi -e 's/&#X201C/\&ldquo/g' $out +perl -pi -e 's/&#X201D/\&rdquo/g' $out +perl -pi -e 's/&#X2261/\&equiv/g' $out # Doxygen wants us to preserve '\n' after commands. # \ref and \see do not need that extra new line. for keyword in include section page subpage subsection subsubsection image; do - sed -i -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out - sed -i -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out - sed -i -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out + perl -pi -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out + perl -pi -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out + perl -pi -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out done -- 1.7.10.4

1 0