- Olena-patches

[PATCH 5/9] Do not distribute scribo/ by default.
by Roland Levillain 11 Jun '09

11 Jun '09

* Makefile.am (dist-hook): Strip parts related to SCRIBO by default. Tag parts to be stripped by default with `<<lrde' and `>>'. * configure.ac: Likewise. --- ChangeLog | 9 +++++++++ Makefile.am | 24 ++++++++++++++++++++++++ configure.ac | 5 ++++- 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a34bb08..44f6b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + Do not distribute scribo/ by default. + + * Makefile.am (dist-hook): Strip parts related to SCRIBO by + default. + Tag parts to be stripped by default with `<<lrde' and `>>'. + * configure.ac: Likewise. + +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + Add a script stripping parts of the distribution. * build-aux/strip-lrde: New. diff --git a/Makefile.am b/Makefile.am index 45a5954..b812d95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,11 @@ if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA +#<<lrde if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO +#>> # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = doc pretty-check tests @@ -38,3 +40,25 @@ $(LOCAL_RECURSIVE_TARGETS): # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += milena scribo + + +#<<lrde +# Unless Make variable MAINTAINER is set to `true' (e.g. by calling +# `make dist MAINTAINER=true'), do not distribute parts tagged `lrde' +# (see build-aux/strip-lrde). +# +# Remove any trace of olena/oln/lrde from the distribution and reset +# the GNU build system for the distdir layout. +dist-hook: + if test x$(MAINTAINER) != xtrue; then \ + $(top_srcdir)/build-aux/strip-lrde $(distdir)/configure.ac && \ + $(top_srcdir)/build-aux/strip-lrde $(distdir)/Makefile.am && \ + rm -rf $(distdir)/scribo && \ + ( \ + cd $(distdir); \ + set -evx; \ + autoreconf -f -v -i \ + find . -name autom4te.cache | xargs rm -rf \ + ) \ + fi +#>> diff --git a/configure.ac b/configure.ac index 706f02e..8c89918 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,9 @@ AC_ARG_ENABLE([all], enable_trimesh=yes with_swig=yes enable_swilena=yes +#<<lrde enable_scribo=yes +#>> enable_apps=yes enable_tools=yes ]) @@ -184,6 +186,7 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) +#<<lrde ## -------- ## ## Scribo. ## ## -------- ## @@ -212,7 +215,7 @@ AC_CONFIG_FILES([ scribo/tests/text/Makefile scribo/tests/unit_test/Makefile ]) - +#>> ## --------------- ## ## Configuration. ## -- 1.6.2.4

1 0

[PATCH 4/9] Add a script stripping parts of the distribution.
by Roland Levillain 11 Jun '09

11 Jun '09

* build-aux/strip-lrde: New. Imported from Olena 0.11. --- ChangeLog | 7 +++++++ build-aux/strip-lrde | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100755 build-aux/strip-lrde diff --git a/ChangeLog b/ChangeLog index 6379bc0..a34bb08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + + Add a script stripping parts of the distribution. + + * build-aux/strip-lrde: New. + Imported from Olena 0.11. + 2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Configure and bootstrap Scribo correctly. diff --git a/build-aux/strip-lrde b/build-aux/strip-lrde new file mode 100755 index 0000000..f1c6077 --- /dev/null +++ b/build-aux/strip-lrde @@ -0,0 +1,34 @@ +#! /bin/sh +# Copyright (C) 2007 EPITA Research and Development Laboratory +# +# This file is part of the Olena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# As a special exception, you may use this file as part of a free +# software library without restriction. Specifically, if other files +# instantiate templates or use macros or inline functions from this +# file, or you compile this file and link it with other files to +# produce an executable, this file does not by itself cause the +# resulting executable to be covered by the GNU General Public +# License. This exception does not however invalidate any other +# reasons why the executable file might be covered by the GNU General +# Public License. + + +# Remove everything between `<<lrde' and `>>'. +# This is awful, but it's working. +exec perl -0777 -pi -e \ + 's/\n\s*#\s*<<lrde(.|\n)+?\n\s*#\s*>>\s*\n/\n\n/g' \ + "$@" -- 1.6.2.4

1 0

[PATCH 3/9] Regen some reference images of the documentation (on Debian GNU/Linux).
by Roland Levillain 11 Jun '09

11 Jun '09

