X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=2adb961727a8e7db4ad6cd9dc58c6774e8e1b9b6;hb=5560d4e2737472590f0a0663c4d2f3c18d09aad3;hp=cbaddf3e7398173d27e669a595c6b22eb3fb599e;hpb=6a75f042475ac3d601c0c85ce90f7e8cb05a11d3;p=xonotic%2Fdarkplaces.git diff --git a/image_png.c b/image_png.c index cbaddf3e..2adb9617 100644 --- a/image_png.c +++ b/image_png.c @@ -103,10 +103,12 @@ qboolean PNG_OpenLibrary (void) { const char* dllnames [] = { -#ifdef WIN32 +#ifdef WIN64 + "libpng12_64.dll", +#elif WIN32 "libpng12.dll", #elif defined(MACOSX) - "libpng12.dylib", + "libpng12.0.dylib", #else "libpng12.so.0", #endif @@ -209,8 +211,8 @@ void PNG_fReadData(void *png, unsigned char *data, size_t length) length = l; } memcpy(data, my_png.tmpBuf + my_png.tmpi, length); - my_png.tmpi += length; - Com_HexDumpToConsole(data, length); + my_png.tmpi += (int)length; + Com_HexDumpToConsole(data, (int)length); } void PNG_error_fn(void *png, const char *message)