Goto crosses initialization error.

Sorry.
This commit is contained in:
Matthew Parlane 2013-11-15 13:05:03 +13:00
parent 033ed9477e
commit ba71cdcc51

View File

@ -81,15 +81,20 @@ bool TextureToPng(u8* data, int row_stride, const char* filename, int width, int
if (!data) if (!data)
return false; return false;
char title[] = "Dolphin Screenshot";
FILE *fp = NULL;
png_structp png_ptr = NULL;
png_infop info_ptr = NULL;
// Open file for writing (binary mode) // Open file for writing (binary mode)
FILE *fp = fopen(filename, "wb"); fp = fopen(filename, "wb");
if (fp == NULL) { if (fp == NULL) {
PanicAlert("Screenshot failed: Could not open file %s\n", filename); PanicAlert("Screenshot failed: Could not open file %s\n", filename);
goto finalise; goto finalise;
} }
// Initialize write structure // Initialize write structure
png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (png_ptr == NULL) { if (png_ptr == NULL) {
PanicAlert("Screenshot failed: Could not allocate write struct\n"); PanicAlert("Screenshot failed: Could not allocate write struct\n");
goto finalise; goto finalise;
@ -97,7 +102,7 @@ bool TextureToPng(u8* data, int row_stride, const char* filename, int width, int
} }
// Initialize info structure // Initialize info structure
png_infop info_ptr = png_create_info_struct(png_ptr); info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) { if (info_ptr == NULL) {
PanicAlert("Screenshot failed: Could not allocate info struct\n"); PanicAlert("Screenshot failed: Could not allocate info struct\n");
goto finalise; goto finalise;
@ -116,7 +121,6 @@ bool TextureToPng(u8* data, int row_stride, const char* filename, int width, int
8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
char title[] = "Dolphin Screenshot";
png_text title_text; png_text title_text;
title_text.compression = PNG_TEXT_COMPRESSION_NONE; title_text.compression = PNG_TEXT_COMPRESSION_NONE;
title_text.key = "Title"; title_text.key = "Title";