* doc/figures/fill-subdomain-2.ppm,, * doc/figures/fill-subdomain-3.ppm, * doc/figures/labeling-compute-2.ppm, * doc/figures/tuto3_colorize-2.ppm, * doc/figures/tuto4_genericity_and_algorithms-5.ppm: Regen. --- milena/ChangeLog | 11 +++++++++++ milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 206 bytes milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 191 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12406 bytes 6 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 761ce5c..846caf9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + Regen some reference images of the documentation (on Debian GNU/Linux). + + * doc/figures/fill-subdomain-2.ppm,, + * doc/figures/fill-subdomain-3.ppm, + * doc/figures/labeling-compute-2.ppm, + * doc/figures/tuto3_colorize-2.ppm, + * doc/figures/tuto4_genericity_and_algorithms-5.ppm: + Regen. + +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + * doc/examples/Makefile.am: Clean up whitespace. 2009-06-11 Edwin Carlinet <carlinet(a)lrde.epita.fr> diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index e3a7982f41f6a1484c3254833a89f3673b992c9e..7bfa0e4c45344b8acdbefee7347dd890f15031a2 100644 GIT binary patch delta 94 wcmX@dc#d&GdARDibRc4Y0W>a57(^@2GzTIeBQhoo!iBJbTp)r-0YxAH0E}l4T>t<8 delta 94 wcmX@dc#d&GdAMnAHV`qu02&u245D8c%>yDJWBV-~2p7Tza)AgU1r&h*0N5E71poj5 diff --git a/milena/doc/figures/fill-subdomain-3.ppm b/milena/doc/figures/fill-subdomain-3.ppm index 7e344cee6274a7d10e4008ee6ca865c6ece134a7..037dec623f7a3629cc0b4cc0523eb091071ccfc4 100644 GIT binary patch delta 52 bcmX@dc#d(xLS5B!=|IE)1ITQk7#bG<KUfH5 delta 52 bcmX@dc#d(xLS56`Y#?HQ0c18%42=r_83+e4 diff --git a/milena/doc/figures/labeling-compute-2.ppm b/milena/doc/figures/labeling-compute-2.ppm index e3a7982f41f6a1484c3254833a89f3673b992c9e..7bfa0e4c45344b8acdbefee7347dd890f15031a2 100644 GIT binary patch delta 94 wcmX@dc#d&GdARDibRc4Y0W>a57(^@2GzTIeBQhoo!iBJbTp)r-0YxAH0E}l4T>t<8 delta 94 wcmX@dc#d&GdAMnAHV`qu02&u245D8c%>yDJWBV-~2p7Tza)AgU1r&h*0N5E71poj5 diff --git a/milena/doc/figures/tuto3_colorize-2.ppm b/milena/doc/figures/tuto3_colorize-2.ppm index ebcf745d4c9b8ee6b805d82a5def21568cb22dcf..c7b0c0151897e22f7a089ef8d7f16af669a11061 100644 GIT binary patch delta 82 zcmdnbxSw%CiMNP^6cG6-ZUrL6NoH^^kPSo^bCy960~l;Nc)c({6iB|;+5$vC1_VL4 E0GcWzGynhq delta 82 zcmdnbxSw%CiMPtqJ|I#r%?2VPWfeFV$OfVv7Mc*m00x=nuLGQ=faJk75<moGKoEor E0HgRGZvX%Q diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm index 4efa88ca45f9ce3bd0b22f16fdf93cd150d56967..caa01857a968090f4ef06142068aa3c47e3c090d 100644 GIT binary patch literal 12406 zcmdUtzl&W}6osv)x6<N55TeB!CnO`-sF)~1lrRKA(Bj3pn!q?SJRd?z!T&*Q)2Fep zOru~Sq!+<P#DBvr3qBV6oO|xQ&-?rlhQm60uf6tnPu`v5gDc(J{dvDxZ~N2k-ox(Q z2WS2Hx;t9E+;#W2+sjuE4=?_ztj;#4{i?rwuwAb{*~HYXJMY|mqdVz8@7J4;?|19- z)9z;fMSpg2`B{Iy?QXB{T}0@`=3#gB_Q}m#FCH9U?~bn@T)T1O;Dx83R{x%v|L@8- zuf*T<x$0hukrTR|_Q8km<9E@XTB_?Ct9r^O3=J*?+0LnMr}!V|hqEC@KcPC?ezaNL z=e~Qk;jeD@Vq;b<H={?V8irXRn5!bTM4hv`ltI~atvVY;LaJi7K}|(q5-H7r*`7Q@ zSNu~%HKZIYZQ+Tc&Y`aAq?NWtg{e_dhLj`j@vhfhhleYEDiZ~Rqap?3S3RyFI8!&x zme;v{Phhqxa7Gs$0<(%-UARB#pMHGe6{fs6MKf567*~;;xVkR89)dH8AlIMQ8T8_) zW@=Or6;5eJXoXN$Ew8)&SNOqBkX{$$MED(kKWUd1O+R@<<uK@VS`=OI@;m%~l<aA) zfoTgy+@_)`Za^az=Z~ck?l5z;kE12x^nVFHuHI#@7hMb0E7A-uCCU|1Dd894Uy9jt z_QxMvJlvNqu6<GU@ppKC=idh~nGPTNf58vDzfuGKZ@zyd`^JXWV>S$GVUyq-di<UF zV_k#~@qm%2hWtt+5NwGC{BHbOSA}6U9;mARvPc4AL4IHm0I0%J1cs_eIZPqi@N?gv zb;@@nwKz+Io6&BQPUk<spEkxd@Kl7eA#j#CQQ0ehb)!(D)nN9PLZVWpjl%En`(a&m zBMeU1)&w$(*ek!bJiWSNor^ZJcQq9i9}hhRe(w91TdMqyCk<q3C1$@a%kO)&CCEqN zokzON!IK_yAN=f+X!E-{uyut$uF}}{$DfwQMm>JXpPXDlEh|<2iI1N?nQ$^gq+(pv z)hD<UGlJP6;o}ao6u<9<N=r+Anbq|{*MzuPBm3Y_>td;Par#dvAvrcW1(FkDaekI2 z;Y;C{$6IMCuIfsZe)uQ;c+w}wm5nT-;zC_NOBhdMwv6?VS^PeTW>JW87hU`awYUz= zVyH&#i9eRIuH>Wz8-mu5z=_Z&w0}RCOW}*urP8>TIaC<03T%jd@Do0f0e=XMc!grL zQa!Him)F;oQ&bXR)Y+0+er3EWNKhJsRdbuaI^spbwKSdHMf-SF%SkI;sY~pGpA|48 zXf*_87eoGK`O_8$2%Wl(YZ`3KPUpwzd)tfJUC&8+`e0DSENn>-t2$SNFQSO>E}Cvb zU{0bODZ$E5NS?2M_$vMsRn7nX@cHOQOK0+^UXpmF9Px@fOIo_o3Z3AiB7S{>$5z2q z9JR4DL^7wV4EPg&Nvp5GFTsC78IJR%w|<pQ9$m4OqU!fzjKo!gL;PSPd{LF(4M`7e zPd2~$NYY_z^XsF+R)vrHDF63wzUDC6=oqP6y}IAEn}wQA472!o6UJQ(0k}t+93OEl z+oO{&LnLxtWf+2wF7F?jWK9j7*g_0>NW<V$uEQ|IA1#s3<!^(**0u?93O^nJ>*Ytu zH8uDB)6@Ctq;XQG;zHfuj^4v2!B;dMKb+!^Gc>U&DqSbq2=sAgU4)_JkD@-o$4k8f ze}rgznU*R*Qm5h~x<mX7y7*)J5!dPbkB=T{Y9f4?9Wu0!dkdH;!r|rDCxj-mngc)1 ssx1}CYzt*-_Vr)-6ynz%`0sxEb0h@6{*)Fx9y_Gl*r_`dLOsF%2~_1-8vp<R literal 12406 zcmdUt&59jW6ono4D>x}oFoJYU=<Y#gLbsu@g%A|SH+IDY`;Y5I=z;hSf{>BEgy6_w zKyct(N6wu14sKcSvDoL-sj6#Te?oIuXYaMw{_5mDI@)`!d)Qy~>(!<|@1ERt??1oj zuU6f?{kOaB*=BR|;O^b)zbg9|>+^oUzj?k{?LS?|)XAgM58mk>_n-Bv^~cY;)zx`- z+<)F*T;E*wSDWr^_2fE2uh+NTowLWsCvWZ@9dt(rd-o3y_YN;Vt^U0-|KIQTzlp!; zbJe{RBPVn_?fYNe!tbIzwN%$PR`rxm7#ds(vYk`iPVqm^4`)M+enNG&{b;kgUwrpN z!(ZL*#m1~!ZbpwzH4L*tFjqxvi8^O>DTA`<T6H#xgjB_LgPMxKBvP6Kvpso+uK1^j zYDhU)+QJh>okLyKNh@uQ3R9z^3@Jz4<6W=24i8uSR3-`rM@0(6uX<cVaHejWEw6L^ zp1^EX;EXOh1ZEYvx^REeUp_tX3R7O3q8ThjjH^gaTwRx455bv4kn7Lu40>@?Gc_uR z3a2z9v_hz>me*bXEBs(5NUsZWBK#J=pR`Mhrk}i_av1bFEs8F9`7M4wO7=9@z_bM; zZc|YeH=q%V^T*N%cbK`_$I%jT`o9DpSMRddi>`(06=?>S66K1hl<<r2FU9ORyW@{7 z9_~vQ*S@Iw_*=Zc^X~$fOotEszu*VnU#S8AH{U;!ePcuGF&hT8ut{(ZJ^t4Gu`a@g zc)&<hLw=<Z2)0B6emj1xtHQ7v4^&luStJ3mAU`k&090Wq0z*}#9HtO$__^=TI^{c( zTAZc9&1kntr}H1+PaESJcq+o#5ID=6sO*%#x>2anYA}0CAyFyQM&Y;k{jjdO5e6r0 zYXX@??37<yPCojHbuQY>-qlo8d_43N__^<2ZmIG+o-~lDm6-jyEWhv7mLMO6cOL07 z2Tyv;UGTF@qRsE-z}6N1xJqN&9e-LH8};}le{ymKwX9V6Cq91qWWvb|k&1CuSD)Zc z%m`+OgpWJSQvALbDlIMfWmeY*T@&JFjqHLyt&64F#pyqxgyh)h6i7~p#rav9gfE3( z9&e?oxT-5r`r)7W<4K<!S2nVUiVJo9EMYv2*)rBcX7T$VnnfYXU3Bpy)Z#ici=i5| zBmP**x{{L?YzSII0w+SB(Ej~kE`={rmrCPW=1^h0DzG7T!B6-^2K*s3;uVU~O7*z5 zUtV8VPEkpOQD;kP`IYgiAVFyiR?Thx>WCK!*V1%)7wzL!EhnvXr7p1xepbMYpw$qV zT@3k`<xg82Aav?Bu4%9_JDne=?`<z?cReTR>4QNPv#=#Wtm<45zK9~iyJ)%%fjNnC zqy#HJA$dNzxf6eis^-7EycgYQ=}aEgOA@b?BVKW5NlQ0cp%Z*m#IH~A*eaNcqc)a? zNal2v0e|8zY4sKOCHOBW!*Tw4`lEF6=!&frRlgTwB(549;s+byi>mx?NP1{{via3V zk`7y&Umq2=Dty#O`QLl}fx~E{W2A2N>VDU57HT>%%;M)w7<VxQ;2vpme8jbEFTVOC zL?YK!h9UUq^8TSo*3{66EyR$AGz>oFIt)Yn(GvMw{x%qFZJQvc@Z%A%UVfBZQ*+-x zJ)N&k8YgusF4R4J_h)Ppd`08&!zunaLlc{#(siPZKp$t;MHou{DC!e@ywqFpM~JqU zX{iDvbt*2RJH*eRi*LVvgX?tu7q8xGY9f4?9Wu0!dkdH;!r|rDCxj-mngc)1sx1}C oYzt*-_QSK&6ynz{_#Yns774+xKcxka#}4T>cIpm=P*3oG0>?sDCjbBd -- 1.6.2.4

