[Gamecube/Wii] fixed compilation errors/warnings with latest libpng (1.6.34)

This commit is contained in:
ekeeke 2019-03-23 14:27:25 +01:00
parent b1ccc1aaba
commit 3e1dcda9ad
2 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@
* *
* Genesis Plus GX video & rendering support * Genesis Plus GX video & rendering support
* *
* Copyright Eke-Eke (2007-2016), based on original work from Softdev (2006) * Copyright Eke-Eke (2007-2019), based on original work from Softdev (2006)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@ -51,7 +51,7 @@ typedef struct
{ {
u8 *buffer; u8 *buffer;
u32 offset; u32 offset;
} png_image; } png_image_desc;
extern const u8 Crosshair_p1_png[]; extern const u8 Crosshair_p1_png[];
extern const u8 Crosshair_p2_png[]; extern const u8 Crosshair_p2_png[];
@ -1084,7 +1084,7 @@ void gxClearScreen(GXColor color)
/* libpng read callback function */ /* libpng read callback function */
static void png_read_from_mem (png_structp png_ptr, png_bytep data, png_size_t length) static void png_read_from_mem (png_structp png_ptr, png_bytep data, png_size_t length)
{ {
png_image *image = (png_image *)png_get_io_ptr(png_ptr); png_image_desc *image = (png_image_desc *)png_get_io_ptr(png_ptr);
/* copy data from image buffer */ /* copy data from image buffer */
memcpy (data, image->buffer + image->offset, length); memcpy (data, image->buffer + image->offset, length);
@ -1113,7 +1113,7 @@ gx_texture *gxTextureOpenPNG(const u8 *png_data, FILE *png_file)
if (png_data) if (png_data)
{ {
/* init PNG image structure */ /* init PNG image structure */
png_image image; png_image_desc image;
image.buffer = (u8 *) png_data; image.buffer = (u8 *) png_data;
image.offset = 0; image.offset = 0;

View File

@ -3,7 +3,7 @@
* *
* Genesis Plus GX video support * Genesis Plus GX video support
* *
* Copyright Eke-Eke (2007-2016), based on original work from Softdev (2006) * Copyright Eke-Eke (2007-2019), based on original work from Softdev (2006)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met: