* mln/core/image/complex_image.hh, * mln/core/image/flat_image.hh, * mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh, * mln/core/image/image_if.hh, * mln/core/image/p2p_image.hh, * mln/core/image/slice_image.hh, * mln/core/image/sub_image.hh, * mln/data/fill_with_image.spe.hh, * mln/data/paste.spe.hh, * mln/level/transform.spe.hh, * mln/level/transform_inplace.hh, * mln/pw/image.hh, * mln/trait/image/props.hh, * mln/trait/images.hh: Here. --- milena/ChangeLog | 22 ++++++++++++++++++++++ milena/mln/core/image/complex_image.hh | 2 +- milena/mln/core/image/flat_image.hh | 2 +- milena/mln/core/image/image1d.hh | 2 +- milena/mln/core/image/image2d.hh | 2 +- milena/mln/core/image/image3d.hh | 2 +- milena/mln/core/image/image_if.hh | 2 +- milena/mln/core/image/p2p_image.hh | 2 +- milena/mln/core/image/slice_image.hh | 2 +- milena/mln/core/image/sub_image.hh | 2 +- milena/mln/data/fill_with_image.spe.hh | 8 ++++---- milena/mln/data/paste.spe.hh | 8 ++++---- milena/mln/level/transform.spe.hh | 18 +++++++++--------- milena/mln/level/transform_inplace.hh | 12 ++++++------ milena/mln/pw/image.hh | 2 +- milena/mln/trait/image/props.hh | 12 ++++++------ milena/mln/trait/images.hh | 6 +++--- 17 files changed, 64 insertions(+), 42 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a010992..011ba13 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,25 @@ +2009-02-10 Roland Levillain <roland@lrde.epita.fr> + + s/alignement/alignment/g. + + * mln/core/image/complex_image.hh, + * mln/core/image/flat_image.hh, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/image/image_if.hh, + * mln/core/image/p2p_image.hh, + * mln/core/image/slice_image.hh, + * mln/core/image/sub_image.hh, + * mln/data/fill_with_image.spe.hh, + * mln/data/paste.spe.hh, + * mln/level/transform.spe.hh, + * mln/level/transform_inplace.hh, + * mln/pw/image.hh, + * mln/trait/image/props.hh, + * mln/trait/images.hh: + Here. + 2009-02-10 Fabien Freling <fabien.freling@lrde.epita.fr> Fix save function for cloud. diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index b5303a4..152c10e 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -93,7 +93,7 @@ namespace mln 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; + typedef trait::image::value_alignment::irrelevant value_alignment; typedef trait::image::value_io::read_write value_io; // Site / domain. diff --git a/milena/mln/core/image/flat_image.hh b/milena/mln/core/image/flat_image.hh index 39331b3..c5470fb 100644 --- a/milena/mln/core/image/flat_image.hh +++ b/milena/mln/core/image/flat_image.hh @@ -83,7 +83,7 @@ namespace mln typedef trait::image::value_access::direct value_access; typedef trait::image::value_storage::singleton value_storage; typedef mln::trait::image::value_browsing::value_wise value_browsing; - typedef trait::image::value_alignement::with_grid value_alignement; + typedef trait::image::value_alignment::with_grid value_alignment; typedef trait::image::value_io::read_only value_io; // site / domain diff --git a/milena/mln/core/image/image1d.hh b/milena/mln/core/image/image1d.hh index f6915be..6b0ac15 100644 --- a/milena/mln/core/image/image1d.hh +++ b/milena/mln/core/image/image1d.hh @@ -100,7 +100,7 @@ namespace mln typedef trait::image::value_access::direct value_access; typedef trait::image::value_storage::one_block value_storage; typedef trait::image::value_browsing::site_wise_only value_browsing; - typedef trait::image::value_alignement::with_grid value_alignement; + typedef trait::image::value_alignment::with_grid value_alignment; typedef trait::image::value_io::read_write value_io; // site / domain diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index 0c44ef3..937b451 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -108,7 +108,7 @@ namespace mln typedef trait::image::value_access::direct value_access; typedef trait::image::value_storage::one_block value_storage; typedef trait::image::value_browsing::site_wise_only value_browsing; - typedef trait::image::value_alignement::with_grid value_alignement; + typedef trait::image::value_alignment::with_grid value_alignment; typedef trait::image::value_io::read_write value_io; // site / domain diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 856b859..dcf266f 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -102,7 +102,7 @@ namespace mln typedef trait::image::value_access::direct value_access; typedef trait::image::value_storage::one_block value_storage; typedef trait::image::value_browsing::site_wise_only value_browsing; - typedef trait::image::value_alignement::with_grid value_alignement; + typedef trait::image::value_alignment::with_grid value_alignment; typedef trait::image::value_io::read_write value_io; // site / domain diff --git a/milena/mln/core/image/image_if.hh b/milena/mln/core/image/image_if.hh index 377e426..0102e7c 100644 --- a/milena/mln/core/image/image_if.hh +++ b/milena/mln/core/image/image_if.hh @@ -81,7 +81,7 @@ namespace mln typedef trait::image::vw_io::none vw_io; typedef trait::image::vw_set::none vw_set; - typedef trait::image::value_alignement::not_aligned value_alignement; + typedef trait::image::value_alignment::not_aligned value_alignment; typedef trait::image::value_storage::disrupted value_storage; }; diff --git a/milena/mln/core/image/p2p_image.hh b/milena/mln/core/image/p2p_image.hh index 26e154a..f0b17ba 100644 --- a/milena/mln/core/image/p2p_image.hh +++ b/milena/mln/core/image/p2p_image.hh @@ -77,7 +77,7 @@ namespace mln typedef trait::image::vw_io::none vw_io; typedef trait::image::vw_set::none vw_set; - typedef trait::image::value_alignement::not_aligned value_alignement; + typedef trait::image::value_alignment::not_aligned value_alignment; typedef trait::image::value_storage::disrupted value_storage; }; diff --git a/milena/mln/core/image/slice_image.hh b/milena/mln/core/image/slice_image.hh index b96c34b..66e7b94 100644 --- a/milena/mln/core/image/slice_image.hh +++ b/milena/mln/core/image/slice_image.hh @@ -81,7 +81,7 @@ namespace mln typedef trait::image::vw_io::none vw_io; typedef trait::image::vw_set::none vw_set; - typedef trait::image::value_alignement::not_aligned value_alignement; + typedef trait::image::value_alignment::not_aligned value_alignment; typedef trait::image::value_storage::disrupted value_storage; }; diff --git a/milena/mln/core/image/sub_image.hh b/milena/mln/core/image/sub_image.hh index 025d9d9..d5f2bf5 100644 --- a/milena/mln/core/image/sub_image.hh +++ b/milena/mln/core/image/sub_image.hh @@ -88,7 +88,7 @@ namespace mln typedef trait::image::vw_io::none vw_io; typedef trait::image::vw_set::none vw_set; - typedef trait::image::value_alignement::not_aligned value_alignement; + typedef trait::image::value_alignment::not_aligned value_alignment; typedef trait::image::value_storage::disrupted value_storage; // HOT FIXME: except if S is a Box }; diff --git a/milena/mln/data/fill_with_image.spe.hh b/milena/mln/data/fill_with_image.spe.hh index 8c31f75..27a888b 100644 --- a/milena/mln/data/fill_with_image.spe.hh +++ b/milena/mln/data/fill_with_image.spe.hh @@ -252,10 +252,10 @@ namespace mln /// Check basic properties - if (mlc_is(mln_trait_image_value_alignement(I), - trait::image::value_alignement::with_grid)::value && - mlc_is(mln_trait_image_value_alignement(J), - trait::image::value_alignement::with_grid)::value) + if (mlc_is(mln_trait_image_value_alignment(I), + trait::image::value_alignment::with_grid)::value && + mlc_is(mln_trait_image_value_alignment(J), + trait::image::value_alignment::with_grid)::value) { fill_with_image_(mln_trait_image_value_access(I)(), mln_trait_image_value_access(J)(), diff --git a/milena/mln/data/paste.spe.hh b/milena/mln/data/paste.spe.hh index 2036d2e..dc526b3 100644 --- a/milena/mln/data/paste.spe.hh +++ b/milena/mln/data/paste.spe.hh @@ -295,10 +295,10 @@ namespace mln const Image<I>& input, Image<J>& output) { - enum { alignments = mlc_is(mln_trait_image_value_alignement(I), - trait::image::value_alignement::with_grid)::value - && mlc_is(mln_trait_image_value_alignement(J), - trait::image::value_alignement::with_grid)::value }; + enum { alignments = mlc_is(mln_trait_image_value_alignment(I), + trait::image::value_alignment::with_grid)::value + && mlc_is(mln_trait_image_value_alignment(J), + trait::image::value_alignment::with_grid)::value }; paste_one_block_dispatch(metal::bool_<alignments>(), input, output); } diff --git a/milena/mln/level/transform.spe.hh b/milena/mln/level/transform.spe.hh index 50abfeb..78b2e8d 100644 --- a/milena/mln/level/transform.spe.hh +++ b/milena/mln/level/transform.spe.hh @@ -443,9 +443,9 @@ namespace mln { const I& input = exact(input_); - /// Check alignement property - if (mlc_is(mln_trait_image_value_alignement(I), - trait::image::value_alignement::with_grid)::value) + /// Check alignment property + if (mlc_is(mln_trait_image_value_alignment(I), + trait::image::value_alignment::with_grid)::value) return transform_dispatch(mln_trait_image_quant(I)(), mln_trait_image_value_access(I)(), input, exact(f_)); @@ -461,8 +461,8 @@ namespace mln template <typename I1, typename I2, typename F> mln_ch_value(I1, mln_result(F)) - transform_dispatch_2(trait::image::value_alignement::any, - trait::image::value_alignement::any, + transform_dispatch_2(trait::image::value_alignment::any, + trait::image::value_alignment::any, trait::image::speed::any, trait::image::speed::any, const Image<I1>& input1, const Image<I2>& input2, @@ -473,8 +473,8 @@ namespace mln template <typename I1, typename I2, typename F> mln_ch_value(I1, mln_result(F)) - transform_dispatch_2(trait::image::value_alignement::with_grid, - trait::image::value_alignement::with_grid, + transform_dispatch_2(trait::image::value_alignment::with_grid, + trait::image::value_alignment::with_grid, trait::image::speed::fastest, trait::image::speed::fastest, const Image<I1>& input1, const Image<I2>& input2, @@ -502,8 +502,8 @@ namespace mln transform_dispatch(const Image<I1>& input1, const Image<I2>& input2, const Function_vv2v<F>& f) { - return transform_dispatch_2(mln_trait_image_value_alignement(I1)(), - mln_trait_image_value_alignement(I2)(), + return transform_dispatch_2(mln_trait_image_value_alignment(I1)(), + mln_trait_image_value_alignment(I2)(), mln_trait_image_speed(I1)(), mln_trait_image_speed(I2)(), input1, input2, f); diff --git a/milena/mln/level/transform_inplace.hh b/milena/mln/level/transform_inplace.hh index b3ad319..ca85b28 100644 --- a/milena/mln/level/transform_inplace.hh +++ b/milena/mln/level/transform_inplace.hh @@ -436,8 +436,8 @@ namespace mln template <typename I1, typename I2, typename F> void - transform_inplace_dispatch(trait::image::value_alignement::any, - trait::image::value_alignement::any, + transform_inplace_dispatch(trait::image::value_alignment::any, + trait::image::value_alignment::any, trait::image::speed::any, trait::image::speed::any, Image<I1>& ima, const Image<I2>& aux, @@ -448,8 +448,8 @@ namespace mln template <typename I1, typename I2, typename F> void - transform_inplace_dispatch(trait::image::value_alignement::with_grid, - trait::image::value_alignement::with_grid, + transform_inplace_dispatch(trait::image::value_alignment::with_grid, + trait::image::value_alignment::with_grid, trait::image::speed::fastest, trait::image::speed::fastest, Image<I1>& ima, const Image<I2>& aux, @@ -463,8 +463,8 @@ namespace mln transform_inplace_dispatch(Image<I1>& ima, const Image<I2>& aux, const Function_vv2v<F>& f) { - transform_inplace_dispatch(mln_trait_image_value_alignement(I1)(), - mln_trait_image_value_alignement(I2)(), + transform_inplace_dispatch(mln_trait_image_value_alignment(I1)(), + mln_trait_image_value_alignment(I2)(), mln_trait_image_speed(I1)(), mln_trait_image_speed(I2)(), ima, aux, f); diff --git a/milena/mln/pw/image.hh b/milena/mln/pw/image.hh index 75696e6..49a0afa 100644 --- a/milena/mln/pw/image.hh +++ b/milena/mln/pw/image.hh @@ -98,7 +98,7 @@ namespace mln typedef trait::image::value_access::computed value_access; 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; + typedef trait::image::value_alignment::irrelevant value_alignment; typedef mlc_if(is_mutable, trait::image::value_io::read_write, trait::image::value_io::read_only) value_io; diff --git a/milena/mln/trait/image/props.hh b/milena/mln/trait/image/props.hh index fbd5d43..971f815 100644 --- a/milena/mln/trait/image/props.hh +++ b/milena/mln/trait/image/props.hh @@ -183,7 +183,7 @@ // * image geometry -// value_alignement:/any/ +// value_alignment:/any/ // | // +-- with_grid // | @@ -458,22 +458,22 @@ namespace mln struct disrupted : any { std::string name() const { return "value_storage::disrupted"; } }; }; -// value_alignement:/any/ +// value_alignment:/any/ // | // +-- with_grid // | // +-- not_aligned // | // +-- irrelevant - struct value_alignement + struct value_alignment { struct any { protected: any() {} }; struct with_grid - : any { std::string name() const { return "value_alignement::with_grid"; } }; + : any { std::string name() const { return "value_alignment::with_grid"; } }; struct not_aligned - : any { std::string name() const { return "value_alignement::not_aligned"; } }; + : any { std::string name() const { return "value_alignment::not_aligned"; } }; struct irrelevant - : any { std::string name() const { return "value_alignement::irrelevant"; } }; + : any { std::string name() const { return "value_alignment::irrelevant"; } }; }; // pw_io: /any/ diff --git a/milena/mln/trait/images.hh b/milena/mln/trait/images.hh index c4b7721..d5da6df 100644 --- a/milena/mln/trait/images.hh +++ b/milena/mln/trait/images.hh @@ -62,7 +62,7 @@ # define mln_trait_image_pw_io(I) typename mln::trait::image_< I >::pw_io # define mln_trait_image_vw_io(I) typename mln::trait::image_< I >::vw_io # define mln_trait_image_vw_set(I) typename mln::trait::image_< I >::vw_set -# define mln_trait_image_value_alignement(I) typename mln::trait::image_< I>::value_alignement +# define mln_trait_image_value_alignment(I) typename mln::trait::image_< I>::value_alignment # define mln_trait_image_localization(I) typename mln::trait::image_< I >::localization # define mln_trait_image_dimension(I) typename mln::trait::image_< I >::dimension @@ -141,7 +141,7 @@ namespace mln // value typedef undef vw_io; typedef undef vw_set; - typedef undef value_alignement; + typedef undef value_alignment; typedef undef value_access; typedef undef value_storage; typedef undef value_browsing; @@ -207,7 +207,7 @@ namespace mln typedef typename image_<D>::dimension dimension; // Memory organization - typedef typename image_<D>::value_alignement value_alignement; + typedef typename image_<D>::value_alignment value_alignment; typedef typename image_<D>::value_access value_access; typedef typename image_<D>::value_storage value_storage; typedef typename image_<D>::value_browsing value_browsing; -- 1.6.1.2