1 0

[PATCH 2/9] doc/examples/Makefile.am: Clean up whitespace.
by Roland Levillain 11 Jun '09

11 Jun '09

--- milena/ChangeLog | 4 + milena/doc/examples/Makefile.am | 131 +++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2b64a70..761ce5c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/examples/Makefile.am: Clean up whitespace. + 2009-06-11 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor fixes. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index 8092243..497be61 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -72,7 +72,7 @@ tuto4_genericity_and_algorithms noinst_PROGRAMS += \ tuto3_colorize \ tuto3_println \ -tuto3_trace +tuto3_trace # Tuto4 noinst_PROGRAMS += \ @@ -142,7 +142,6 @@ all: mkdir -p $(OUTPUTS_BUILDDIR) mkdir -p $(FIGURES_BUILDDIR) - run-examples: all @failcom='exit 1'; \ list='$(noinst_PROGRAMS)'; for bin in $$list; do \ @@ -156,30 +155,30 @@ data-regen: run-examples split-examples split-outputs diff-data diff-data: run-examples split-examples @failcom='exit 1'; \ - has_txt_diff=""; \ - txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ - echo "Diff `basename $$txt`"; \ - diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ - || has_txt_diff+=" `basename $$txt`"; \ - done; \ - has_fig_diff=""; \ - figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ - echo "Diff `basename $$fig`"; \ - diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ - || has_fig_diff+=" `basename $$fig`"; \ - done; \ - has_split_out_diff=""; \ - split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist; do \ - echo "Diff `basename $$split_out`"; \ - diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ - || has_split_out_diff+=" `basename $$split_out`"; \ - done; \ - has_split_ex_diff=""; \ - split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist; do \ - echo "Diff `basename $$split_ex`"; \ - diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ - || has_split_ex_diff+=" `basename $$split_ex`"; \ - done; \ + has_txt_diff=""; \ + txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ + echo "Diff `basename $$txt`"; \ + diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ + || has_txt_diff+=" `basename $$txt`"; \ + done; \ + has_fig_diff=""; \ + figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ + echo "Diff `basename $$fig`"; \ + diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ + || has_fig_diff+=" `basename $$fig`"; \ + done; \ + has_split_out_diff=""; \ + split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist; do \ + echo "Diff `basename $$split_out`"; \ + diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ + || has_split_out_diff+=" `basename $$split_out`"; \ + done; \ + has_split_ex_diff=""; \ + split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist; do \ + echo "Diff `basename $$split_ex`"; \ + diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ + || has_split_ex_diff+=" `basename $$split_ex`"; \ + done; \ (test -z "$$has_txt_diff" && test -z "$$has_fig_diff" && \ test -z "$$has_split_out_diff" && test -z "$$has_split_ex_diff")\ || (echo "--------"; \ @@ -187,63 +186,61 @@ diff-data: run-examples split-examples echo " The following files differ from their \ reference or their reference file does not exist:"; \ echo "--------"; \ - echo "* Outputs:"; \ - echo ""; \ - echo "$$has_txt_diff"; \ - echo ""; \ + echo "* Outputs:"; \ + echo ""; \ + echo "$$has_txt_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Figures:"; \ - echo ""; \ - echo "$$has_fig_diff"; \ - echo ""; \ + echo "* Figures:"; \ + echo ""; \ + echo "$$has_fig_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Split outputs:"; \ - echo ""; \ - echo "$$has_split_out_diff"; \ - echo ""; \ + echo "* Split outputs:"; \ + echo ""; \ + echo "$$has_split_out_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Split examples:"; \ - echo ""; \ - echo "$$has_split_ex_diff"; \ - echo ""; \ + echo "* Split examples:"; \ + echo ""; \ + echo "$$has_split_ex_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Please update manually the reference files located \ -in:"; \ - echo ""; \ + echo "* Please update manually the reference files located in:" \ + echo ""; \ echo " $(OUTPUTS_SRCDIR)"; \ echo " $(FIGURES_SRCDIR)"; \ echo " $(SPLIT_EXAMPLES_SRCDIR)"; \ echo " $(SPLIT_OUTPUTS_SRCDIR)"; \ - echo ""; \ - echo "* Reference files can updated automatically with \ -'make fix-refdata'"; \ - echo ""; \ - echo ""; \ - eval $$failcom); + echo ""; \ + echo "* Reference files can updated automatically with 'make fix-refdata'"; \ + echo ""; \ + echo ""; \ + eval $$failcom); fix-refdata: @failcom='exit 1'; \ - txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ - diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ - || echo "Updating reference file for $$txt"; \ + txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ + diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ + || echo "Updating reference file for $$txt"; \ cp $$txt $(OUTPUTS_SRCDIR); \ - done; \ - figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ - diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ - || echo "Updating reference file for $$fig"; \ + done; \ + figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ + diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ + || echo "Updating reference file for $$fig"; \ cp $$fig $(FIGURES_SRCDIR); \ - done; \ - split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*.txt"; for split_out in $$split_outlist; do \ - diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ - || echo "Updating reference file for $$split_out"; \ + done; \ + split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*.txt"; for split_out in $$split_outlist; do \ + diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ + || echo "Updating reference file for $$split_out"; \ cp $$split_out $(SPLIT_OUTPUTS_SRCDIR); \ - done; \ - split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*.cc"; for split_ex in $$split_exlist; do \ - diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ - || echo "Updating reference file for $$split_ex"; \ + done; \ + split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*.cc"; for split_ex in $$split_exlist; do \ + diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ + || echo "Updating reference file for $$split_ex"; \ cp $$split_ex $(SPLIT_EXAMPLES_SRCDIR); \ - done; + done; split-examples: -- 1.6.2.4

