diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index f394781..63fec04 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -722,45 +722,85 @@
-
- const uchar* %out = reinterpret_cast<const uchar*>(PyString_AS_STRING(%PYARG_1));
+
+ PyTypeObject* pyType = reinterpret_cast<PyTypeObject*>(%PYARG_1->ob_type);
+ if (pyType->tp_as_buffer
+ && pyType->tp_as_buffer->bf_getreadbuffer
+ && pyType->tp_as_buffer->bf_getsegcount(%PYARG_1, 0) == 1) {
+ void* ptr;
+ pyType->tp_as_buffer->bf_getreadbuffer(%PYARG_1, 0, &ptr);
+ %0 = new %TYPE((uchar*)ptr, %ARGS);
+ } else {
+ PyErr_SetString(PyExc_TypeError, "The object must support buffer protocol with just one segment.");
+ }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
-
-
+
+
+
+ %PYARG_0 = PyBuffer_FromMemory(const_cast<uchar*>(%CPPSELF.%FUNCTION_NAME()), %CPPSELF.byteCount());
+
+
+
+
+ // byteCount() is only available on Qt4.7, so we use bytesPerLine * height
+ %PYARG_0 = PyBuffer_FromReadWriteMemory(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.bytesPerLine() * %CPPSELF.height());
+
+
+
+
+ %PYARG_0 = PyBuffer_FromMemory(const_cast<uchar*>(%CPPSELF.%FUNCTION_NAME(%1)), %CPPSELF.bytesPerLine());
+
+
+
+
+ %PYARG_0 = PyBuffer_FromReadWriteMemory(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine());
+
+
+
+
+
+
diff --git a/tests/QtGui/qimage_test.py b/tests/QtGui/qimage_test.py
index d8aa545..e9af2d7 100644
--- a/tests/QtGui/qimage_test.py
+++ b/tests/QtGui/qimage_test.py
@@ -2,18 +2,30 @@
'''Test cases for QImage'''
import unittest
-
-from PySide.QtGui import QImage
-
-from helper import UsesQApplication
+from PySide.QtGui import *
+from helper import *
class QImageTest(UsesQApplication):
'''Test case for calling setPixel with float as argument'''
def testQImageStringBuffer(self):
'''Test if the QImage signatures receiving string buffers exist.'''
- img0 = QImage('', 100, 100, QImage.Format_ARGB32)
- img1 = QImage('', 100, 100, 0, QImage.Format_ARGB32)
+ img0 = QImage(adjust_filename('sample.png', __file__))
+
+ print type(img0.bits())
+
+ # btw let's test the bits() method
+ img1 = QImage(img0.bits(), img0.width(), img0.height(), img0.format())
+ self.assertEqual(img0, img1)
+ img2 = QImage(img0.bits(), img0.width(), img0.height(), img0.bytesPerLine(), img0.format())
+ self.assertEqual(img0, img2)
+
+ ## test scanLine method
+ data1 = img0.scanLine(0)
+ data2 = img1.scanLine(0)
+ self.assertEqual(data1, data2)
+ self.assertEquals(str(data1), img0.bits()[:img0.bytesPerLine()])
+ self.assertEquals(str(data2), img0.bits()[:img0.bytesPerLine()])
if __name__ == '__main__':
unittest.main()