[Scummvm-cvs-logs] SF.net SVN: scummvm:[53451] scummvm/trunk/engines/sword25/gfx

[fingolfin at users.sourceforge.net]

Revision: 53451
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53451&view=rev
Author:   fingolfin
Date:     2010-10-13 22:18:57 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Get rid of (deprecated) access to libpng io_ptr

Unfortunately I cannot test this, so watch our for regressions.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
    scummvm/trunk/engines/sword25/gfx/screenshot.cpp

Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp	2010-10-13 22:18:32 UTC (rev 53450)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp	2010-10-13 22:18:57 UTC (rev 53451)
@@ -56,8 +56,9 @@
 // -----------------------------------------------------------------------------
 
 static void png_user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
-	memcpy(data, (char *)png_ptr->io_ptr, length);
-	png_ptr->io_ptr = (void *)((png_size_t)png_ptr->io_ptr + length);
+	const byte **ref = (const byte **)png_get_io_ptr(png_ptr);
+	memcpy(data, *ref, length);
+	*ref += length;
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +98,8 @@
 	}
 
 	// Alternative Lesefunktion benutzen
-	png_set_read_fn(png_ptr, (void *)FileDataPtr, png_user_read_data);
+	const byte **ref = &FileDataPtr;
+	png_set_read_fn(png_ptr, (void *)ref, png_user_read_data);
 
 	// PNG Header einlesen
 	png_read_info(png_ptr, info_ptr);
@@ -234,7 +236,8 @@
 	}
 
 	// Alternative Lesefunktion benutzen
-	png_set_read_fn(png_ptr, (void *)FileDataPtr, png_user_read_data);
+	const byte **ref = &FileDataPtr;
+	png_set_read_fn(png_ptr, (void *)ref, png_user_read_data);
 
 	// PNG Header einlesen
 	png_read_info(png_ptr, info_ptr);

Modified: scummvm/trunk/engines/sword25/gfx/screenshot.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.cpp	2010-10-13 22:18:32 UTC (rev 53450)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.cpp	2010-10-13 22:18:57 UTC (rev 53451)
@@ -57,7 +57,7 @@
 #include "common/pack-end.h"
 
 void userWriteFn(png_structp png_ptr, png_bytep data, png_size_t length) {
-	static_cast<Common::WriteStream *>(png_ptr->io_ptr)->write(data, length);
+	static_cast<Common::WriteStream *>(png_get_io_ptr(png_ptr))->write(data, length);
 }
 
 void userFlushFn(png_structp png_ptr) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.