1 0

[PATCH 1/9] Do not distribute executable binaries.
by Roland Levillain 11 Jun '09

11 Jun '09

* src/Makefile.am (EXTRA_DIST): Rename as... (bin_PROGRAMS): ...this. Disable recognition. --- scribo/ChangeLog | 8 ++++++++ scribo/src/Makefile.am | 19 +++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8825198..fa89236 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + + Do not distribute executable binaries. + + * src/Makefile.am (EXTRA_DIST): Rename as... + (bin_PROGRAMS): ...this. + Disable recognition. + 2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * headers.mk: New. List of distributed files. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 5944f2d..2f537f1 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -42,16 +42,6 @@ bin_PROGRAMS = \ thin_bboxes -# FIXME: Should be enclosed in an Automake conditional like HAVE_TESSERACT. -EXTRA_DIST = recognition - -#recognition_SOURCES = recognition.cc -# FIXME: Do not use $(HOME). -#recognition_CXXFLAGS = -# -I$(HOME)/local/include $(HOME)/local/lib/libtesseract_full.a -#recognition_LDFLAGS = -lpthread - -# FIXME: Deactivate source accordingly. dmap_SOURCES = dmap.cc extract_text_double_link_SOURCES = extract_text_double_link.cc extract_text_double_several_links_SOURCES = extract_text_double_several_links.cc @@ -67,3 +57,12 @@ table_rebuild_opening_SOURCES = table_rebuild_opening.cc table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc thin_bboxes_SOURCES = thin_bboxes.cc + +# FIXME: Should be enclosed in an Automake conditional like HAVE_TESSERACT. +#bin_PROGRAMS += recognition + +#recognition_SOURCES = recognition.cc +# FIXME: Do not use $(HOME). +#recognition_CXXFLAGS = +# -I$(HOME)/local/include $(HOME)/local/lib/libtesseract_full.a +#recognition_LDFLAGS = -lpthread -- 1.6.2.4

