Olena-patches June 2013

olena-patches@lrde.epita.fr

5 participants
104 discussions

olena: olena-2.0-555-g0119758 Use `perl -pi' instead of `sed -i' in Milena.

by Roland Levillain

* doc/Makefile.am, * doc/tools/clearbanner.sh, * 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/. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 19 ++++++++++--------- milena/doc/tools/clearbanner.sh | 7 ++++--- milena/doc/tools/todoxygen.sh | 23 ++++++++++++----------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 28a569f..769d2d9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Milena. + + * doc/Makefile.am, + * doc/tools/clearbanner.sh, + * 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-06-13 Roland Levillain <roland(a)lrde.epita.fr> Update the documentation of mln_trace. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 0ba5e58..3e70841 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -261,9 +261,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 $@ @@ -348,8 +348,8 @@ $(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\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ - $(DEVEL_REFMAN).tmp/html/index.html + perl -pi -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,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 $@ @@ -776,8 +776,9 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` + perl -pi \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/milena/$$d; \ @@ -802,5 +803,5 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/milena/doc/tools/clearbanner.sh b/milena/doc/tools/clearbanner.sh index d5f6b8c..81b1d91 100755 --- a/milena/doc/tools/clearbanner.sh +++ b/milena/doc/tools/clearbanner.sh @@ -1,6 +1,7 @@ #!/bin/sh -# 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. # @@ -16,6 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -sed -i -e 's,<HR SIZE=2><BLOCKQUOTE CLASS="quote">This document was translated from LATEX by,,g' $1 -sed -i -e 's,<A HREF="http://hevea.inria.fr/index.html">HEVEA</A>.</BLOCKQUOTE></BODY>,,g' $1 +perl -pi -e 's,<HR SIZE=2><BLOCKQUOTE CLASS="quote">This document was translated from LATEX by,,g' $1 +perl -pi -e 's,<A HREF="http://hevea.inria.fr/index.html">HEVEA</A>.</BLOCKQUOTE></BODY>,,g' $1 diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh index 0a85632..29199ae 100755 --- a/milena/doc/tools/todoxygen.sh +++ b/milena/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

11 years, 6 months

olena: olena-2.0-554-g480f7d1 Use `perl -pi' instead of `sed -i' in Olena.

by Roland Levillain

* build-aux/mln_add_file, * doc/Makefile.am, * lrde-scmstats.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/. --- ChangeLog | 11 +++++++++++ build-aux/mln_add_file | 8 ++++---- doc/Makefile.am | 23 ++++++++++++----------- lrde-scmstats.sh | 4 ++-- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..b4cd1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Olena. + + * build-aux/mln_add_file, + * doc/Makefile.am, + * lrde-scmstats.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-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/build-aux/mln_add_file b/build-aux/mln_add_file index 193784b..d81112b 100755 --- a/build-aux/mln_add_file +++ b/build-aux/mln_add_file @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -173,7 +173,7 @@ create it." 1>&2 line=`grep -nE '^#endif // ! ' $output_dir/all.hh | tail -n 1 | cut -d ':' -f 1` line=$(($line - 1)) - sed -i "${line}i\# include <$1> + perl -pi -e "${line}i\# include <$1> " $output_dir/all.hh } @@ -196,12 +196,12 @@ create it." 1>&2 line=`grep -nE "_SOURCES = " $test_dir/Makefile.am | tail -n 1 | cut -d ':' -f 1` line=$(($line + 1)) - sed -i "${line}i${test_bname}_SOURCES = $test_name + perl -pi -e "${line}i${test_bname}_SOURCES = $test_name " $test_dir/Makefile.am line=`grep -nE '\\\' $test_dir/Makefile.am | grep -B 1 'CLEANFILES = ' | head -n 1 | cut -d ':' -f 1` line=$(($line + 1)) - sed -i "${line}i\\\t${test_bname} \\\\" $test_dir/Makefile.am + perl -pi -e "${line}i\\\t${test_bname} \\\\" $test_dir/Makefile.am } diff --git a/doc/Makefile.am b/doc/Makefile.am index 582f40a..e10944a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,9 +121,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../,g" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp/html -name '*.html'` + perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -212,10 +212,10 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g" \ - -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ @@ -230,7 +230,8 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g" \ - -e "s,../../$(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,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ + -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/lrde-scmstats.sh b/lrde-scmstats.sh index f1f0073..37a68e7 100755 --- a/lrde-scmstats.sh +++ b/lrde-scmstats.sh @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -40,7 +40,7 @@ DEST=/lrde/dload/olena/stats/$subdir gitstats . $DEST # Anonymize some names. -find "$DEST" -name "*.html" -exec sed -i 's/J.r.me Darbon/JD/g' {} \; +find "$DEST" -name "*.html" -exec perl -pi -e 's/J.r.me Darbon/JD/g' {} \; # Expose uploaded files. chmod -R a+rX $DEST -- 1.7.10.4

11 years, 6 months

olena: olena-2.0-559-g2e5b2fb Shell-related portability fixes in Scribo's Makefiles.

by Roland Levillain

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. Wrap some long lines. --- scribo/ChangeLog | 9 +++++++++ scribo/doc/Makefile.am | 30 +++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b357b08..6330a23 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Scribo's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + Wrap some long lines. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Scribo. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 5e0dec9..c459d84 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,9 +99,10 @@ $(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. - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + find $(USER_REFMAN).tmp -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -238,9 +239,10 @@ 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) - 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'` + find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g;" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ + {} \; # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ @@ -248,9 +250,10 @@ install-data-local: done ## Try GNU chmod's X mode before resorting to something slower but ## more standard. - chmod -R a+rX $(DESTDIR)$(htmldir)/scribo || \ - find $(DESTDIR)$(htmldir)/scribo $ -type d -a -exec chmod a+rx {} \; $ \ - -o -exec chmod a+r {} \; + chmod -R a+rX $(DESTDIR)$(htmldir)/scribo || \ + find $(DESTDIR)$(htmldir)/scribo \ + $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; uninstall-local: for d in $(DATA_html_dirs_inst); do \ @@ -265,7 +268,8 @@ uninstall-local: doc-teamcity: - 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'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

11 years, 6 months

olena: olena-2.0-558-g173a803 Shell-related portability fixes in Milena's Makefiles.

by Roland Levillain

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. Wrap some long lines. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 29 +++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 769d2d9..f39e9e5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Milena's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + Wrap some long lines. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Milena. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 3e70841..44e4211 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -261,9 +261,10 @@ $(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. - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + find $(USER_REFMAN).tmp -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -348,7 +349,8 @@ $(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. - perl -pi -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ + perl -pi \ + -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -776,9 +778,10 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - perl -pi \ - -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` + find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + {} \; # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/milena/$$d; \ @@ -786,9 +789,10 @@ install-data-local: done ## Try GNU chmod's X mode before resorting to something slower but ## more standard. - chmod -R a+rX $(DESTDIR)$(htmldir)/milena/ || \ - find $(DESTDIR)$(htmldir)/milena/ $ -type d -a -exec chmod a+rx {} \; $ \ - -o -exec chmod a+r {} \; + chmod -R a+rX $(DESTDIR)$(htmldir)/milena/ || \ + find $(DESTDIR)$(htmldir)/milena \ + $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; uninstall-local: for d in $(DATA_html_dirs_inst); do \ @@ -803,5 +807,6 @@ uninstall-local: doc-teamcity: - perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

11 years, 6 months

olena: olena-2.0-557-gf7d1607 Shell-related portability fixes in Olena's Makefiles.

by Roland Levillain

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. --- ChangeLog | 8 ++++++++ doc/Makefile.am | 27 +++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4cd1f4..aa9606d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Olena's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Olena. diff --git a/doc/Makefile.am b/doc/Makefile.am index e10944a..30fa31d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,9 +121,10 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp/html -name '*.html'` + find $(USER_REFMAN).tmp/html -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -212,10 +213,11 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ - -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` + find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ + {} \; ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ @@ -230,8 +232,9 @@ uninstall-local: doc-teamcity: - perl -pi \ - -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ - -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ + -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

11 years, 6 months

olena: branch mln_trace created: olena-2.0-553-gedc8943

by git＠lrde.epita.fr

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 mln_trace has been created at edc8943687604585b3c202a1a65456ca471f0c1a (commit) - Log ----------------------------------------------------------------- edc8943 Update the documentation of mln_trace. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 6 months

olena: olena-2.0-553-gedc8943 Update the documentation of mln_trace.

by Roland Levillain

* mln/debug/trace.hh: Here. Aesthetic changes. --- milena/ChangeLog | 7 +++++++ milena/mln/debug/trace.hh | 40 +++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..28a569f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-06-13 Roland Levillain <roland(a)lrde.epita.fr> + + Update the documentation of mln_trace. + + * mln/debug/trace.hh: Here. + Aesthetic changes. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/debug/trace.hh b/milena/mln/debug/trace.hh index bddd8a1..e3f3261 100644 --- a/milena/mln/debug/trace.hh +++ b/milena/mln/debug/trace.hh @@ -28,12 +28,14 @@ /// \file /// -/// Definition of the trace entering procedure. +/// Definition of the function entering/exiting tracing mechanism. + +# include <ctime> -# include <string> # include <iostream> +# include <string> # include <stack> -# include <ctime> + # include <mln/core/contract.hh> # define mln_trace(S) \ @@ -49,13 +51,14 @@ namespace mln namespace debug { - /*! \brief Display function calls backtrace. + /*! \brief Trace function calls. This class is meant to be instantiated at the beginning of each routine in olena. It keep trace of the function call backtrace and remember the time in each function. - This class must used at follow: + This class is intended to be used through the mln_trace macro as + follows: \code namespace mln @@ -70,9 +73,9 @@ namespace mln } \endcode - \warning mln_trace() declares a named local variable, so do not - use mln_trace twice in the same scope in order to avoid - duplicate declarations. + \warning mln_trace() declares a local variable (named + mln_trace_), so do not use mln_trace twice in the same scope to + avoid duplicate declarations. */ class trace { @@ -94,10 +97,9 @@ namespace mln private: static std::stack<std::clock_t> start_times_; - static std::stack<std::string> scopes_; + static std::stack<std::string> scopes_; static unsigned max_tab_; static bool is_quiet_; - }; @@ -167,17 +169,17 @@ namespace mln std::clock_t now = std::clock(); if (start_times_.top() > now) - { - std::cerr << "warning: bad timer in trace handling" << std::endl; - // FIXME: So what? - } + std::cerr + << "Warning: Clock skew detected (start time in the future)." + << std::endl; if (start_times_.top() < now) - { - std::cout << "- " - << ((float(now) - float(start_times_.top())) / CLOCKS_PER_SEC) - << "s "; - } + { + std::cout + << "- " + << ((float(now) - float(start_times_.top())) / CLOCKS_PER_SEC) + << "s "; + } start_times_.pop(); -- 1.7.10.4

11 years, 6 months

olena: olena-2.0-593-g609a6a4 Edge response elimination done

by Anthony Seure

--- milena/sandbox/anthony/src/main.cc | 583 ++++++++++++++++++++++++++++++++++++ 1 files changed, 583 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/anthony/src/main.cc diff --git a/milena/sandbox/anthony/src/main.cc b/milena/sandbox/anthony/src/main.cc new file mode 100644 index 0000000..eea1c86 --- /dev/null +++ b/milena/sandbox/anthony/src/main.cc @@ -0,0 +1,583 @@ +#include <mln/core/image/image2d.hh> +#include <mln/data/all.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/ppm/save.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/literal/all.hh> +#include <mln/value/int_s8.hh> + +#include <cmath> + +#include "keypoint.hh" + +using namespace mln; + +// Set the gaussian kernel +float *gaussian_kernel() +{ + float variance = sqrt(2.0); + unsigned index = 0; + float *kernel = new float[49]; + static const float pi = 4.0 * atan(1.0); + float div = (2.0 * pi * variance); + + for (int i = -3; i < 4; ++i) + { + for (int j = -3; j < 4; ++j) + { + float e = exp(- (i*i + j*j) / (2.0 * variance) ); + kernel[index++] = e / div; + } + } + + return kernel; +} + +// Apply the convolution of the image by the kernel +template<typename I> +void convolve(const I& original, I& filtered, float *kernel) +{ + mln_piter(I) p(filtered.domain()); + window2d win; + + for (int i = -3; i < 4; ++i) + for (int j = -3; j < 4; ++j) + win.insert(i, j); + + // Iterate through all image sites + for_all(p) + { + // Create the window around the site + mln_qiter(window2d) q(win, p); + float sum = 0; + int index = 0; + + // Iterate through all window image sites + for_all(q) + { + if (filtered.has(q)) + sum += original(q) * kernel[index++]; + else + sum += 127 * kernel[index++]; + } + + filtered(p) = static_cast<int>(sum); + } +} + +// Blur the image thanks to a convolution matrix +template<typename I> +I blur(const I& original) +{ + I filtered; + float *kernel = gaussian_kernel(); + + initialize(filtered, original); + convolve(original, filtered, kernel); + + return filtered; +} + +// Downscale by 2 the image resolution +template<typename I> +I downscaling2(const I& original) +{ + mln_piter(I) p(original.domain()); + window2d win; + int index = 0; + + // Initialize the rescaled image + box2d size(original.nrows() / 2, original.ncols() / 2); + I reduced(size); + + // Set the 2x2 window matrix + for (int i = 0; i < 2; ++i) + for (int j = 0; j < 2; ++j) + win.insert(i, j); + + // Iterate through all image sites + for_all(p) + { + // Get 1/4 of total pixels + if (index % 2 == 0) + { + int i = (index % original.ncols()) / 2; + int j = (index / original.ncols()) / 2; + int count = 0; + int sum = 0; + mln_qiter(window2d) q(win, p); + + // Iterate through all window image sites + for_all(q) + { + if (original.has(q)) + { + sum += original(q); + ++count; + } + } + + if (reduced.has(point2d(j, i))) + opt::at(reduced, j, i) = sum / count; + } + + ++index; + } + + return reduced; +} + +float *upscalingTL_kernel() +{ + const static float one = 1.0 / 8.0; + const static float two = 2.0 / 8.0; + const static float three = 2.0 / 8.0; + const static float four = 3.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingTR_kernel() +{ + const static float one = 2.0 / 8.0; + const static float two = 1.0 / 8.0; + const static float three = 3.0 / 8.0; + const static float four = 2.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingBL_kernel() +{ + const static float one = 2.0 / 8.0; + const static float two = 3.0 / 8.0; + const static float three = 1.0 / 8.0; + const static float four = 2.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingBR_kernel() +{ + const static float one = 3.0 / 8.0; + const static float two = 2.0 / 8.0; + const static float three = 2.0 / 8.0; + const static float four = 1.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +template<typename I> +unsigned upscalePixel(const I& original, int i, int j, int type) +{ + float *kernel; + window2d win; + mln_psite(I) p(i, j); + float value = 0; + unsigned index = 0; + int iStart = 0; + int jStart = 0; + + if (type == 0) + { + kernel = upscalingTL_kernel(); + iStart = -1; + jStart = -1; + } + else if (type == 1) + { + kernel = upscalingTR_kernel(); + iStart = 0; + jStart = -1; + } + else if (type == 2) + { + kernel = upscalingBL_kernel(); + iStart = -1; + jStart = 0; + } + else + { + kernel = upscalingBR_kernel(); + iStart = 0; + jStart = 0; + } + + for (int ii = iStart; ii < iStart + 2; ++ii) + for (int jj = jStart; jj < jStart + 2; ++jj) + win.insert(ii, jj); + + mln_qiter(window2d) q(win, p); + + for_all(q) + { + if (original.has(q)) + { + value += original(q) * kernel[index]; + } + + ++index; + } + + return (static_cast<int>(value)); +} + +// Upscale by 2 the image resolution +template<typename I> +I upscaling2(const I& original) +{ + box2d size(original.nrows() * 2, original.ncols() * 2); + I upscaled(size); + + mln_piter(I) p(upscaled.domain()); + int index = 0; + + for_all(p) + { + int i = p.col(); + int j = p.row(); + + if (i % 2 == 0 && j % 2 == 0) // Top left + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 0); + else if (i % 2 == 0) // Bottom left + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 2); + else if (j % 2 == 0) // Top right + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 1); + else // Bottom right + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 3); + + ++index; + } + + + return upscaled; +} + +// Build the n-th octave on b blur levels +template<typename I> +void buildOctave(const I& original, + unsigned n, + unsigned b, + std::vector< std::vector >& scaleSpace) +{ + std::vector octave; + std::stringstream name; + I blured; + initialize(blured, original); + + name << "output/SS-o" << n << "-0.pgm"; + io::pgm::save(original, name.str()); + + octave.push_back(original); + blured = duplicate(original); + + for(unsigned i = 1; i <= b; i *= 2) + { + blured = blur(blured); + octave.push_back(blured); + + name.str(""); + name << "output/SS-o" << n << "-" < +void buildScaleSpace(std::vector< std::vector >& scaleSpace, + const I& original, + unsigned n, + unsigned b) +{ + if (n > 2) + { + // Upscaled octave + I upscaled = upscaling2(original); + buildOctave(upscaled, 0, b, scaleSpace); + + // 1st octave + buildOctave(original, 1, b, scaleSpace); + + // 2nd octave + I downscaled = downscaling2(original); + buildOctave(downscaled, 2, b, scaleSpace); + + for (unsigned i = 3; i <= n; ++i) + { + // i-th octave + downscaled = downscaling2(downscaled); + buildOctave(downscaled, i, b, scaleSpace); + } + } + else + { + std::cerr << "ERROR: buildScaleSpace: Wrong level number (" << n << ")" + << std::endl; + } +} + +// Build the DoG pyramid of the scale space +template<typename I> +void buildDifferenceOfGaussianSpace(std::vector< std::vector >& scaleSpace, + std::vector< std::vector >& dogSpace) +{ + for (unsigned i = 0; i < scaleSpace.size(); ++i) + { + std::vector octave = scaleSpace.at(i); + std::vector dogOctave; + + for (unsigned j = 0; j < octave.size() - 1; ++j) + { + std::stringstream name; + I level1 = octave.at(j); + I level2 = octave.at(j + 1); + I dog; + + initialize(dog, level1); + + mln_piter(I) p(level1.domain()); + + for_all(p) + { + int diff = ((int) level1(p)) - ((int) level2(p)); + dog(p) = (diff >= 0) ? diff : 0; + } + + dogOctave.push_back(dog); + name << "output/DoG_o" < +void find_extremum(T& min, T& max, const I& current, N n) +{ + for_all(n) + { + if (current(n) > max) + max = current(n); + + if (current(n) < min) + min = current(n); + } +} + +// Find the minimum value in the upper and lower layers around p +template<typename T, typename I, typename P> +void find_min(T& min, const I& upper, const I& lower, const P& pUpper, const P& pLower) +{ + mln_niter(neighb2d) nUpper(c8(), pUpper); + mln_niter(neighb2d) nLower(c8(), pLower); + + // Upper processing + for_all(nUpper) + if (upper(nUpper) < min) + min = upper(nUpper); + + // Lower processing + for_all(nLower) + if (lower(nLower) < min) + min = lower(nLower); +} + +// Find the maximum value in the upper and lower layers around p +template<typename T, typename I, typename P> +void find_max(T& max, const I& upper, const I& lower, const P& pUpper, const P& pLower) +{ + mln_niter(neighb2d) nUpper(c8(), pUpper); + mln_niter(neighb2d) nLower(c8(), pLower); + + // Upper processing + for_all(nUpper) + if (upper(nUpper) > max) + max = upper(nUpper); + + // Lower processing + for_all(nLower) + if (lower(nLower) > max) + max = lower(nLower); +} + +template<typename T, typename I, typename P> +bool hasEdgeResponse(const I& dog, const P& p, const T& center) +{ + const static float bound_ratio = 12.1; + + /* Set the neighbors: + * n5 n1 n6 + * n2 p n3 + * n7 n4 n8 + */ + float n1 = dog(mln_psite(I)(p.row() - 1, p.col())); + float n2 = dog(mln_psite(I)(p.row(), p.col() - 1)); + float n3 = dog(mln_psite(I)(p.row(), p.col() + 1)); + float n4 = dog(mln_psite(I)(p.row() + 1, p.col())); + + float n5 = dog(mln_psite(I)(p.row() - 1, p.col() - 1)); + float n6 = dog(mln_psite(I)(p.row() - 1, p.col() + 1)); + float n7 = dog(mln_psite(I)(p.row() + 1, p.col() - 1)); + float n8 = dog(mln_psite(I)(p.row() + 1, p.col() + 1)); + + // Set Hessian matrix and find the ratio + + float dxx = n3 - 2.0 * center + n2; + float dyy = n4 - 2.0 * center + n1; + + float dxy = (n8 - n6 - n7 + n5) / 4.0; + float trace = dxx + dyy; + float determinant = dxx * dyy - dxy * dxy; + + if (determinant <= 0) + return true; + + float ratio = (trace * trace) / determinant; + + return (ratio >= bound_ratio); +} + +// Build the extrema image +template<typename I, typename C> +void buildExtrema(C extrema, + I original, + std::vector< std::vector >& dogSpace, + std::vector<Keypoint>& keypoints) +{ + const bool black = false; + + if (black) + initialize(extrema, original); + else + extrema = data::convert(value::rgb8(), original); + + // Number of scales (gaussian meaning) + unsigned scales = dogSpace.at(0).size(); + + // Iterates through all scales + for (unsigned i = 0; i < scales; ++i) + { + // Iterates through all resolutions + for (unsigned j = 1; j < dogSpace.size() - 1; ++j) + { + I current = dogSpace.at(j).at(i); + I upper = dogSpace.at(j+1).at(i); + I lower = dogSpace.at(j-1).at(i); + + mln_piter(I) p(current.domain()); + + for_all(p) + { + value::int_u8 min = 255; + value::int_u8 max = 0; + value::int_u8 center = 0; + + mln_niter(neighb2d) n(c8(), p); + center = current(p); + + mln_psite(I) pUpper(p.row() / 2, p.col() / 2); + mln_psite(I) pLower(p.row() * 2, p.col() * 2); + + // Find the min and max in the current neighborhood (c8) + find_extremum(min, max, current, n); + + if (center <= min) + { + // Find the min in other levels of the pyramid + find_min(min, upper, lower, pUpper, pLower); + + if (center < min && !hasEdgeResponse(current, p, center)) + { + mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), + p.col() * pow(2, (j-1))); + extrema(pOriginal) = literal::green; + keypoints.push_back(Keypoint(p.row(), p.col(), j, i, false)); + } + } + else if (center >= max) + { + // Find the max in other levels of the pyramid + find_max(max, upper, lower, pUpper, pLower); + + if (center > max && !hasEdgeResponse(current, p, center)) + { + mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), + p.col() * pow(2, (j-1))); + extrema(pOriginal) = literal::red; + keypoints.push_back(Keypoint(p.row(), p.col(), j, i, true)); + } + } + } + } + } + + io::ppm::save(extrema, "output/extrema.ppm"); +} + +template<typename I> +void discardEdgeResponses(std::vector< std::vector >& dogSpace, + std::vector<Keypoint>& keypoints) +{ + // FIXME Move work from buildExtrema here +} + +// Main entry point +int main(int argc, char** argv) +{ + typedef image2d<value::int_u8> I; + typedef image2d<value::rgb8> C; + + const unsigned blur_level = 5; + const unsigned octave_level = 3; + std::vector< std::vector > scaleSpace; + std::vector< std::vector > dogSpace; + std::vector<Keypoint> keypoints; + I original; + C extrema; + + io::pgm::load(original, "images/lena.pgm"); + + buildScaleSpace(scaleSpace, original, octave_level, blur_level); + buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); + buildExtrema(extrema, original, dogSpace, keypoints); + // TODO Interpolation of nearby data for accurate position + // TODO Discard low-contrast keypoints + //discardEdgeResponses(dogSpace, keypoints); + + std::cout << keypoints.size() << std::endl; + + + return 0; +} -- 1.7.2.5

11 years, 6 months

olena: branch sandbox/anthony updated: olena-2.0-593-g609a6a4

by git＠lrde.epita.fr

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 sandbox/anthony has been updated via 609a6a45b6b5d8725a1f7da78aa50604c841be44 (commit) from e6c9b2483d5651c061cad24ace0a87a7a8ce8a4d (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 ----------------------------------------------------------------- 609a6a4 Edge response elimination done ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/src/main.cc | 583 ++++++++++++++++++++++++++++++++++++ 1 files changed, 583 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/anthony/src/main.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 6 months

olena: olena-2.0-592-ge6c9b24 Add Keypoint class and start extremum elimination

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/keypoint.cc | 18 + milena/sandbox/anthony/src/keypoint.hh | 27 ++ milena/sandbox/anthony/src/scale_space.cc | 517 ----------------------------- 4 files changed, 46 insertions(+), 518 deletions(-) create mode 100644 milena/sandbox/anthony/src/keypoint.cc create mode 100644 milena/sandbox/anthony/src/keypoint.hh delete mode 100644 milena/sandbox/anthony/src/scale_space.cc diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index e43db7f..ff62f9e 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -4,7 +4,7 @@ CFLAGS=-Wall -Werror CLIBS=-I../../ CLEAN=*.o output/* log -SRC=src/scale_space.cc +SRC=src/main.cc src/keypoint.cc OUTPUT=a.out all: scale diff --git a/milena/sandbox/anthony/src/keypoint.cc b/milena/sandbox/anthony/src/keypoint.cc new file mode 100644 index 0000000..bf0a5f5 --- /dev/null +++ b/milena/sandbox/anthony/src/keypoint.cc @@ -0,0 +1,18 @@ +#include "keypoint.hh" + +// Constructor +Keypoint::Keypoint(unsigned i, unsigned j, + unsigned scale, unsigned size, bool maximum) +{ + this->i = i; + this->j = j; + this->scale = scale; + this->size = size; + this->maximum = maximum; +} + +// Getters +unsigned Keypoint::getI() { return i; } +unsigned Keypoint::getJ() { return j; } +unsigned Keypoint::getScale() { return scale; } +unsigned Keypoint::getSize() { return size; } diff --git a/milena/sandbox/anthony/src/keypoint.hh b/milena/sandbox/anthony/src/keypoint.hh new file mode 100644 index 0000000..798a980 --- /dev/null +++ b/milena/sandbox/anthony/src/keypoint.hh @@ -0,0 +1,27 @@ +#ifndef KEYPOINT_HH +# define KEYPOINT_HH + +# include <ostream> + +class Keypoint +{ + public: + // Constructor + Keypoint(unsigned i, unsigned j, + unsigned scale, unsigned size, bool maximum); + + // Getters + unsigned getI(); + unsigned getJ(); + unsigned getScale(); + unsigned getSize(); + + private: + unsigned i; + unsigned j; + unsigned scale; + unsigned size; + bool maximum; +}; + +#endif /* ! KEYPOINT_HH */ diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc deleted file mode 100644 index 87853ef..0000000 --- a/milena/sandbox/anthony/src/scale_space.cc +++ /dev/null @@ -1,517 +0,0 @@ -#include <mln/core/image/image2d.hh> -#include <mln/data/all.hh> -#include <mln/io/pgm/all.hh> -#include <mln/io/ppm/save.hh> -#include <mln/core/alias/neighb2d.hh> -#include <mln/literal/all.hh> -#include <mln/value/int_s8.hh> - -#include <cmath> - -using namespace mln; - -// Set the gaussian kernel -float *gaussian_kernel() -{ - float variance = sqrt(2.0); - unsigned index = 0; - float *kernel = new float[49]; - static const float pi = 4.0 * atan(1.0); - float div = (2.0 * pi * variance); - - for (int i = -3; i < 4; ++i) - { - for (int j = -3; j < 4; ++j) - { - float e = exp(- (i*i + j*j) / (2.0 * variance) ); - kernel[index++] = e / div; - } - } - - return kernel; -} - -// Apply the convolution of the image by the kernel -template<typename I> -void convolve(const I& original, I& filtered, float *kernel) -{ - mln_piter(I) p(filtered.domain()); - window2d win; - - for (int i = -3; i < 4; ++i) - for (int j = -3; j < 4; ++j) - win.insert(i, j); - - // Iterate through all image sites - for_all(p) - { - // Create the window around the site - mln_qiter(window2d) q(win, p); - float sum = 0; - int index = 0; - - // Iterate through all window image sites - for_all(q) - { - if (filtered.has(q)) - sum += original(q) * kernel[index++]; - else - sum += 127 * kernel[index++]; - } - - filtered(p) = static_cast<int>(sum); - } -} - -// Blur the image thanks to a convolution matrix -template<typename I> -I blur(const I& original) -{ - I filtered; - float *kernel = gaussian_kernel(); - - initialize(filtered, original); - convolve(original, filtered, kernel); - - return filtered; -} - -// Downscale by 2 the image resolution -template<typename I> -I downscaling2(const I& original) -{ - mln_piter(I) p(original.domain()); - window2d win; - int index = 0; - - // Initialize the rescaled image - box2d size(original.nrows() / 2, original.ncols() / 2); - I reduced(size); - - // Set the 2x2 window matrix - for (int i = 0; i < 2; ++i) - for (int j = 0; j < 2; ++j) - win.insert(i, j); - - // Iterate through all image sites - for_all(p) - { - // Get 1/4 of total pixels - if (index % 2 == 0) - { - int i = (index % original.ncols()) / 2; - int j = (index / original.ncols()) / 2; - int count = 0; - int sum = 0; - mln_qiter(window2d) q(win, p); - - // Iterate through all window image sites - for_all(q) - { - if (original.has(q)) - { - sum += original(q); - ++count; - } - } - - if (reduced.has(point2d(j, i))) - opt::at(reduced, j, i) = sum / count; - } - - ++index; - } - - return reduced; -} - -float *upscalingTL_kernel() -{ - const static float one = 1.0 / 8.0; - const static float two = 2.0 / 8.0; - const static float three = 2.0 / 8.0; - const static float four = 3.0 / 8.0; - - float *kernel = new float[4]; - - kernel[0] = one; - kernel[1] = two; - kernel[2] = three; - kernel[3] = four; - - return kernel; -} - -float *upscalingTR_kernel() -{ - const static float one = 2.0 / 8.0; - const static float two = 1.0 / 8.0; - const static float three = 3.0 / 8.0; - const static float four = 2.0 / 8.0; - - float *kernel = new float[4]; - - kernel[0] = one; - kernel[1] = two; - kernel[2] = three; - kernel[3] = four; - - return kernel; -} - -float *upscalingBL_kernel() -{ - const static float one = 2.0 / 8.0; - const static float two = 3.0 / 8.0; - const static float three = 1.0 / 8.0; - const static float four = 2.0 / 8.0; - - float *kernel = new float[4]; - - kernel[0] = one; - kernel[1] = two; - kernel[2] = three; - kernel[3] = four; - - return kernel; -} - -float *upscalingBR_kernel() -{ - const static float one = 3.0 / 8.0; - const static float two = 2.0 / 8.0; - const static float three = 2.0 / 8.0; - const static float four = 1.0 / 8.0; - - float *kernel = new float[4]; - - kernel[0] = one; - kernel[1] = two; - kernel[2] = three; - kernel[3] = four; - - return kernel; -} - -template<typename I> -unsigned upscalePixel(const I& original, int i, int j, int type) -{ - float *kernel; - window2d win; - mln_psite(I) p(i, j); - float value = 0; - unsigned index = 0; - int iStart = 0; - int jStart = 0; - - if (type == 0) - { - kernel = upscalingTL_kernel(); - iStart = -1; - jStart = -1; - } - else if (type == 1) - { - kernel = upscalingTR_kernel(); - iStart = 0; - jStart = -1; - } - else if (type == 2) - { - kernel = upscalingBL_kernel(); - iStart = -1; - jStart = 0; - } - else - { - kernel = upscalingBR_kernel(); - iStart = 0; - jStart = 0; - } - - for (int ii = iStart; ii < iStart + 2; ++ii) - for (int jj = jStart; jj < jStart + 2; ++jj) - win.insert(ii, jj); - - mln_qiter(window2d) q(win, p); - - for_all(q) - { - if (original.has(q)) - { - value += original(q) * kernel[index]; - } - - ++index; - } - - return (static_cast<int>(value)); -} - -// Upscale by 2 the image resolution -template<typename I> -I upscaling2(const I& original) -{ - box2d size(original.nrows() * 2, original.ncols() * 2); - I upscaled(size); - - mln_piter(I) p(upscaled.domain()); - int index = 0; - - for_all(p) - { - int i = p.col(); - int j = p.row(); - - if (i % 2 == 0 && j % 2 == 0) // Top left - opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 0); - else if (i % 2 == 0) // Bottom left - opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 2); - else if (j % 2 == 0) // Top right - opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 1); - else // Bottom right - opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 3); - - ++index; - } - - - return upscaled; -} - -// Build the n-th octave on b blur levels -template<typename I> -void buildOctave(const I& original, - unsigned n, - unsigned b, - std::vector< std::vector >& scaleSpace) -{ - std::vector octave; - std::stringstream name; - I blured; - initialize(blured, original); - - name << "output/SS-o" << n << "-0.pgm"; - io::pgm::save(original, name.str()); - - octave.push_back(original); - blured = duplicate(original); - - for(unsigned i = 1; i <= b; i *= 2) - { - blured = blur(blured); - octave.push_back(blured); - - name.str(""); - name << "output/SS-o" << n << "-" < -void buildScaleSpace(std::vector< std::vector >& scaleSpace, - const I& original, - unsigned n, - unsigned b) -{ - if (n > 2) - { - // Upscaled octave - I upscaled = upscaling2(original); - buildOctave(upscaled, 0, b, scaleSpace); - - // 1st octave - buildOctave(original, 1, b, scaleSpace); - - // 2nd octave - I downscaled = downscaling2(original); - buildOctave(downscaled, 2, b, scaleSpace); - - for (unsigned i = 3; i <= n; ++i) - { - // i-th octave - downscaled = downscaling2(downscaled); - buildOctave(downscaled, i, b, scaleSpace); - } - } - else - { - std::cerr << "ERROR: buildScaleSpace: Wrong level number (" << n << ")" - << std::endl; - } -} - -// Build the DoG pyramid of the scale space -template<typename I> -void buildDifferenceOfGaussianSpace(std::vector< std::vector >& scaleSpace, - std::vector< std::vector >& dogSpace) -{ - for (unsigned i = 0; i < scaleSpace.size(); ++i) - { - std::vector octave = scaleSpace.at(i); - std::vector dogOctave; - - for (unsigned j = 0; j < octave.size() - 1; ++j) - { - std::stringstream name; - I level1 = octave.at(j); - I level2 = octave.at(j + 1); - I dog; - - initialize(dog, level1); - - mln_piter(I) p(level1.domain()); - - for_all(p) - { - int diff = ((int) level1(p)) - ((int) level2(p)); - dog(p) = (diff >= 0) ? diff : 0; - } - - dogOctave.push_back(dog); - name << "output/DoG_o" < -void find_extremum(T& min, T& max, const I& current, N n) -{ - for_all(n) - { - if (current(n) > max) - max = current(n); - - if (current(n) < min) - min = current(n); - } -} - -// Find the minimum value in the upper and lower layers around p -template<typename T, typename I, typename P> -void find_min(T& min, const I& upper, const I& lower, const P& pUpper, const P& pLower) -{ - mln_niter(neighb2d) nUpper(c8(), pUpper); - mln_niter(neighb2d) nLower(c8(), pLower); - - // Upper processing - for_all(nUpper) - if (upper(nUpper) < min) - min = upper(nUpper); - - // Lower processing - for_all(nLower) - if (lower(nLower) < min) - min = lower(nLower); -} - -// Find the maximum value in the upper and lower layers around p -template<typename T, typename I, typename P> -void find_max(T& max, const I& upper, const I& lower, const P& pUpper, const P& pLower) -{ - mln_niter(neighb2d) nUpper(c8(), pUpper); - mln_niter(neighb2d) nLower(c8(), pLower); - - // Upper processing - for_all(nUpper) - if (upper(nUpper) > max) - max = upper(nUpper); - - // Lower processing - for_all(nLower) - if (lower(nLower) > max) - max = lower(nLower); -} - -// Build the extrema image -template<typename I, typename C> -void buildExtrema(C extrema, - I original, - std::vector< std::vector >& dogSpace) -{ - extrema = data::convert(value::rgb8(), original); - - const unsigned blur_level = dogSpace.at(0).size(); - - //unsigned i = 0; - for (unsigned i = 0; i < blur_level; ++i) - { - for (unsigned j = 1; j < dogSpace.size() - 1; ++j) - { - I current = dogSpace.at(j).at(i); - I upper = dogSpace.at(j+1).at(i); - I lower = dogSpace.at(j-1).at(i); - - mln_piter(I) p(current.domain()); - - for_all(p) - { - value::int_u8 min = 255; - value::int_u8 max = 0; - value::int_u8 center = 0; - - mln_niter(neighb2d) n(c8(), p); - center = current(p); - - mln_psite(I) pUpper(p.row() / 2, p.col() / 2); - mln_psite(I) pLower(p.row() * 2, p.col() * 2); - - find_extremum(min, max, current, n); - - if (center <= min) - { - find_min(min, upper, lower, pUpper, pLower); - - if (center < min) - { - mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), - p.col() * pow(2, (j-1))); - extrema(pOriginal) = literal::red; - } - } - else if (center >= max) - { - find_max(max, upper, lower, pUpper, pLower); - - if (center > max) - { - mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), - p.col() * pow(2, (j-1))); - extrema(pOriginal) = literal::red; - } - } - } - } - } - - io::ppm::save(extrema, "output/extrema.ppm"); -} - -// Main entry point -int main(int argc, char** argv) -{ - typedef image2d<value::int_u8> I; - typedef image2d<value::rgb8> C; - - const unsigned blur_level = 5; - const unsigned octave_level = 4; - std::vector< std::vector > scaleSpace; - std::vector< std::vector > dogSpace; - I original; - C extrema; - - io::pgm::load(original, "images/lena.pgm"); - - buildScaleSpace(scaleSpace, original, octave_level, blur_level); - buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); - buildExtrema(extrema, original, dogSpace); - - return 0; -} -- 1.7.2.5

11 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2013