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

[kirben at users.sourceforge.net]

Revision: 23056
Author:   kirben
Date:     2006-06-12 00:08:58 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23056&view=rev

Log Message:
-----------
Fix bug #1504440 encode_dxa: Suspect behaviour

Modified Paths:
--------------
    tools/trunk/encode_dxa.cpp
Modified: tools/trunk/encode_dxa.cpp
===================================================================
--- tools/trunk/encode_dxa.cpp	2006-06-12 06:47:38 UTC (rev 23055)
+++ tools/trunk/encode_dxa.cpp	2006-06-12 07:08:58 UTC (rev 23056)
@@ -240,29 +240,23 @@
 
 	png_read_image(png_ptr, row_pointers);
 
-	if (image) {
-		image = new unsigned char[width * height];
-		for (int y=0; y<height; y++)
-			memcpy(&image[y*width], row_pointers[y], info_ptr->rowbytes);
-	}
+	image = new unsigned char[width * height];
+	for (int y=0; y<height; y++)
+		memcpy(&image[y*width], row_pointers[y], info_ptr->rowbytes);
 
 	for (int y=0; y<height; y++)
 		free(row_pointers[y]);
 	free(row_pointers);
 
-	if (palette) {
-		png_colorp pngpalette;
-		int num_palette;
+	png_colorp pngpalette;
+	int num_palette;
 
-		png_get_PLTE(png_ptr, info_ptr, &pngpalette, &num_palette);
+	png_get_PLTE(png_ptr, info_ptr, &pngpalette, &num_palette);
 
-		palette = new unsigned char[768];
+	palette = new unsigned char[768];
+	memcpy(palette, pngpalette, 768);
+	free(pngpalette);
 
-		memcpy(palette, pngpalette, 768);
-
-		free(pngpalette);
-	}
-
 	fclose(fp);
 
 	return 0;
@@ -416,7 +410,8 @@
 	// No sound block
 	dxe.writeNULL();
 
-	uint8 *image, *palette;
+	uint8 *image = NULL;
+	uint8 *palette = NULL;
 	int framenum = 0;
 
 	printf("Encoding video...");


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