Index: trunk/src/image/miniz.cc
===================================================================
--- trunk/src/image/miniz.cc	(revision 484)
+++ trunk/src/image/miniz.cc	(revision 486)
@@ -813,5 +813,5 @@
 	static void *def_alloc_func( void *opaque, size_t items, size_t size ) { (void)opaque, (void)items, (void)size; return MZ_MALLOC( items * size ); }
 	static void def_free_func( void *opaque, void *address ) { (void)opaque, (void)address; MZ_FREE( address ); }
-	static void *def_realloc_func( void *opaque, void *address, size_t items, size_t size ) { (void)opaque, (void)address, (void)items, (void)size; return MZ_REALLOC( address, items * size ); }
+//	static void *def_realloc_func( void *opaque, void *address, size_t items, size_t size ) { (void)opaque, (void)address, (void)items, (void)size; return MZ_REALLOC( address, items * size ); }
 
 	const char *mz_version( void )
Index: trunk/src/image/png_loader.cc
===================================================================
--- trunk/src/image/png_loader.cc	(revision 484)
+++ trunk/src/image/png_loader.cc	(revision 486)
@@ -665,7 +665,9 @@
 }
 
+
 static int stbi__unpremultiply_on_load = 0;
 static int stbi__de_iphone_flag = 0;
 
+/*
 static void stbi_set_unpremultiply_on_load( int flag_true_if_should_unpremultiply )
 {
@@ -677,4 +679,5 @@
 	stbi__de_iphone_flag = flag_true_if_should_convert;
 }
+*/
 
 static void stbi__de_iphone( stbi__png *z )
@@ -1021,4 +1024,10 @@
 }
 
+bool nv::png_loader::test( stream& str )
+{
+	stbi__context s( &stbi__callbacks, (void *)&str );
+	return stbi__png_test( &s ) != 0;
+}
+
 image_data* nv::png_loader::load( stream& s )
 {