[libpng] Fixed contrib/examples/png2png.c

This commit is contained in:
John Bowler 2012-09-01 13:26:41 -05:00 committed by Glenn Randers-Pehrson
parent d099973c4f
commit 53f7051b1b

View File

@ -29,13 +29,17 @@ int main(int argc, const char **argv)
{ {
png_image image; png_image image;
/* Only the image structure version number needs to be set. */
memset(&image, 0, sizeof image); memset(&image, 0, sizeof image);
image.version = PNG_IMAGE_VERSION;
if (png_image_begin_read_from_file(&image, argv[1])) if (png_image_begin_read_from_file(&image, argv[1]))
{ {
png_bytep buffer; png_bytep buffer;
/* Change this to try different formats! */ /* Change this to try different formats! If you set a colormap format
* then you must also supply a colormap below.
*/
image.format = PNG_FORMAT_RGBA; image.format = PNG_FORMAT_RGBA;
buffer = malloc(PNG_IMAGE_SIZE(image)); buffer = malloc(PNG_IMAGE_SIZE(image));
@ -43,10 +47,11 @@ int main(int argc, const char **argv)
if (buffer != NULL) if (buffer != NULL)
{ {
if (png_image_finish_read(&image, NULL/*background*/, buffer, if (png_image_finish_read(&image, NULL/*background*/, buffer,
0/*row_stride*/)) 0/*row_stride*/, NULL/*colormap for PNG_FORMAT_FLAG_COLORMAP */))
{ {
if (png_image_write_to_file(&image, argv[2], if (png_image_write_to_file(&image, argv[2],
0/*convert_to_8bit*/, buffer, 0/*row_stride*/)) 0/*convert_to_8bit*/, buffer, 0/*row_stride*/,
NULL/*colormap*/))
result = 0; result = 0;
else else