aboutsummaryrefslogtreecommitdiff
path: root/lib/gdi/picload.cpp
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2008-03-25 16:01:47 +0000
committerAndreas Oberritter <obi@opendreambox.org>2008-03-25 16:01:47 +0000
commit055a01deb76a681dda718ec58f972dd20b82a8c3 (patch)
treeb1205be966dcacb4ad33fc0916d53c5c89af5de2 /lib/gdi/picload.cpp
parent369453136be3251354bf77bfa79c8c2e445e2cd2 (diff)
downloadenigma2-055a01deb76a681dda718ec58f972dd20b82a8c3.tar.gz
enigma2-055a01deb76a681dda718ec58f972dd20b82a8c3.zip
include png.h before any other headers, because it complains if setjmp.h was included by another header (i.e. Python.h)
Diffstat (limited to 'lib/gdi/picload.cpp')
-rw-r--r--lib/gdi/picload.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
index f8949cff..e8a0e8c0 100644
--- a/lib/gdi/picload.cpp
+++ b/lib/gdi/picload.cpp
@@ -1,9 +1,8 @@
+#include <png.h> // must be included before Python.h because of setjmp
#include <lib/gdi/picload.h>
#include "picexif.h"
#include <lib/python/python.h>
-#include <png.h>
-
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
@@ -14,7 +13,6 @@ extern "C" {
#include <gif_lib.h>
//#include "transupp.h"
}
-#include <setjmp.h>
unsigned char *pic_buffer=NULL;