X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d446efa1839f0a15d858081c0dab58d23312c2bd..a1595050bc43d70aa8df213c0c7ac8217d61b778:/lib/gdi/picload.cpp

diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
index 50289a64..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;
 
@@ -651,10 +649,10 @@ int loadPic(ePtr<gPixmap> &result, std::string filename, int w, int h, int aspec
 		double aspect_ratio;
 		switch(aspect)
 		{
-			case 1:		aspect_ratio = 1.778 / ((double)720/576); break; //16:9
-			case 2:		aspect_ratio = 1.600 / ((double)720/576); break; //16:10
-			//case 3:	aspect_ratio = 1.250 / ((double)720/576); break; //5:4
-			default:	aspect_ratio = 1.333 / ((double)720/576); //4:3
+			case 1:		aspect_ratio = 1.778 / ((double)702/576); break; //16:9
+			case 2:		aspect_ratio = 1.600 / ((double)702/576); break; //16:10
+			//case 3:	aspect_ratio = 1.250 / ((double)702/576); break; //5:4
+			default:	aspect_ratio = 1.333 / ((double)702/576); //4:3
 		}
 
 		if((aspect_ratio * oy * w / ox) <= h)