* mln/convert/to_qimage.hh: Fix a duplicate declaration. * mln/convert/to_qimage_nocopy.hh: Fix the minimum version required. --- milena/ChangeLog | 8 ++++++++ milena/mln/convert/to_qimage.hh | 1 - milena/mln/convert/to_qimage_nocopy.hh | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 milena/mln/convert/to_qimage.hh mode change 100644 => 100755 milena/mln/convert/to_qimage_nocopy.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 19cb4e5..9a5aa9b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-18 Guillaume Lazzara <z@lrde.epita.fr> + Fix QImage conversions. + + * mln/convert/to_qimage.hh: Fix a duplicate declaration. + + * mln/convert/to_qimage_nocopy.hh: Fix the minimum version required. + +2010-11-18 Guillaume Lazzara <z@lrde.epita.fr> + * mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh old mode 100644 new mode 100755 index b5b22ae..cd00cdc --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -86,7 +86,6 @@ namespace mln # if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 QImage qima(ncols, nrows, QImage::Format_RGB32); uchar * ptr_qima = qima.bits(); - unsigned offset = ima.delta_index(dpoint2d(+1, - ncols)); unsigned padding = 0; # if Q_BYTE_ORDER == Q_LITTLE_ENDIAN ++ptr_qima; diff --git a/milena/mln/convert/to_qimage_nocopy.hh b/milena/mln/convert/to_qimage_nocopy.hh old mode 100644 new mode 100755 index 91a96ad..93e0ebb --- a/milena/mln/convert/to_qimage_nocopy.hh +++ b/milena/mln/convert/to_qimage_nocopy.hh @@ -77,7 +77,7 @@ namespace mln } -# if QT_VERSION > 0x040300 +# if QT_VERSION >= 0x040400 template <typename I> inline @@ -120,7 +120,7 @@ namespace mln } -# if QT_VERSION > 0x040300 +# if QT_VERSION >= 0x040400 template <typename I> inline -- 1.5.6.5