fix in entity teleport detection of FlyMove

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index 61892e5e5fba299f05c6ab74fa720410d88fbc34..0d58d4a36f33e95e4b64163c08dd4aef42d3c972 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -126,10 +126,11 @@ qboolean PNG_OpenLibrary (void)
        const char* dllnames [] =
        {
 #if WIN32
+               "libpng14-14.dll",
                "libpng14.dll",
                "libpng12.dll",
 #elif defined(MACOSX)
-               "libpng14.0.dylib",
+               "libpng14.14.dylib",
                "libpng12.0.dylib",
 #else
                "libpng14.so.14", // WTF libtool guidelines anyone?
@@ -169,7 +170,7 @@ void PNG_CloseLibrary (void)
 */
 
 #define PNG_LIBPNG_VER_STRING_12 "1.2.4"
-#define PNG_LIBPNG_VER_STRING_14 "1.4.1"
+#define PNG_LIBPNG_VER_STRING_14 "1.4.0"
 
 #define PNG_COLOR_MASK_PALETTE    1
 #define PNG_COLOR_MASK_COLOR      2
@@ -255,7 +256,7 @@ void PNG_warning_fn(void *png, const char *message)
 extern int     image_width;
 extern int     image_height;
 
-unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize)
+unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *miplevel)
 {
        unsigned int c;
        unsigned int    y;