* doc/examples/accu-right-instanciation.cc, * doc/examples/borderthickness.cc, * doc/examples/box2d-bbox.cc, * doc/examples/domain-display.cc, * doc/examples/dpoint-1.cc, * doc/examples/estim-sites.cc, * doc/examples/extend.cc, * doc/examples/extension-ignore.cc, * doc/examples/fill-call-1.cc, * doc/examples/fill-part-image.cc, * doc/examples/fill-subdomain-shorter.cc, * doc/examples/fill-subdomain.cc, * doc/examples/fill-subimage-cfun.cc, * doc/examples/fill.cc, * doc/examples/forall-piter.cc, * doc/examples/fun-p2v-1.cc, * doc/examples/graph-data.cc, * doc/examples/graph-iter.cc, * doc/examples/ima-has.cc, * doc/examples/ima-load.cc, * doc/examples/ima-save.cc, * doc/examples/ima-size.cc, * doc/examples/ima2d-1.cc, * doc/examples/ima2d-2.cc, * doc/examples/ima2d-4.cc, * doc/examples/ima2d-5.cc, * doc/examples/ima2d-6-clone.cc, * doc/examples/ima2d-7.cc, * doc/examples/ima2d-rot.cc, * doc/examples/labeling-compute.cc, * doc/examples/logical-not.cc, * doc/examples/mln_var.cc, * doc/examples/parray-append.cc, * doc/examples/parray-bbox.cc, * doc/examples/paste-call-1.cc, * doc/examples/paste.cc, * doc/examples/point-1.cc, * doc/examples/predicate-1.cc, * doc/examples/tuto2_first_image.cc, * doc/examples/tuto3/first_routine.cc, * doc/examples/tuto3_rw_image.cc, * doc/examples/tuto4_genericity_and_algorithms.cc, * doc/examples/win-create-1.cc, * doc/examples/win-create-2.cc: replace essential/2d.hh by the proper includes.

--- milena/ChangeLog | 50 ++++++++++++++++++++ milena/doc/examples/accu-right-instanciation.cc | 9 +++- milena/doc/examples/borderthickness.cc | 7 ++- milena/doc/examples/box2d-bbox.cc | 2 +- milena/doc/examples/domain-display.cc | 2 +- milena/doc/examples/dpoint-1.cc | 3 +- milena/doc/examples/estim-sites.cc | 3 +- milena/doc/examples/extend.cc | 13 +++++- milena/doc/examples/extension-ignore.cc | 3 +- milena/doc/examples/fill-call-1.cc | 5 ++- milena/doc/examples/fill-part-image.cc | 14 +++++- milena/doc/examples/fill-subdomain-shorter.cc | 18 +++++++- milena/doc/examples/fill-subdomain.cc | 20 +++++++- milena/doc/examples/fill-subimage-cfun.cc | 13 +++++- milena/doc/examples/fill.cc | 8 +++- milena/doc/examples/forall-piter.cc | 3 +- milena/doc/examples/fun-p2v-1.cc | 2 +- milena/doc/examples/graph-data.cc | 11 ++++- milena/doc/examples/graph-iter.cc | 5 ++- milena/doc/examples/ima-has.cc | 2 +- milena/doc/examples/ima-load.cc | 3 +- milena/doc/examples/ima-save.cc | 4 +- milena/doc/examples/ima-size.cc | 3 +- milena/doc/examples/ima2d-1.cc | 2 +- milena/doc/examples/ima2d-2.cc | 3 +- milena/doc/examples/ima2d-4.cc | 2 +- milena/doc/examples/ima2d-5.cc | 2 +- milena/doc/examples/ima2d-6-clone.cc | 3 +- milena/doc/examples/ima2d-7.cc | 4 +- milena/doc/examples/ima2d-rot.cc | 21 ++++++++- milena/doc/examples/labeling-compute.cc | 17 ++++++- milena/doc/examples/logical-not.cc | 7 ++- milena/doc/examples/mln_var.cc | 4 +- milena/doc/examples/parray-append.cc | 3 +- milena/doc/examples/parray-bbox.cc | 5 ++- milena/doc/examples/paste-call-1.cc | 10 ++++- milena/doc/examples/paste.cc | 2 +- milena/doc/examples/point-1.cc | 4 +- milena/doc/examples/predicate-1.cc | 2 +- milena/doc/examples/tuto2_first_image.cc | 5 ++- milena/doc/examples/tuto3/first_routine.cc | 25 +++++++++- milena/doc/examples/tuto3_rw_image.cc | 10 ++++- .../examples/tuto4_genericity_and_algorithms.cc | 34 +++++++++++++- milena/doc/examples/win-create-1.cc | 2 +- milena/doc/examples/win-create-2.cc | 4 +- 45 files changed, 327 insertions(+), 47 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog index 33aa88c..3341339 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,55 @@ 2009-05-28 Guillaume Lazzara lazzara@lrde.epita.fr