1 0

4108: Configure and bootstrap Scribo correctly.
by Guillaume Lazzara 11 Jun '09

11 Jun '09

* bootstrap: run the generation of the distributed file list. * configure.ac: configure scribo/demo. --- ChangeLog | 8 ++++++++ bootstrap | 3 +++ configure.ac | 1 + 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a94a1d..6379bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Configure and bootstrap Scribo correctly. + + * bootstrap: run the generation of the distributed file list. + + * configure.ac: configure scribo/demo. + 2009-06-11 Edwin Carlinet <carlinet(a)lrde.epita.fr> Update configure.ac with tests/accu/math Makefile. diff --git a/bootstrap b/bootstrap index f95fd01..9827b9c 100755 --- a/bootstrap +++ b/bootstrap @@ -131,6 +131,9 @@ set -x # Generate milena/headers.mk run milena ./generate_dist_headers.sh +# Generate scribo/headers.mk +run scribo ./generate_dist_headers.sh + # Generate lists of files to be part of the distribution # for the tutorial. run milena/doc ./generate_dist_files.sh diff --git a/configure.ac b/configure.ac index 2dd6856..706f02e 100644 --- a/configure.ac +++ b/configure.ac @@ -192,6 +192,7 @@ AM_CONDITIONAL([ENABLE_SCRIBO], [test x$enable_scribo = xyes]) AC_CONFIG_FILES([ scribo/Makefile + scribo/demo/Makefile scribo/src/Makefile scribo/src/binarization/Makefile scribo/src/extract/Makefile -- 1.5.6.5

1 0

4107: headers.mk: New. List of distributed files.
by Guillaume Lazzara 11 Jun '09

11 Jun '09

