UNMERGE

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index b3ceadd7f82e9fd6a6347a378da723761a8a8672..0d58d4a36f33e95e4b64163c08dd4aef42d3c972 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -126,6 +126,7 @@ qboolean PNG_OpenLibrary (void)
        const char* dllnames [] =
        {
 #if WIN32
+               "libpng14-14.dll",
                "libpng14.dll",
                "libpng12.dll",
 #elif defined(MACOSX)
@@ -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;