VM_stringtokeynum: return a float, not an int

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index ed5ed62340593b73534accec5ca117275ac6e3e6..0b9543e8742890d76955e5cf814f9e24d0f35e12 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -129,7 +129,7 @@ qboolean PNG_OpenLibrary (void)
                "libpng14.dll",
                "libpng12.dll",
 #elif defined(MACOSX)
-               "libpng14.0.dylib",
+               "libpng14.14.dylib",
                "libpng12.0.dylib",
 #else
                "libpng14.so.14", // WTF libtool guidelines anyone?
@@ -255,7 +255,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;