ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for libpng compilation in Linux. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2052 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-06-15 18:14:37 +00:00
parent 58452a6f37
commit 4409e55894
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libpng/module.mk
View File

@ -11,7 +11,6 @@ MODULE_OBJS := \
src/libpng/pngrtran.o \ src/libpng/pngrtran.o \
src/libpng/pngrutil.o \ src/libpng/pngrutil.o \
src/libpng/pngset.o \ src/libpng/pngset.o \
src/libpng/pngtest.o \
src/libpng/pngtrans.o \ src/libpng/pngtrans.o \
src/libpng/pngwio.o \ src/libpng/pngwio.o \
src/libpng/pngwrite.o \ src/libpng/pngwrite.o \

6
src/libpng/pngrutil.c
View File

@ -254,7 +254,7 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
* buffer if available. * buffer if available.
*/ */
{ {
char *msg; const char *msg;
if (png_ptr->zstream.msg != 0) if (png_ptr->zstream.msg != 0)
msg = png_ptr->zstream.msg; msg = png_ptr->zstream.msg;
else else
@ -344,7 +344,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
{ {
/* Success (maybe) - really uncompress the chunk. */ /* Success (maybe) - really uncompress the chunk. */
png_size_t new_size = 0; png_size_t new_size = 0;
png_charp text = png_malloc_warn(png_ptr, png_charp text = (png_charp) png_malloc_warn(png_ptr,
prefix_size + expanded_size + 1); prefix_size + expanded_size + 1);
if (text != NULL) if (text != NULL)
@ -392,7 +392,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
* amount of compressed data. * amount of compressed data.
*/ */
{ {
png_charp text = png_malloc_warn(png_ptr, prefix_size + 1); png_charp text = (png_charp) png_malloc_warn(png_ptr, prefix_size + 1);
if (text != NULL) if (text != NULL)
{ {
if (prefix_size > 0) if (prefix_size > 0)