--- scribo/ChangeLog | 6 +++- scribo/headers.mk | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletions(-) create mode 100644 scribo/headers.mk diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 33a4ef4..8825198 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,8 +1,12 @@ 2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * headers.mk: New. List of distributed files. + +2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Generate list of distributed headers for Scribo. - * generate_dist_headers.sh: new. Generate distributed file list. + * generate_dist_headers.sh: New. Generate distributed file list. 2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/headers.mk b/scribo/headers.mk new file mode 100644 index 0000000..eceb426 --- /dev/null +++ b/scribo/headers.mk @@ -0,0 +1,80 @@ +## Generated by ./generate_dist_headers, do not modify ## + +noinst_HEADERS = \ +./all.hh \ +./binarization/simple.hh \ +./core/all.hh \ +./core/central_sites.hh \ +./core/erase_objects.hh \ +./core/macros.hh \ +./core/object_image.hh \ +./debug/all.hh \ +./debug/save_bboxes_image.hh \ +./debug/save_label_image.hh \ +./debug/save_linked_bboxes_image.hh \ +./debug/save_table_image.hh \ +./debug/usage.hh \ +./demo/src/mainwindow.hh \ +./draw/all.hh \ +./draw/bounding_box_links.hh \ +./draw/bounding_boxes.hh \ +./extract/lines_discontinued.hh \ +./extract/primitive/canvas.hh \ +./extract/primitive/cells.hh \ +./extract/primitive/lines_discontinued.hh \ +./extract/primitive/lines_h_discontinued.hh \ +./extract/primitive/lines_h_thick.hh \ +./extract/primitive/lines_thick.hh \ +./extract/primitive/lines_v_discontinued.hh \ +./extract/primitive/lines_v_thick.hh \ +./extract/primitive/objects.hh \ +./filter/all.hh \ +./filter/large_objects.hh \ +./filter/small_objects.hh \ +./filter/thick_objects.hh \ +./filter/thin_objects.hh \ +./make/all.hh \ +./make/debug_filename.hh \ +./make/influence_zone_graph.hh \ +./make/text.hh \ +./preprocessing/all.hh \ +./preprocessing/unskew.hh \ +./table/align_lines_horizontaly.hh \ +./table/align_lines_verticaly.hh \ +./table/all.hh \ +./table/connect_horizontal_lines.hh \ +./table/connect_vertical_lines.hh \ +./table/erase.hh \ +./table/extract.hh \ +./table/internal/align_lines.hh \ +./table/internal/all.hh \ +./table/internal/connect_lines.hh \ +./table/internal/repair_lines.hh \ +./table/rebuild.hh \ +./table/repair_horizontal_lines.hh \ +./table/repair_vertical_lines.hh \ +./text/all.hh \ +./text/clean.hh \ +./text/extract_lines.hh \ +./text/grouping/all.hh \ +./text/grouping/group_from_double_link.hh \ +./text/grouping/group_from_graph.hh \ +./text/grouping/group_from_single_link.hh \ +./text/grouping/group_with_graph.hh \ +./text/grouping/group_with_several_graphes.hh \ +./text/grouping/group_with_several_left_links.hh \ +./text/grouping/group_with_several_right_links.hh \ +./text/grouping/group_with_single_left_link.hh \ +./text/grouping/group_with_single_right_link.hh \ +./text/grouping/internal/all.hh \ +./text/grouping/internal/find_graph_link.hh \ +./text/grouping/internal/find_left_link.hh \ +./text/grouping/internal/find_right_link.hh \ +./text/grouping/internal/find_root.hh \ +./text/grouping/internal/init_link_array.hh \ +./text/grouping/internal/is_link_valid.hh \ +./text/grouping/internal/update_graph_link.hh \ +./text/grouping/internal/update_link_array.hh \ +./text/recognition.hh \ +./util/all.hh \ +./util/text.hh -- 1.5.6.5

1 0

4106: Generate list of distributed headers for Scribo.
by Guillaume Lazzara 11 Jun '09

11 Jun '09

* generate_dist_headers.sh: new. Generate distributed file list. --- scribo/ChangeLog | 6 ++++++ scribo/generate_dist_headers.sh | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100755 scribo/generate_dist_headers.sh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a4cbdbd..33a4ef4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Generate list of distributed headers for Scribo. + + * generate_dist_headers.sh: new. Generate distributed file list. + +2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Small fixes in Scribo. * Makefile.am: Improve generation of headers.mk. diff --git a/scribo/generate_dist_headers.sh b/scribo/generate_dist_headers.sh new file mode 100755 index 0000000..a6dd8d5 --- /dev/null +++ b/scribo/generate_dist_headers.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +# Generate scribo/headers.mk +# ------------------------------ +# List all the headers in order to make them part of distribution. + +# Use the C locale to have a deterministic sort. +export LC_ALL=C + +echo "## Generated by ./generate_dist_headers, do not modify ##" > headers.mk +echo "" >> headers.mk +echo "noinst_HEADERS = \\" >> headers.mk +echo "generating headers.mk" + +find . -type f -name '*.hh'| grep -v "\.svn" | sed -e 's/$/ \\/g' | sort >> headers.mk +find . -type f -name '*.hxx'| grep -v "\.svn" | sed -e 's/$/ \\/g'| sort >> headers.mk + +last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line +sed '$d' < headers.mk > headers.mk.tmp # remove last line +mv headers.mk.tmp headers.mk +echo $last_line >> headers.mk # put the cleaned last line back. -- 1.5.6.5

1 0

4105: Small fixes in Scribo.
by Guillaume Lazzara 11 Jun '09

11 Jun '09

