Browse Source

Fix loading PNGs on 64bit windows

James Urquhart 12 years ago
parent
commit
7539b3800c
1 changed files with 8 additions and 3 deletions
  1. 8 3
      engine/source/graphics/bitmapPng.cc

+ 8 - 3
engine/source/graphics/bitmapPng.cc

@@ -91,13 +91,18 @@ static void pngFlushDataFn(png_structp /*png_ptr*/)
 
 
 static png_voidp pngMallocFn(png_structp /*png_ptr*/, png_size_t size)
 static png_voidp pngMallocFn(png_structp /*png_ptr*/, png_size_t size)
 {
 {
+#ifndef _WIN64
    return FrameAllocator::alloc(size);
    return FrameAllocator::alloc(size);
-//   return (png_voidp)dMalloc(size);
+#else
+   return (png_voidp)dMalloc(size);
+#endif
 }
 }
 
 
-static void pngFreeFn(png_structp /*png_ptr*/, png_voidp /*mem*/)
+static void pngFreeFn(png_structp /*png_ptr*/, png_voidp mem)
 {
 {
-//   dFree(mem);
+#ifdef _WIN64
+   dFree(mem);
+#endif
 }
 }