Commit f09fec4f authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix QImage conversions.

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

	* mln/convert/to_qimage_nocopy.hh: Fix the minimum version
	required.
parent 75486e11
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> 2010-11-18 Guillaume Lazzara <z@lrde.epita.fr>
   
* mln/convert/from_to.hh: Use value::cast for default builtin * mln/convert/from_to.hh: Use value::cast for default builtin
...@@ -86,7 +86,6 @@ namespace mln ...@@ -86,7 +86,6 @@ namespace mln
# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 # if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400
QImage qima(ncols, nrows, QImage::Format_RGB32); QImage qima(ncols, nrows, QImage::Format_RGB32);
uchar * ptr_qima = qima.bits(); uchar * ptr_qima = qima.bits();
unsigned offset = ima.delta_index(dpoint2d(+1, - ncols));
unsigned padding = 0; unsigned padding = 0;
# if Q_BYTE_ORDER == Q_LITTLE_ENDIAN # if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
++ptr_qima; ++ptr_qima;
......
...@@ -77,7 +77,7 @@ namespace mln ...@@ -77,7 +77,7 @@ namespace mln
} }
# if QT_VERSION > 0x040300 # if QT_VERSION >= 0x040400
template <typename I> template <typename I>
inline inline
...@@ -120,7 +120,7 @@ namespace mln ...@@ -120,7 +120,7 @@ namespace mln
} }
# if QT_VERSION > 0x040300 # if QT_VERSION >= 0x040400
template <typename I> template <typename I>
inline inline
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment