jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes bug #489 - PySide.QtGui.QImage with string buffer argument.

Browse source 
http://bugs.pyside.org/show_bug.cgi?id=489

Also added an unit test.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Marcelo Lira 2011-04-01 09:20:05 -03:00 • committed by Hugo Parente Lima
commit 2e1ed4a881
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
PySide/QtGui/typesystem_gui_common.xml
View file

@ -803,6 +803,21 @@
</inject-code> </inject-code>
</modify-function> </modify-function>
<add-function signature="QImage(QString,int,int,int,QImage::Format)">
<inject-code>
<insert-template name="qimage_buffer_constructor">
<replace from="%ARGS" to="%2, %3, %4, %5" />
</insert-template>
</inject-code>
</add-function>
<add-function signature="QImage(QString,int,int,QImage::Format)">
<inject-code>
<insert-template name="qimage_buffer_constructor">
<replace from="%ARGS" to="%2, %3, %4" />
</insert-template>
</inject-code>
</add-function>
<!-- The non-const versions are already used --> <!-- The non-const versions are already used -->
<modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all"/> <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all"/>
<modify-function signature="QImage(const uchar*,int,int,QImage::Format)" remove="all" /> <modify-function signature="QImage(const uchar*,int,int,QImage::Format)" remove="all" />

11
tests/QtGui/qimage_test.py
View file

@ -2,8 +2,8 @@
'''Test cases for QImage''' '''Test cases for QImage'''
import unittest import unittest
from PySide.QtGui import * from PySide.QtGui import QImage
from helper import * from helper import UsesQApplication, adjust_filename
class QImageTest(UsesQApplication): class QImageTest(UsesQApplication):
'''Test case for calling setPixel with float as argument''' '''Test case for calling setPixel with float as argument'''
@ -27,6 +27,13 @@ class QImageTest(UsesQApplication):
self.assertEquals(str(data1), img0.bits()[:img0.bytesPerLine()]) self.assertEquals(str(data1), img0.bits()[:img0.bytesPerLine()])
self.assertEquals(str(data2), img0.bits()[:img0.bytesPerLine()]) self.assertEquals(str(data2), img0.bits()[:img0.bytesPerLine()])
def testEmptyBuffer(self):
img = QImage(buffer(''), 100, 100, QImage.Format_ARGB32)
def testEmptyStringAsBuffer(self):
img = QImage('', 100, 100, QImage.Format_ARGB32)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()