[Scummvm-cvs-logs] SF.net SVN: scummvm:[48902] tools/trunk/encode_dxa.cpp

[fingolfin at users.sourceforge.net]

Revision: 48902
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48902&view=rev
Author:   fingolfin
Date:     2010-05-03 11:14:39 +0000 (Mon, 03 May 2010)

Log Message:
-----------
TOOLS: Fix warnings about using deprecated members of struct png_info_struct

Modified Paths:
--------------
    tools/trunk/encode_dxa.cpp

Modified: tools/trunk/encode_dxa.cpp
===================================================================
--- tools/trunk/encode_dxa.cpp	2010-05-03 11:14:25 UTC (rev 48901)
+++ tools/trunk/encode_dxa.cpp	2010-05-03 11:14:39 UTC (rev 48902)
@@ -647,6 +647,7 @@
 	png_infop info_ptr;
 	int number_of_passes;
 	png_bytep *row_pointers;
+	png_size_t rowbytes;
 
 	Common::File fp(filename, "rb");
 
@@ -671,10 +672,10 @@
 
 	png_read_info(png_ptr, info_ptr);
 
-	width = info_ptr->width;
-	height = info_ptr->height;
-	color_type = info_ptr->color_type;
-	bit_depth = info_ptr->bit_depth;
+	width = png_get_image_width(png_ptr, info_ptr);
+	height = png_get_image_height(png_ptr, info_ptr);
+	color_type = png_get_color_type(png_ptr, info_ptr);
+	bit_depth = png_get_bit_depth(png_ptr, info_ptr);
 
 	if (color_type != PNG_COLOR_TYPE_PALETTE) {
 		palette = NULL;
@@ -688,15 +689,16 @@
 	//if (setjmp(png_jmpbuf(png_ptr)))
 	//	return 1;
 
+	rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 	row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
 	for (int y=0; y<height; y++)
-		row_pointers[y] = (png_byte*) malloc(info_ptr->rowbytes);
+		row_pointers[y] = (png_byte*) malloc(rowbytes);
 
 	png_read_image(png_ptr, row_pointers);
 
 	image = new unsigned char[width * height];
 	for (int y=0; y<height; y++)
-		memcpy(&image[y*width], row_pointers[y], info_ptr->rowbytes);
+		memcpy(&image[y*width], row_pointers[y], rowbytes);
 
 	for (int y=0; y<height; y++)
 		free(row_pointers[y]);


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