Changeset 9896 for ps

Timestamp:

07/22/11 22:22:40 (13 years ago)

Author:

philip

Message:

Fix NVTT build with libpng 1.5

Location:

ps/trunk/libraries/nvtt

Files:

• README.txt (modified) (1 diff)
• png-api.patch (added)
• src/src/nvimage/ImageIO.cpp (modified) (1 diff)

ps/trunk/libraries/nvtt/README.txt

@@ -6 +6 @@
   rpath.patch (fixes .so file search paths for bundled copy)
   issue139.patch (fixes http://code.google.com/p/nvidia-texture-tools/issues/detail?id=139)
+  png-api.patch (partially from NVTT SVN r1248 - fixes build with libpng 1.5)

ps/trunk/libraries/nvtt/src/src/nvimage/ImageIO.cpp

@@ -604 +604 @@
     nvDebugCheck(png_ptr != NULL);
     
-    Stream * s = (Stream *)png_ptr->io_ptr;
+    Stream * s = (Stream *)png_get_io_ptr(png_ptr);
     s->serialize(data, (int)length);