* doc/examples/tuto4_genericity_and_algorithms.cc, * doc/tutorial/tutorial.tex: comment non working code and documentation related to that code. * doc/examples/split/tuto4_genericity_and_algorithms-11.cc, * doc/examples/split/tuto4_genericity_and_algorithms-12.cc: fix associated reference files. --- milena/ChangeLog | 12 +++ .../split/tuto4_genericity_and_algorithms-11.cc | 2 +- .../split/tuto4_genericity_and_algorithms-12.cc | 4 +- .../examples/tuto4_genericity_and_algorithms.cc | 40 ++++++----- milena/doc/tutorial/tutorial.tex | 77 ++++++++++---------- 5 files changed, 76 insertions(+), 59 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 04066f3..4ae66d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Comments parts of the documentation related to fun_image. + + * doc/examples/tuto4_genericity_and_algorithms.cc, + * doc/tutorial/tutorial.tex: comment non working code and + documentation related to that code. + + * doc/examples/split/tuto4_genericity_and_algorithms-11.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-12.cc: fix + associated reference files. + +2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Update doc reference files. * doc/examples/Makefile.am: fix the script comparing reference files diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc index 6eb4e9b..af852ed 100644 --- a/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc +++ b/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc @@ -1 +1 @@ - data::fill(extract::green(lena).rw(), literal::max); +// data::fill(extract::green(lena).rw(), literal::max); diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc index 9091157..d5f4ec8 100644 --- a/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc +++ b/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc @@ -1,2 +1,2 @@ - mln_VAR(object, pw::value(label) == pw::cst(0u)); - data::fill((extract::green(lena).rw() | object).rw(), literal::max); +// mln_VAR(object, pw::value(label) == pw::cst(0u)); +// data::fill((extract::green(lena).rw() | object).rw(), literal::max); diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index 151d7d8..2fd1413 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -120,24 +120,26 @@ int main() - lena = duplicate(lena_bak); - // \{ - data::fill(extract::green(lena).rw(), literal::max); - // \} - //FIXME: we would like to save the green component in rgb8. - doc::pgmsave(extract::green(lena), "tuto4_genericity_and_algorithms"); - doc::ppmsave(lena, "tuto4_genericity_and_algorithms"); - - - - - lena = duplicate(lena_bak); - // \{ - mln_VAR(object, pw::value(label) == pw::cst(0u)); - data::fill((extract::green(lena).rw() | object).rw(), literal::max); - // \} - //FIXME: how to display an image which is not defined on a box!? -// doc::ppmsave(lena | object, "tuto4_genericity_and_algorithms"); - doc::ppmsave(lena, "tuto4_genericity_and_algorithms"); +// Disabled until thru_image/fun_image provide working read/write access. +// +// lena = duplicate(lena_bak); +// // \{ +// data::fill(extract::green(lena).rw(), literal::max); +// // \} +// //FIXME: we would like to save the green component in rgb8. +// doc::pgmsave(extract::green(lena), "tuto4_genericity_and_algorithms"); +// doc::ppmsave(lena, "tuto4_genericity_and_algorithms"); +// +// +// +// +// lena = duplicate(lena_bak); +// // \{ +// mln_VAR(object, pw::value(label) == pw::cst(0u)); +// data::fill((extract::green(lena).rw() | object).rw(), literal::max); +// // \} +// //FIXME: how to display an image which is not defined on a box!? +//// doc::ppmsave(lena | object, "tuto4_genericity_and_algorithms"); +// doc::ppmsave(lena, "tuto4_genericity_and_algorithms"); } diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 91a7eb6..aac5d52 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -1538,44 +1538,47 @@ value in \var{label} is equal to 16'. \end{center} -%************************** -\doxysection{tuto4component}{Image component restricted to a domain} - -%FIXME: be more verbose? - -It is also possible to restrict an image to one of its component and apply -various operators upon it. In the following code, the green component of -this color image is extracted and filled with the maximum value allowed. -Other components such as red and blue are left unchanged. - -\doxycode[11]{tuto4_genericity_and_algorithms} - -\begin{center} - \begin{tabular}{c c c c} - \doxyimg{small-enlarged}{3cm} & -% \doxyfigure[7]{tuto4_genericity_and_algorithms}{3cm} & - ~\huge{$\rightarrow$}~ & - \doxyfigure[8]{tuto4_genericity_and_algorithms}{3cm} \\ - \multicolumn{4}{c}{Set the image green component to its maximum value.} \\ - \end{tabular} -\end{center} - - -Thanks to Milena's genericity, it is also possible to combine this operator -with others. Here the green component is extracted from a region of interest -and only that part is modified. - -\doxycode[12]{tuto4_genericity_and_algorithms} +%Disabled until thru_image/fun_image provide working read/write access. +% +%%************************** +%\doxysection{tuto4component}{Image component restricted to a domain} +% +%%FIXME: be more verbose? +% +%It is also possible to restrict an image to one of its component and apply +%various operators upon it. In the following code, the green component of +%this color image is extracted and filled with the maximum value allowed. +%Other components such as red and blue are left unchanged. +% +%\doxycode[11]{tuto4_genericity_and_algorithms} +% +%\begin{center} +% \begin{tabular}{c c c c} +% \doxyimg{small-enlarged}{3cm} & +%% \doxyfigure[7]{tuto4_genericity_and_algorithms}{3cm} & +% ~\huge{$\rightarrow$}~ & +% \doxyfigure[8]{tuto4_genericity_and_algorithms}{3cm} \\ +% \multicolumn{4}{c}{Set the image green component to its maximum value.} \\ +% \end{tabular} +%\end{center} +% +% +%Thanks to Milena's genericity, it is also possible to combine this operator +%with others. Here the green component is extracted from a region of interest +%and only that part is modified. +% +%\doxycode[12]{tuto4_genericity_and_algorithms} +% +%\begin{center} +% \begin{tabular}{c c c c} +% \doxyimg{small-enlarged}{3cm} & +% ~\huge{$\rightarrow$}~ & +% \doxyfigure[9]{tuto4_genericity_and_algorithms}{3cm} \\ +% \multicolumn{4}{c}{Set the green component of a region of interest +% to its maximum value.} \\ +% \end{tabular} +%\end{center} -\begin{center} - \begin{tabular}{c c c c} - \doxyimg{small-enlarged}{3cm} & - ~\huge{$\rightarrow$}~ & - \doxyfigure[9]{tuto4_genericity_and_algorithms}{3cm} \\ - \multicolumn{4}{c}{Set the green component of a region of interest - to its maximum value.} \\ - \end{tabular} -\end{center} \vspace{2cm} -- 1.5.6.5