eliminated model->meshlist, replaced with an embedded model->surfmesh to cut down...

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index cbaddf3e7398173d27e669a595c6b22eb3fb599e..2adb961727a8e7db4ad6cd9dc58c6774e8e1b9b6 100644 (file)
--- 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)