+ Do not use essential/2d.hh in doc samples anymore. + + * doc/examples/accu-right-instanciation.cc, + * doc/examples/borderthickness.cc, + * doc/examples/box2d-bbox.cc, + * doc/examples/domain-display.cc, + * doc/examples/dpoint-1.cc, + * doc/examples/estim-sites.cc, + * doc/examples/extend.cc, + * doc/examples/extension-ignore.cc, + * doc/examples/fill-call-1.cc, + * doc/examples/fill-part-image.cc, + * doc/examples/fill-subdomain-shorter.cc, + * doc/examples/fill-subdomain.cc, + * doc/examples/fill-subimage-cfun.cc, + * doc/examples/fill.cc, + * doc/examples/forall-piter.cc, + * doc/examples/fun-p2v-1.cc, + * doc/examples/graph-data.cc, + * doc/examples/graph-iter.cc, + * doc/examples/ima-has.cc, + * doc/examples/ima-load.cc, + * doc/examples/ima-save.cc, + * doc/examples/ima-size.cc, + * doc/examples/ima2d-1.cc, + * doc/examples/ima2d-2.cc, + * doc/examples/ima2d-4.cc, + * doc/examples/ima2d-5.cc, + * doc/examples/ima2d-6-clone.cc, + * doc/examples/ima2d-7.cc, + * doc/examples/ima2d-rot.cc, + * doc/examples/labeling-compute.cc, + * doc/examples/logical-not.cc, + * doc/examples/mln_var.cc, + * doc/examples/parray-append.cc, + * doc/examples/parray-bbox.cc, + * doc/examples/paste-call-1.cc, + * doc/examples/paste.cc, + * doc/examples/point-1.cc, + * doc/examples/predicate-1.cc, + * doc/examples/tuto2_first_image.cc, + * doc/examples/tuto3/first_routine.cc, + * doc/examples/tuto3_rw_image.cc, + * doc/examples/tuto4_genericity_and_algorithms.cc, + * doc/examples/win-create-1.cc, + * doc/examples/win-create-2.cc: replace essential/2d.hh by the proper + includes. + +2009-05-28 Guillaume Lazzara lazzara@lrde.epita.fr + Improve global_vars test.

* tests/global_vars1.cc, diff --git a/milena/doc/examples/accu-right-instanciation.cc b/milena/doc/examples/accu-right-instanciation.cc index 4e1d180..01bded3 100644 --- a/milena/doc/examples/accu-right-instanciation.cc +++ b/milena/doc/examples/accu-right-instanciation.cc @@ -1,4 +1,11 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/level/compute.hh> + +#include <mln/accu/max.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/borderthickness.cc b/milena/doc/examples/borderthickness.cc index ce02abe..fc571a2 100644 --- a/milena/doc/examples/borderthickness.cc +++ b/milena/doc/examples/borderthickness.cc @@ -1,4 +1,9 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/border/fill.hh> +#include <mln/make/image.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/thickness.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/box2d-bbox.cc b/milena/doc/examples/box2d-bbox.cc index b4bb22a..7707514 100644 --- a/milena/doc/examples/box2d-bbox.cc +++ b/milena/doc/examples/box2d-bbox.cc @@ -1,4 +1,4 @@ -#include<mln/essential/2d.hh> +#include <mln/core/alias/box2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/domain-display.cc b/milena/doc/examples/domain-display.cc index d11101f..d3845f2 100644 --- a/milena/doc/examples/domain-display.cc +++ b/milena/doc/examples/domain-display.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/dpoint-1.cc b/milena/doc/examples/dpoint-1.cc index 5ad29e6..a2b0146 100644 --- a/milena/doc/examples/dpoint-1.cc +++ b/milena/doc/examples/dpoint-1.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/point2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/estim-sites.cc b/milena/doc/examples/estim-sites.cc index 5678750..deed867 100644 --- a/milena/doc/examples/estim-sites.cc +++ b/milena/doc/examples/estim-sites.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/geom/nsites.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/extend.cc b/milena/doc/examples/extend.cc index 3448ddc..953afc0 100644 --- a/milena/doc/examples/extend.cc +++ b/milena/doc/examples/extend.cc @@ -1,6 +1,17 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/dmorph/extended.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/level/transform.hh> + #include <mln/fun/p2b/big_chess.hh> + +#include <mln/value/rgb8.hh> +#include <mln/literal/colors.hh> + #include <tests/data.hh> + #include <doc/tools/sample_utils.hh>

