URL:
https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-09-07 Simon Nivault <simon.nivault(a)lrde.epita.fr>
Some fix for compiling
* sandbox/nivault/dirbrowsing.hh: .
* sandbox/nivault/median.hh: .
* sandbox/nivault/tests/test: .
---
dirbrowsing.hh | 2 +-
median.hh | 8 ++++----
tests/test | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
Index: trunk/milena/sandbox/nivault/tests/test
===================================================================
--- trunk/milena/sandbox/nivault/tests/test (revision 1089)
+++ trunk/milena/sandbox/nivault/tests/test (revision 1090)
@@ -1,4 +1,4 @@
#!/bin/bash
-g++ -I../../.. -I../.. -I.. test.cc -O1
+g++-4.1 -ansi -pedantic -W -Wall -Wextra -Wconversion -I../../.. -I../.. -I.. test.cc
./a.out
Index: trunk/milena/sandbox/nivault/dirbrowsing.hh
===================================================================
--- trunk/milena/sandbox/nivault/dirbrowsing.hh (revision 1089)
+++ trunk/milena/sandbox/nivault/dirbrowsing.hh (revision 1090)
@@ -63,7 +63,7 @@
template <typename F>
void dirbrowsing(F& f)
{
- mln_point(F::point)
+ mln_point(F)
pmin = f.input.domain().pmin(),
pmax = f.input.domain().pmax();
Index: trunk/milena/sandbox/nivault/median.hh
===================================================================
--- trunk/milena/sandbox/nivault/median.hh (revision 1089)
+++ trunk/milena/sandbox/nivault/median.hh (revision 1090)
@@ -43,7 +43,7 @@
# include <mln/core/dpoint.hh>
# include <mln/accu/median.hh>
-# include <mln/canvas/sbrowsing.hh>
+# include <mln/canvas/browsing/snake_fwd.hh>
# include <mln/geom/shift.hh>
# include <mln/set/diff.hh>
@@ -88,13 +88,13 @@
// i/o
const I& input;
O& output;
- unsigned dir;
+ int dir;
int dim;
const win::hline2d& win;
accu::median<mln_vset(I)> med;
// ctor
- median_dir_functor(const Image<I>& input_, const win::hline2d& win_,
unsigned dir_, O& output_)
+ median_dir_functor(const Image<I>& input_, const win::hline2d& win_, int
dir_, O& output_)
:
input(exact(input_)),
output(exact(output_)),
@@ -162,7 +162,7 @@
// // median_dir monolythique
// template <typename I, typename O>
-// void median_dir(const Image<I>& input_, const win::hline2d& win,
unsigned dir, O& output)
+// void median_dir(const Image<I>& input_, const win::hline2d& win,
int dir, O& output)
// {
// const unsigned dim = I::point::dim;
// mln_precondition(dir < dim);