mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Suppress "shadowed declaration" warnings in pngtest.c

Browse Source 
Changed some local variable names such as "buffer" to "buff".
This commit is contained in:
Glenn Randers-Pehrson 2009-04-20 13:12:07 -05:00
parent 92d0fe938f
commit 55b921dab2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pngtest.c
View File

@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng /* pngtest.c - a simple test program to test libpng
* *
* Last changed in libpng 1.2.36 [April 13, 2009] * Last changed in libpng 1.2.36 [April 20, 2009]
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 Glenn Randers-Pehrson * Copyright (c) 1998-2009 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -607,7 +607,7 @@ static int read_user_chunk_callback(png_struct *png_ptr,
png_unknown_chunkp chunk) png_unknown_chunkp chunk)
{ {
png_uint_32 png_uint_32
*user_chunk_data; *my_user_chunk_data;
/* Return one of the following: */ /* Return one of the following: */
/* return (-n); chunk had an error */ /* return (-n); chunk had an error */
@ -630,8 +630,8 @@ static int read_user_chunk_callback(png_struct *png_ptr,
return (-1); /* Error return */ return (-1); /* Error return */
if (chunk->data[0] != 0 && chunk->data[0] != 1) if (chunk->data[0] != 0 && chunk->data[0] != 1)
return (-1); /* Invalid mode */ return (-1); /* Invalid mode */
user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr); my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
user_chunk_data[0]=chunk->data[0]+1; my_user_chunk_data[0]=chunk->data[0]+1;
return (1); return (1);
} }
if (chunk->name[0] != 118 || chunk->name[1] != 112 || /* v p */ if (chunk->name[0] != 118 || chunk->name[1] != 112 || /* v p */
@ -643,11 +643,11 @@ static int read_user_chunk_callback(png_struct *png_ptr,
if (chunk->size != 9) if (chunk->size != 9)
return (-1); /* Error return */ return (-1); /* Error return */
user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr); my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data); my_user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4); my_user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
user_chunk_data[3]=(png_uint_32)chunk->data[8]; my_user_chunk_data[3]=(png_uint_32)chunk->data[8];
return (1); return (1);