Fix QImage conversions.

	* mln/convert/to_qimage.hh: Fix a duplicate declaration.

	* mln/convert/to_qimage_nocopy.hh: Fix the minimum version
	required.

milena/ChangeLog

+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

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;

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