namespace mln diff --git a/milena/doc/examples/extension-ignore.cc b/milena/doc/examples/extension-ignore.cc index f3a0f4d..b5e88e7 100644 --- a/milena/doc/examples/extension-ignore.cc +++ b/milena/doc/examples/extension-ignore.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh>

template <typename I> void my_routine(const mln::Image<I>&) diff --git a/milena/doc/examples/fill-call-1.cc b/milena/doc/examples/fill-call-1.cc index 1afba03..0a30c85 100644 --- a/milena/doc/examples/fill-call-1.cc +++ b/milena/doc/examples/fill-call-1.cc @@ -1,4 +1,7 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/data/fill.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-part-image.cc b/milena/doc/examples/fill-part-image.cc index e3ad3a2..4e9dbf5 100644 --- a/milena/doc/examples/fill-part-image.cc +++ b/milena/doc/examples/fill-part-image.cc @@ -1,4 +1,16 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/var.hh> +#include <mln/core/site_set/p_array.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/label_8.hh> + +#include <mln/make/image.hh> + +#include <mln/data/fill.hh> + +#include <mln/debug/println.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subdomain-shorter.cc b/milena/doc/examples/fill-subdomain-shorter.cc index fc4d725..461195d 100644 --- a/milena/doc/examples/fill-subdomain-shorter.cc +++ b/milena/doc/examples/fill-subdomain-shorter.cc @@ -1,4 +1,20 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/labeling/blobs.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/pw/all.hh> + +#include <mln/data/fill.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subdomain.cc b/milena/doc/examples/fill-subdomain.cc index be94209..d1cfa94 100644 --- a/milena/doc/examples/fill-subdomain.cc +++ b/milena/doc/examples/fill-subdomain.cc @@ -1,5 +1,23 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/pw/all.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/colorize.hh> + +#include <mln/data/fill.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subimage-cfun.cc b/milena/doc/examples/fill-subimage-cfun.cc index 06d2e0d..14fa3bb 100644 --- a/milena/doc/examples/fill-subimage-cfun.cc +++ b/milena/doc/examples/fill-subimage-cfun.cc @@ -1,4 +1,15 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/data/fill.hh> + #include <doc/tools/sample_utils.hh> // { bool row_oddity(mln::point2d p) diff --git a/milena/doc/examples/fill.cc b/milena/doc/examples/fill.cc index c4184b4..c05f984 100644 --- a/milena/doc/examples/fill.cc +++ b/milena/doc/examples/fill.cc @@ -1,4 +1,10 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/load.hh> +#include <mln/literal/colors.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh>

diff --git a/milena/doc/examples/forall-piter.cc b/milena/doc/examples/forall-piter.cc index 60011f9..9deb41e 100644 --- a/milena/doc/examples/forall-piter.cc +++ b/milena/doc/examples/forall-piter.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/box2d.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fun-p2v-1.cc b/milena/doc/examples/fun-p2v-1.cc index 6a5725d..531930c 100644 --- a/milena/doc/examples/fun-p2v-1.cc +++ b/milena/doc/examples/fun-p2v-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh> // { unsigned my_values(const mln::point2d& p) { diff --git a/milena/doc/examples/graph-data.cc b/milena/doc/examples/graph-data.cc index 04cccf0..30e9ebf 100644 --- a/milena/doc/examples/graph-data.cc +++ b/milena/doc/examples/graph-data.cc @@ -1,5 +1,14 @@ -#include <mln/essential/2d.hh> +#include <mln/core/site_set/p_vertices.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/concept/function.hh> +#include <mln/core/var.hh> + +#include <mln/fun/i2v/array.hh> #include <mln/util/graph.hh> +#include <mln/pw/all.hh> + +#include <vector> +

// { template <typename S> diff --git a/milena/doc/examples/graph-iter.cc b/milena/doc/examples/graph-iter.cc index 613283a..338ae2f 100644 --- a/milena/doc/examples/graph-iter.cc +++ b/milena/doc/examples/graph-iter.cc @@ -1,5 +1,8 @@ -#include <mln/essential/2d.hh> +#include <mln/core/concept/function.hh> #include <mln/util/graph.hh> + +#include <vector> + #include <doc/tools/sample_utils.hh>

