* headers.mk: add mln/io/cloud/all.hh. * tests/unit_test/Makefile.am, * tests/unit_test/mln_io_cloud_all.cc: add missing unit test. * mln/accu/rms.hh, * mln/convert/impl/from_image_to_site_set.hh, * mln/core/alias/all.hh, * mln/fun/p2p/translation.hh, * mln/trace/exiting.hh, * mln/transform/internal/closest_point_functor.hh: add missing includes. * mln/debug/slices_2d.hh: remove an unused variable. --- milena/ChangeLog | 19 ++++++ milena/headers.mk | 1 + milena/mln/accu/rms.hh | 1 + milena/mln/convert/impl/from_image_to_site_set.hh | 1 + milena/mln/core/alias/all.hh | 60 ++++++++++---------- milena/mln/debug/slices_2d.hh | 1 - milena/mln/fun/p2p/translation.hh | 1 + milena/mln/trace/exiting.hh | 6 ++- .../transform/internal/closest_point_functor.hh | 1 + milena/tests/unit_test/Makefile.am | 2 + milena/tests/unit_test/mln_io_cloud_all.cc | 11 ++++ 11 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 milena/tests/unit_test/mln_io_cloud_all.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 79b7000..da694aa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,24 @@ 2009-02-03 Guillaume Lazzara <z@lrde.epita.fr> + Fix distribution. + + * headers.mk: add mln/io/cloud/all.hh. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_io_cloud_all.cc: add missing unit test. + + * mln/accu/rms.hh, + * mln/convert/impl/from_image_to_site_set.hh, + * mln/core/alias/all.hh, + * mln/fun/p2p/translation.hh, + * mln/trace/exiting.hh, + * mln/transform/internal/closest_point_functor.hh: add missing + includes. + + * mln/debug/slices_2d.hh: remove an unused variable. + +2009-02-03 Guillaume Lazzara <z@lrde.epita.fr> + Improve accu::center. * mln/accu/center.hh: Returns a vector instead of a site. The vector diff --git a/milena/headers.mk b/milena/headers.mk index d109eb7..48ce0e0 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1001,6 +1001,7 @@ mln/io/raw/load.hh \ mln/io/raw/all.hh \ mln/io/raw/save.hh \ mln/io/cloud/load.hh \ +mln/io/cloud/all.hh \ mln/io/cloud/save.hh \ mln/io/all.hh \ mln/io/pbm/load.hh \ diff --git a/milena/mln/accu/rms.hh b/milena/mln/accu/rms.hh index c873686..339eabc 100644 --- a/milena/mln/accu/rms.hh +++ b/milena/mln/accu/rms.hh @@ -34,6 +34,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/accu/internal/base.hh> +# include <mln/math/sqrt.hh> namespace mln diff --git a/milena/mln/convert/impl/from_image_to_site_set.hh b/milena/mln/convert/impl/from_image_to_site_set.hh index e6e9e69..2e79f7e 100644 --- a/milena/mln/convert/impl/from_image_to_site_set.hh +++ b/milena/mln/convert/impl/from_image_to_site_set.hh @@ -38,6 +38,7 @@ # include <utility> # include <mln/core/site_set/p_run.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/metal/converts_to.hh> diff --git a/milena/mln/core/alias/all.hh b/milena/mln/core/alias/all.hh index ce509a6..a7dde7f 100644 --- a/milena/mln/core/alias/all.hh +++ b/milena/mln/core/alias/all.hh @@ -32,35 +32,35 @@ /// /// File that includes all the aliases. -#include <box1d.hh> -#include <box2d.hh> -#include <box2d_h.hh> -#include <box3d.hh> -#include <complex_geometry.hh> -#include <complex_image.hh> -#include <dpoint1d.hh> -#include <dpoint2d.hh> -#include <dpoint2d_h.hh> -#include <dpoint3d.hh> -#include <neighb1d.hh> -#include <neighb2d.hh> -#include <neighb3d.hh> -#include <p_run2d.hh> -#include <p_runs2d.hh> -#include <point1d.hh> -#include <point2d.hh> -#include <point2d_h.hh> -#include <point3d.hh> -#include <point3df.hh> -#include <vec3d.hh> -#include <w_window1d_float.hh> -#include <w_window1d_int.hh> -#include <w_window2d_float.hh> -#include <w_window2d_int.hh> -#include <w_window3d_float.hh> -#include <w_window3d_int.hh> -#include <window1d.hh> -#include <window2d.hh> -#include <window3d.hh> +#include <mln/core/alias/box1d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/box2d_h.hh> +#include <mln/core/alias/box3d.hh> +#include <mln/core/alias/complex_geometry.hh> +#include <mln/core/alias/complex_image.hh> +#include <mln/core/alias/dpoint1d.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/dpoint2d_h.hh> +#include <mln/core/alias/dpoint3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/core/alias/p_run2d.hh> +#include <mln/core/alias/p_runs2d.hh> +#include <mln/core/alias/point1d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/point2d_h.hh> +#include <mln/core/alias/point3d.hh> +#include <mln/core/alias/point3df.hh> +#include <mln/core/alias/vec3d.hh> +#include <mln/core/alias/w_window1d_float.hh> +#include <mln/core/alias/w_window1d_int.hh> +#include <mln/core/alias/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/core/alias/w_window3d_float.hh> +#include <mln/core/alias/w_window3d_int.hh> +#include <mln/core/alias/window1d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/window3d.hh> #endif // ! MLN_CORE_ALIAS_ALL_HH diff --git a/milena/mln/debug/slices_2d.hh b/milena/mln/debug/slices_2d.hh index 87b5729..c858b86 100644 --- a/milena/mln/debug/slices_2d.hh +++ b/milena/mln/debug/slices_2d.hh @@ -127,7 +127,6 @@ namespace mln unsigned round_up(float f) { unsigned n = static_cast<unsigned>(f + 0.499999f); - int i; if (n == 0u) ++n; if (float(n) < f) diff --git a/milena/mln/fun/p2p/translation.hh b/milena/mln/fun/p2p/translation.hh index b4f54a7..8b186f0 100644 --- a/milena/mln/fun/p2p/translation.hh +++ b/milena/mln/fun/p2p/translation.hh @@ -34,6 +34,7 @@ /// FIXME: doc # include <mln/core/concept/function.hh> +# include <mln/core/concept/gdpoint.hh> namespace mln diff --git a/milena/mln/trace/exiting.hh b/milena/mln/trace/exiting.hh index 240ceae..4cd6491 100644 --- a/milena/mln/trace/exiting.hh +++ b/milena/mln/trace/exiting.hh @@ -35,10 +35,11 @@ # include <string> # include <iostream> +# include <stack> +# include <mln/core/contract.hh> # include <mln/trace/quiet.hh> - namespace mln { @@ -48,6 +49,9 @@ namespace mln void exiting(const std::string& scope); + extern std::stack<std::clock_t> start_times; + extern std::stack<std::string> scopes; // For testing purpose + // (entering/exiting scope matching). # ifndef MLN_INCLUDE_ONLY diff --git a/milena/mln/transform/internal/closest_point_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh index 634d44c..02b3401 100644 --- a/milena/mln/transform/internal/closest_point_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -33,6 +33,7 @@ /// Closest point functor. # include <mln/core/macros.hh> +# include <mln/trait/ch_value.hh> namespace mln { diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 9ad9c7c..8c4e274 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -967,6 +967,7 @@ mln_io_raw_load \ mln_io_raw_all \ mln_io_raw_save \ mln_io_cloud_load \ +mln_io_cloud_all \ mln_io_cloud_save \ mln_io_all \ mln_io_pbm_load \ @@ -2008,6 +2009,7 @@ mln_io_raw_load_SOURCES = mln_io_raw_load.cc mln_io_raw_all_SOURCES = mln_io_raw_all.cc mln_io_raw_save_SOURCES = mln_io_raw_save.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc +mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc mln_io_all_SOURCES = mln_io_all.cc mln_io_pbm_load_SOURCES = mln_io_pbm_load.cc diff --git a/milena/tests/unit_test/mln_io_cloud_all.cc b/milena/tests/unit_test/mln_io_cloud_all.cc new file mode 100644 index 0000000..8501037 --- /dev/null +++ b/milena/tests/unit_test/mln_io_cloud_all.cc @@ -0,0 +1,11 @@ +// Unit test for mln/io/cloud/all.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/io/cloud/all.hh> +#include <mln/io/cloud/all.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5