[Olena-patches] 2858: Fix wrong includes and missing namespaces.

* mln/linear/all.hh, * mln/make/essential.hh: Fix wrong includes. * mln/make/win_chamfer.hh: fix missing namespaces. --- milena/ChangeLog | 9 +++++++++ milena/mln/linear/all.hh | 3 ++- milena/mln/make/essential.hh | 2 +- milena/mln/make/win_chamfer.hh | 32 ++++++++++++++++---------------- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c412779..f58f2a6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-11-06 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix wrong includes and missing namespaces. + + * mln/linear/all.hh, + * mln/make/essential.hh: Fix wrong includes. + + * mln/make/win_chamfer.hh: fix missing namespaces. + 2008-11-12 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Add a saving routine for rgb8 (color) 2-complex images. diff --git a/milena/mln/linear/all.hh b/milena/mln/linear/all.hh index 881466e..d69c0b2 100644 --- a/milena/mln/linear/all.hh +++ b/milena/mln/linear/all.hh @@ -58,11 +58,12 @@ namespace mln } +# include <mln/linear/ch_convolve.hh> # include <mln/linear/convolve.hh> +# include <mln/linear/convolve_2x1d.hh> # include <mln/linear/convolve_directional.hh> # include <mln/linear/gaussian.hh> # include <mln/linear/lap.hh> -# include <mln/linear/line_x2_convolve.hh> # include <mln/linear/log.hh> //# include <mln/linear/sobel.hh> //# include <mln/linear/local/convolve.hh> diff --git a/milena/mln/make/essential.hh b/milena/mln/make/essential.hh index c69e50b..d0e8f85 100644 --- a/milena/mln/make/essential.hh +++ b/milena/mln/make/essential.hh @@ -42,7 +42,7 @@ # include <mln/make/vec.hh> //# include <mln/make/voronoi.hh> # include <mln/make/w_window.hh> -# include <mln/make/w_window_line.hh> +# include <mln/make/w_window_directional.hh> //# include <mln/make/win_chamfer.hh> #endif // ! MLN_MAKE_ESSENTIAL_HH diff --git a/milena/mln/make/win_chamfer.hh b/milena/mln/make/win_chamfer.hh index cbe738b..9ba3791 100644 --- a/milena/mln/make/win_chamfer.hh +++ b/milena/mln/make/win_chamfer.hh @@ -48,18 +48,18 @@ namespace mln { template<int d10, int d11> - const w_window2d_int + const mln::w_window2d_int mk_chamfer_3x3_int() { int ws[] = { d11, d10, d11, d10, 0, 0, 0, 0, 0 }; - + return (make::w_window2d(ws)); } - + template<int d10, int d11, int d21> - const w_window2d_int + const mln::w_window2d_int mk_chamfer_5x5_int() { int ws[] = { 0, d21, 0, d21, 0, @@ -67,21 +67,21 @@ namespace mln 0, d10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - + return (make::w_window2d(ws)); } - - const w_window2d_float + + const mln::w_window2d_float mk_chamfer_3x3_float(float d10, float d11) { float ws[] = { d11, d10, d11, d10, 0, 0, 0, 0, 0 }; - + return (make::w_window2d(ws)); } - - const w_window2d_float + + const mln::w_window2d_float mk_chamfer_5x5_float(float d10, float d11, float d21) { float ws[] = { 0, d21, 0, d21, 0, @@ -89,23 +89,23 @@ namespace mln 0, d10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - + return (make::w_window2d(ws)); } - - const w_window2d_float + + const mln::w_window2d_float mk_chamfer_exact() { float r2 = sqrt(2); float ws[] = { r2, 1, r2, 1, 0, 0, 0, 0, 0 }; - + return (make::w_window2d(ws)); } - + } // end of namespace mln::make - + } // end of namespace mln #endif // ! MLN_MAKE_WIN_CHAMFER_HH -- 1.5.6.5