struct viota_t : public mln::Function_p2v< viota_t > diff --git a/milena/doc/examples/ima-has.cc b/milena/doc/examples/ima-has.cc index bf4332d..4882a14 100644 --- a/milena/doc/examples/ima-has.cc +++ b/milena/doc/examples/ima-has.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-load.cc b/milena/doc/examples/ima-load.cc index 9f697fd..321ba9c 100644 --- a/milena/doc/examples/ima-load.cc +++ b/milena/doc/examples/ima-load.cc @@ -1,4 +1,5 @@ -# include <mln/core/io/pbm/load.hh> +#include <mln/core/image/image2d.hh> +#include <mln/io/pbm/load.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-save.cc b/milena/doc/examples/ima-save.cc index d802555..c9cb0aa 100644 --- a/milena/doc/examples/ima-save.cc +++ b/milena/doc/examples/ima-save.cc @@ -1,4 +1,6 @@ -# include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/io/pbm/save.hh> +#include <mln/make/image.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-size.cc b/milena/doc/examples/ima-size.cc index 8e67fac..2c89f93 100644 --- a/milena/doc/examples/ima-size.cc +++ b/milena/doc/examples/ima-size.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-1.cc b/milena/doc/examples/ima2d-1.cc index 358dd3f..06f8a5e 100644 --- a/milena/doc/examples/ima2d-1.cc +++ b/milena/doc/examples/ima2d-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-2.cc b/milena/doc/examples/ima2d-2.cc index e9b5e79..0a503b1 100644 --- a/milena/doc/examples/ima2d-2.cc +++ b/milena/doc/examples/ima2d-2.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-4.cc b/milena/doc/examples/ima2d-4.cc index 6eee770..201ae63 100644 --- a/milena/doc/examples/ima2d-4.cc +++ b/milena/doc/examples/ima2d-4.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-5.cc b/milena/doc/examples/ima2d-5.cc index d4023af..c0f01e3 100644 --- a/milena/doc/examples/ima2d-5.cc +++ b/milena/doc/examples/ima2d-5.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-6-clone.cc b/milena/doc/examples/ima2d-6-clone.cc index bcc7fa2..6ec3c4b 100644 --- a/milena/doc/examples/ima2d-6-clone.cc +++ b/milena/doc/examples/ima2d-6-clone.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/routine/duplicate.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-7.cc b/milena/doc/examples/ima2d-7.cc index 3f4cd35..ccb6294 100644 --- a/milena/doc/examples/ima2d-7.cc +++ b/milena/doc/examples/ima2d-7.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/data/fill.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-rot.cc b/milena/doc/examples/ima2d-rot.cc index 515f325..18e3663 100644 --- a/milena/doc/examples/ima2d-rot.cc +++ b/milena/doc/examples/ima2d-rot.cc @@ -1,5 +1,24 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/extended.hh> +#include <mln/core/var.hh> +#include <mln/core/routine/extend.hh> + +#include <mln/value/rgb8.hh> + +#include <mln/border/fill.hh> + +#include <mln/literal/colors.hh> + +#include <mln/data/fill.hh> + +#include <mln/draw/box.hh> + +#include <mln/fun/x2x/rotation.hh> + +#include <mln/algebra/vec.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/labeling-compute.cc b/milena/doc/examples/labeling-compute.cc index 1a340d4..feb7c5c 100644 --- a/milena/doc/examples/labeling-compute.cc +++ b/milena/doc/examples/labeling-compute.cc @@ -1,5 +1,20 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/make/image.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/colorize.hh> +#include <mln/labeling/compute.hh> + +#include <mln/util/array.hh> + +#include <mln/accu/bbox.hh> + +#include <mln/value/label_8.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/logical-not.cc b/milena/doc/examples/logical-not.cc index ac718b8..16cb0b4 100644 --- a/milena/doc/examples/logical-not.cc +++ b/milena/doc/examples/logical-not.cc @@ -1,4 +1,9 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/make/image.hh> + +#include <mln/logical/not.hh> + #include <doc/tools/sample_utils.hh> int main() { diff --git a/milena/doc/examples/mln_var.cc b/milena/doc/examples/mln_var.cc index ad3a59c..a0962f8 100644 --- a/milena/doc/examples/mln_var.cc +++ b/milena/doc/examples/mln_var.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/concept/function.hh> #include <mln/pw/all.hh> #include <mln/core/var.hh>