* Makefile.am: Improve generation of headers.mk. * demo/Makefile.am: Fix an invalid path to the .pro file. * demo/src/main.cc: repair copyright header. * demo/src/mainwindow.cc, * demo/src/mainwindow.hh: handle a different base directory for image data. * filter/small_objects.hh: fix an accumulator. --- scribo/ChangeLog | 34 +++++++++++++++++++++++++--------- scribo/Makefile.am | 13 +++++++++++++ scribo/demo/Makefile.am | 4 +++- scribo/demo/src/main.cc | 6 ++++-- scribo/demo/src/mainwindow.cc | 12 ++++++++++-- scribo/demo/src/mainwindow.hh | 3 +++ scribo/filter/small_objects.hh | 13 ++----------- 7 files changed, 60 insertions(+), 25 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d6ce297..a4cbdbd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,16 +1,32 @@ +2009-06-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Small fixes in Scribo. + + * Makefile.am: Improve generation of headers.mk. + + * demo/Makefile.am: Fix an invalid path to the .pro file. + + * demo/src/main.cc: repair copyright header. + + * demo/src/mainwindow.cc, + * demo/src/mainwindow.hh: handle a different base directory for image + data. + + * filter/small_objects.hh: fix an accumulator. + 2009-06-10 Guillaume Lazzara <lazzara(a)lrde.epita.fr> - Fix Scribo + Fix Scribo. - * core/all.hh - * debug/all.hh - * text/all.hh - * filter/all.hh - * table/all.hh + * core/all.hh, + * debug/all.hh, + * text/all.hh, + * filter/all.hh, + * table/all.hh: update includes. - * demo/Makefile.am - * src/Makefile.am - * src/extract/primitive/Makefile.am + * demo/Makefile.am, + * src/Makefile.am, + * src/extract/primitive/Makefile.am: update source list. * core/erase_bboxes.hh: move... * core/erase_objects.hh: ...here. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 316ee8a..2285b6c 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -26,3 +26,16 @@ bin: # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += tests + +regen-am: + ./generate_dist_headers.sh + +EXTRA_DIST = generate_dist_headers.sh +# FIXME: Change generate_dist_headers.sh so that the action looks like this: +# +# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# +$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh + ./generate_dist_headers.sh + +include $(srcdir)/headers.mk diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index ab8c1a2..19948cb 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -2,8 +2,10 @@ include $(top_srcdir)/scribo/scribo.mk +.PHONY : demo + Makefile.demo: - qmake-qt4 $(top_srcdir)/scribo/src/demo/demo.pro -o Makefile.demo + qmake-qt4 $(top_srcdir)/scribo/demo/demo.pro -o Makefile.demo demo: Makefile.demo make -f Makefile.demo all diff --git a/scribo/demo/src/main.cc b/scribo/demo/src/main.cc index b467a07..ad9c28d 100644 --- a/scribo/demo/src/main.cc +++ b/scribo/demo/src/main.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009 - EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -35,6 +34,9 @@ int main(int argc, char *argv[]) scribo::demo::MainWindow win; + if (argc == 2) + win.set_base_img_dir(argv[1]); + win.show(); return app.exec(); } diff --git a/scribo/demo/src/mainwindow.cc b/scribo/demo/src/mainwindow.cc index 720e086..28e120e 100644 --- a/scribo/demo/src/mainwindow.cc +++ b/scribo/demo/src/mainwindow.cc @@ -84,7 +84,9 @@ namespace scribo setupUi(this); mainItem_ = 0; - exec_prefix_ = "../"; + exec_prefix_ = "../src/"; + base_img_dir_ = QCoreApplication::applicationDirPath(); + pdialog_.setRange(0,0); pdialog_.setLabelText(tr("Please wait while computing...")); pdialog_.setWindowModality(Qt::WindowModal); @@ -104,6 +106,12 @@ namespace scribo setup_scene(); } + void MainWindow::set_base_img_dir(const QString& dir) + { + QDir d(dir); + base_img_dir_ = d.absolutePath(); + } + void MainWindow::initToolBar() { @@ -140,7 +148,7 @@ namespace scribo QString filename = QFileDialog::getOpenFileName(this, tr("Open Image."), - QCoreApplication::applicationDirPath() + "/" + current_dir, + base_img_dir_ + "/" + current_dir, tr("Images (*.pbm *.pgm *.ppm)")); if (!filename.isEmpty()) diff --git a/scribo/demo/src/mainwindow.hh b/scribo/demo/src/mainwindow.hh index 698186b..25b7667 100644 --- a/scribo/demo/src/mainwindow.hh +++ b/scribo/demo/src/mainwindow.hh @@ -45,6 +45,7 @@ namespace scribo public: MainWindow(QWidget *parent = 0); + void set_base_img_dir(const QString& dir); private slots: void initToolBar(); @@ -83,6 +84,8 @@ namespace scribo QProcess exec_; QProgressDialog pdialog_; + + QString base_img_dir_; }; diff --git a/scribo/filter/small_objects.hh b/scribo/filter/small_objects.hh index 9fcd153..898f60b 100644 --- a/scribo/filter/small_objects.hh +++ b/scribo/filter/small_objects.hh @@ -44,7 +44,7 @@ # include <mln/pw/all.hh> -# include <mln/accu/count.hh> +# include <mln/accu/math/count.hh> # include <mln/set/compute.hh> @@ -52,15 +52,6 @@ # include <scribo/extract/primitive/objects.hh> -//forward declaration. -namespace mln -{ - namespace accu - { - template <typename T> struct count; - } -} - namespace scribo { @@ -112,7 +103,7 @@ namespace scribo struct small_objects_filter : Function_v2b< small_objects_filter<L> > { - typedef accu::count<mln_psite(L)> card_t; + typedef accu::math::count<mln_psite(L)> card_t; /// Constructor /// -- 1.5.6.5

1 0

r4104: Clean up sandbox and add routine for visualization
by Fabien Freling 11 Jun '09

