git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now its possible to call ePixmap.setPixmap from python without use of
[enigma2.git]
/
lib
/
gdi
/
picload.cpp
diff --git
a/lib/gdi/picload.cpp
b/lib/gdi/picload.cpp
index b3ffe2a8b0dfb9d1c62e2d592e822e3768dab7a3..43dfe3a0d09a7fc8e8073cc64d34a991a7b3db9c 100644
(file)
--- a/
lib/gdi/picload.cpp
+++ b/
lib/gdi/picload.cpp
@@
-1,5
+1,6
@@
-#include
"picload.h"
+#include
<lib/gdi/picload.h>
#include "picexif.h"
#include "picexif.h"
+#include <lib/python/python.h>
#include <png.h>
#include <png.h>
@@
-335,7
+336,7
@@
static int png_load(const char *filename, int *x, int *y)
PyObject *getExif(const char *filename)
{
PyObject *getExif(const char *filename)
{
-
PyObject *list = 0
;
+
ePyObject list
;
Cexif exif;
if(exif.DecodeExif(filename))
{
Cexif exif;
if(exif.DecodeExif(filename))
{
@@
-388,7
+389,7
@@
PyObject *getExif(const char *filename)
PyList_SET_ITEM(list, 0, PyString_FromString(exif.m_szLastError));
}
PyList_SET_ITEM(list, 0, PyString_FromString(exif.m_szLastError));
}
- return list ?
list :
PyList_New(0);
+ return list ?
(PyObject*)list : (PyObject*)
PyList_New(0);
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------