diff --git a/milena/doc/examples/parray-append.cc b/milena/doc/examples/parray-append.cc index 3bd7cdb..7220cb8 100644 --- a/milena/doc/examples/parray-append.cc +++ b/milena/doc/examples/parray-append.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/alias/point2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/parray-bbox.cc b/milena/doc/examples/parray-bbox.cc index e5d880f..0485b5f 100644 --- a/milena/doc/examples/parray-bbox.cc +++ b/milena/doc/examples/parray-bbox.cc @@ -1,4 +1,7 @@ -#include<mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/geom/bbox.hh> +#include <mln/core/site_set/p_array.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/paste-call-1.cc b/milena/doc/examples/paste-call-1.cc index 01a8bc5..fe455e5 100644 --- a/milena/doc/examples/paste-call-1.cc +++ b/milena/doc/examples/paste-call-1.cc @@ -1,4 +1,12 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/make/box2d.hh> + +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> + +#include <mln/debug/println.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/paste.cc b/milena/doc/examples/paste.cc index 65c5eb1..92663cf 100644 --- a/milena/doc/examples/paste.cc +++ b/milena/doc/examples/paste.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh>

// { template <typename I, typename J> diff --git a/milena/doc/examples/point-1.cc b/milena/doc/examples/point-1.cc index e190b4c..735620c 100644 --- a/milena/doc/examples/point-1.cc +++ b/milena/doc/examples/point-1.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/predicate-1.cc b/milena/doc/examples/predicate-1.cc index 6d99dfc..d2e5d5c 100644 --- a/milena/doc/examples/predicate-1.cc +++ b/milena/doc/examples/predicate-1.cc @@ -1,4 +1,4 @@ -# include <mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh>

// { //function_p2b diff --git a/milena/doc/examples/tuto2_first_image.cc b/milena/doc/examples/tuto2_first_image.cc index 0e3a6a6..7515a8e 100644 --- a/milena/doc/examples/tuto2_first_image.cc +++ b/milena/doc/examples/tuto2_first_image.cc @@ -1,4 +1,7 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/image.hh> +#include <mln/debug/println.hh> + #include <doc/tools/sample_utils.hh> int main() { diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index 5ed5919..2426a0f 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -1,6 +1,25 @@ /// \file doc/examples/tuto3/first_routine.cc

-#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/data/fill.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/blobs.hh> + +#include <mln/level/compare.hh> + +#include <mln/util/array.hh> + +#include <mln/value/label_8.hh> + +#include <mln/accu/count.hh> + +#include <mln/pw/all.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh>

@@ -32,7 +51,7 @@ namespace mln

for (unsigned i = 1; i <= nlabels; ++i) if (count[i] < 10u) - data::fill((output | pw::value(lbl) == pw::cst(i)).rw(), literal::zero); + data::fill((output | (pw::value(lbl) == pw::cst(i))).rw(), literal::zero);

trace::exiting("my_algorithm"); return output; @@ -81,7 +100,7 @@ namespace sandbox // { for (unsigned i = 1; i <= nlabels; ++i) if (count[i] < 10u) - data::fill((output | pw::value(lbl) == pw::cst(i)).rw(), literal::zero); + data::fill((output | (pw::value(lbl) == pw::cst(i))).rw(), literal::zero); // }

// { diff --git a/milena/doc/examples/tuto3_rw_image.cc b/milena/doc/examples/tuto3_rw_image.cc index a130da8..7bc10d8 100644 --- a/milena/doc/examples/tuto3_rw_image.cc +++ b/milena/doc/examples/tuto3_rw_image.cc @@ -1,6 +1,14 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index cb091bb..9074c06 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -1,6 +1,36 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/fun/p2b/chess.hh> + +#include <mln/extract/green.hh> + +#include <mln/accu/max.hh> + +#include <mln/geom/all.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> + +#include <mln/opt/at.hh> + +#include <mln/data/fill.hh> + +#include <mln/pw/all.hh> + #include <mln/binarization/threshold.hh> + #include <mln/labeling/colorize.hh> +#include <mln/labeling/blobs.hh> + +#include <mln/literal/colors.hh> +#include <mln/literal/max.hh> + + #include <tests/data.hh> #include <doc/tools/sample_utils.hh>

@@ -8,7 +38,7 @@ struct keep_specific_colors : public mln::Function_v2b<keep_specific_colors> { bool operator()(const mln::value::rgb8& v) const { - return v.green() < 200 && v.blue() > 100; + return v.green() < 200u && v.blue() > 100u; } };

diff --git a/milena/doc/examples/win-create-1.cc b/milena/doc/examples/win-create-1.cc index b6d6e89..36d9d7a 100644 --- a/milena/doc/examples/win-create-1.cc +++ b/milena/doc/examples/win-create-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/window2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/win-create-2.cc b/milena/doc/examples/win-create-2.cc index 193f729..13aa7ea 100644 --- a/milena/doc/examples/win-create-2.cc +++ b/milena/doc/examples/win-create-2.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/convert/to.hh> + int main() { using namespace mln;