https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Temporary fix in complex_image properties. * doc/tutorial/design/include/imagetours.tex: Update documentation. * mln/core/image/complex_image.hh: Fix properties. doc/tutorial/design/include/imagetours.tex | 8 ++++---- mln/core/image/complex_image.hh | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) Index: doc/tutorial/design/include/imagetours.tex --- doc/tutorial/design/include/imagetours.tex (revision 2863) +++ doc/tutorial/design/include/imagetours.tex (working copy) @@ -39,7 +39,7 @@ %%However, the $site$ concept allows Milena to deal with complicated image type %%(for instance see the \verb+graph_image+ type). -An image is composed by a set of localized objects ($sites$): the definition domain of the image. +An image is composed by a set of localized objects ($sites$), the definition domain of the image. A value is associated to each site of the image. This is the destination domain of the image. To access to a value localized at the site p in an image named $ima$, we @@ -75,10 +75,10 @@ %% Primary image definition -Primary images are a major category of Milena image type. +Primary images are a major category of the Milena image types. Primary images are not based on another image type. They are sufficient to define themselves. -Thus, a primary image types directly holds in memory its data (values). +Thus, a primary image types directly holds its data (values) in memory. \begin{itemize} @@ -145,7 +145,7 @@ will be transformed). Since, it extends an image, an image morpher is also an image type. -The Milena library provide different kinds of morphers. +The Milena library provides different kinds of morphers. Domain morphers only modify the domain (the set of points/sites composing the image) of the input image. Value morphers only change the input image values (cast the values into another type\ldots{}) Index: mln/core/image/complex_image.hh --- mln/core/image/complex_image.hh (revision 2863) +++ mln/core/image/complex_image.hh (working copy) @@ -85,9 +85,11 @@ // Value. typedef trait::image::value_access::direct value_access; - // FIXME: Is that right? - typedef trait::image::vw_io::read_write vw_io; - typedef trait::image::vw_set::multi vw_set; + // FIXME: This image is value wise read_write, and provides + // an access to its values throught a multi-set, + // but we need to add the corresponding interface in the class. + typedef trait::image::vw_io::none vw_io; + typedef trait::image::vw_set::none vw_set; typedef trait::image::value_storage::disrupted value_storage; typedef trait::image::value_browsing::site_wise_only value_browsing; typedef trait::image::value_alignement::irrelevant value_alignement;