diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-12-06 15:30:53 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:47:56 -0300 |
| commit | f5f2b23a70bb4dbd590cd24f28c0f5740e0f9ef6 (patch) | |
| tree | faf766671c30f5b095df4abf00f7e8309a34a886 /PySide | |
| parent | edf5b58da83696ad908ac21b18bdd9a343d842ee (diff) | |
Fixes QImage constructor signature that used string buffer as image data source.
The fixes uses the patch provided by Pieter Palmers on the bug #489
description[1].
A very simple test, to check the signature existence, was added.
[1] http://bugs.openbossa.org/show_bug.cgi?id=489
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index cf4b6744c..485d5425b 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -665,11 +665,33 @@ <modify-function signature="QImage(const char *, const char *)" remove="all" /> <modify-function signature="QImage(const char **)" remove="all" /> - <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all" /> + + <template name="QImageStringBufferConversionRule"> + const uchar* %out = reinterpret_cast<const uchar*>(PyString_AS_STRING(%PYARG_1)); + </template> + + <modify-function signature="QImage(uchar *,int,int,int,QImage::Format)" remove="all"/> + <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)"> + <modify-argument index="1"> + <replace-type modified-type="const char*"/> + <conversion-rule class="native"> + <insert-template name="QImageStringBufferConversionRule"/> + </conversion-rule> + </modify-argument> + </modify-function> <modify-function signature="bits()const" remove="all" /> <modify-function signature="scanLine(int)const" remove="all" /> - <modify-function signature="QImage(const uchar *, int, int, QImage::Format)" remove="all" /> + <modify-function signature="QImage(uchar*,int,int,QImage::Format)" remove="all" /> + <modify-function signature="QImage(const uchar *, int, int, QImage::Format)"> + <modify-argument index="1"> + <replace-type modified-type="const char*"/> + <conversion-rule class="native"> + <insert-template name="QImageStringBufferConversionRule"/> + </conversion-rule> + </modify-argument> + </modify-function> + <modify-function signature="loadFromData(const uchar*,int,const char*)" remove="all" /> <modify-function signature="setText(const char*,const char*,QString)" remove="all" /> <modify-function signature="text(const char*,const char*)const" remove="all" /> @@ -678,10 +700,6 @@ <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="QImage(const char**)" remove="all"/> - <modify-function signature="QImage(const uchar *,int,int,QImage::Format)" remove="all"/> - <modify-function signature="QImage(const uchar *,int,int,int,QImage::Format)" remove="all"/> - <modify-function signature="QImage(uchar *,int,int,QImage::Format)" remove="all"/> - <modify-function signature="QImage(uchar *,int,int,int,QImage::Format)" remove="all"/> <modify-function signature="setColorTable(const QVector<uint>)" remove="all"/> <modify-function signature="loadFromData(const uchar *,int,const char *)" remove="all"/> <modify-function signature="fromData(const uchar *,int,const char *)" remove="all"/> |