From 0c5809474bf157d020ebd94aa903b3faccae4a6a Mon Sep 17 00:00:00 2001
From: Renato Filho <renato.filho@openbossa.org>
Date: Wed, 13 Apr 2011 18:27:09 -0300
Subject: Implemented function QBitmap.fromData.

Fixes bug #740

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
---
 PySide/QtGui/typesystem_gui_common.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 70d3c7d7b..d06502f60 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -378,8 +378,17 @@
   </value-type>
   <value-type name="QTextFragment" />
   <value-type name="QBitmap" >
-    <!-- ### See bug 740 -->
-    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)" remove="all" />
+    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
+      <modify-argument index="2">
+        <replace-type modified-type="PyObject"/>
+      </modify-argument>
+      <inject-code>
+        const void* buffer;
+        Py_ssize_t size;
+        if (PyObject_AsReadBuffer(%PYARG_2, &amp;buffer, &amp;size) != -1)
+            %PYARG_0 = %CONVERTTOPYTHON[QBitmap](QBitmap::fromData(%1, (const uchar*)buffer, %3));
+      </inject-code>
+    </modify-function>
   </value-type>
   <value-type name="QTextInlineObject" />
   <value-type name="QSizePolicy">
-- 
cgit v1.2.3