11 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Clean up sandbox and add routine for visualization. * fabien/flat_zones.hh: Move to trunk. * fabien/labeling.hh: Move to trunk. * fabien/level.cc: Move to trunk. * fabien/level.hh: Move to trunk. * fabien/regional_maxima.cc: Move to trunk. * fabien/regional_maxima.hh: Move to trunk. * fabien/regional_minima.cc: Move to trunk. * fabien/regional_minima.hh: Move to trunk. * fabien/mln/world/inter_pixel/display_region.hh: Create an image for visualization of regions [Draft, not functional]. * fabien/mln/world/inter_pixel/is_zero_face.hh: Implement zero-face. --- display_region.hh | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ is_zero_face.hh | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+) Index: trunk/milena/sandbox/fabien/regional_maxima.cc (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/flat_zones.hh (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/level.hh (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/regional_minima.hh (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/regional_maxima.hh (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/labeling.hh (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/level.cc (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/regional_minima.cc (deleted) =================================================================== Index: trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 0) +++ trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 4104) @@ -0,0 +1,140 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_INTER_PIXEL_DISPLAY_REGION_HH +# define MLN_WORLD_INTER_PIXEL_DISPLAY_REGION_HH + +/// \file +/// +/// Create an image for visualizing the different regions of a labeled +/// inter_pixel image. + +# include <mln/core/image/image2d.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/data/paste.hh> +# include <mln/world/inter_pixel/is_pixel.hh> +# include <mln/world/inter_pixel/is_separator.hh> +# include <mln/opt/at.hh> +# include <mln/value/rgb8.hh> + +# include "is_zero_face.hh" + + +namespace mln +{ + + namespace world + { + + namespace inter_pixel + { + + /// \brief FIXME + /// + /// \param[in] input The input image providing pixels values. + /// \param[in] wst The labeling image providing the watershed lines. + /// \param[in] edge_color The color (in rgb8) for the watershed line. + /// \return FIXME + /// + /// \pre \p wst has to be an unmorphed image. + /// \warning This implementation only works for 2D images. + /// + template <typename I, typename L> + inline + mln_ch_value(I, value::rgb8) + display_region(const I& input, const mln_ch_value(I, L)& wst, value::rbg8 edge_color); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + inline + mln_ch_value(I, value::rgb8) + display_region(const I& input, const mln_ch_value(I, L)& wst, value::rbg8 edge_color) + { + mln_precondition((2 * input.bbox()) == wst.unmorph_().bbox()); + + mln_ch_value(I, value::rgb8) output; + initialize(output, wst); + + // Pixel. + mln_piter(I) p_input(input.domain()); + for_all(p) + opt::at(output, p.to_vec[0] * 2, p.to_vec[1] * 2) = input(p); + + // Separator. + typedef image_if<const mln_ch_value(I, L)&, is_separator> separator_t; + separator_t edge = wst | is_separator(); + mln_piter(edge_t) p(edge.domain()); + for_all(p) + { + if (p.row() % 2) // horizontal edge + { + unsigned row = (p.row() / 2 + 1) * 2 - 1; + unsigned col = p.col(); + opt::at(output, row, col) = input(p); + } + else // vertical edge + { + unsigned row = p.row(); + unsigned col = (p.col() / 2 + 1) * 2 - 1; + opt::at(output, row, col) = input(p); + } + } + + // Point (dimension 0). + typedef image_if<const mln_ch_value(I, L)&, is_zero_face> zero_face_t; + zero_face_t edge = wst | is_zero_face(); + mln_piter(edge_t) p(edge.domain()); + for_all(p) + { + if (p.row() % 2) // horizontal edge + { + unsigned row = (p.row() / 2 + 1) * 2 - 1; + unsigned col = p.col(); + opt::at(output, row, col) = input(p); + } + else // vertical edge + { + unsigned row = p.row(); + unsigned col = (p.col() / 2 + 1) * 2 - 1; + opt::at(output, row, col) = input(p); + } + } + + return output; + +# endif // ! MLN_INCLUDE_ONLY + + } + + } // end of namespace mln::world::inter_pixel + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_INTER_PIXEL_DISPLAY_REGION_HH + Index: trunk/milena/sandbox/fabien/mln/world/inter_pixel/is_zero_face.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/world/inter_pixel/is_zero_face.hh (revision 0) +++ trunk/milena/sandbox/fabien/mln/world/inter_pixel/is_zero_face.hh (revision 4104) @@ -0,0 +1,90 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_INTER_PIXEL_IS_ZERO_FACE_HH +# define MLN_WORLD_INTER_PIXEL_IS_ZERO_FACE_HH + +/// \file +/// +/// A zero-face is a point of 0 dimension. It joins elements of dimension 1 +/// such as lines. +/// +/// \todo Make it work in n-D. + +# include <mln/core/concept/function.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/point.hh> + + +namespace mln +{ + + namespace world + { + + namespace inter_pixel + { + + struct is_zero_face : public Function_v2b< is_zero_face > + { + typedef bool result; + + template <typename P> + bool operator()(const Gpoint<P>& p) const; + + template <typename P> + bool operator()(const Site_Proxy<P>& p) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + bool + is_zero_face::operator()(const Gpoint<P>& p_) const + { + const P& p = exact(p_); + return p.row() % 2 == 1 && p.col() % 2 == 1; + } + + template <typename P> + inline + bool + is_zero_face::operator()(const Site_Proxy<P>& p) const + { + mlc_is_a(mln_site(P), Gpoint)::check(); + return this->operator()(exact(p).to_site()); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::inter_pixel + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_INTER_PIXEL_IS_ZERO_FACE_HH

1 0