removed wx-specific fix, it's already fixed in upstream sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -109,14 +109,6 @@ static PNG_CONST char png_digit[16] = {
|
|||||||
'A', 'B', 'C', 'D', 'E', 'F'
|
'A', 'B', 'C', 'D', 'E', 'F'
|
||||||
};
|
};
|
||||||
|
|
||||||
static size_t wxstrnlen( const char *s, size_t maxlen )
|
|
||||||
{
|
|
||||||
size_t i ;
|
|
||||||
for ( i = 0 ; s[i] && i < maxlen ; ++i )
|
|
||||||
;
|
|
||||||
return i ;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void /* PRIVATE */
|
static void /* PRIVATE */
|
||||||
png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
|
png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
|
||||||
error_message)
|
error_message)
|
||||||
@@ -143,12 +135,10 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
|
|||||||
buffer[iout] = 0;
|
buffer[iout] = 0;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int len = wxstrnlen(error_message, 64);
|
|
||||||
|
|
||||||
buffer[iout++] = ':';
|
buffer[iout++] = ':';
|
||||||
buffer[iout++] = ' ';
|
buffer[iout++] = ' ';
|
||||||
png_strncpy(buffer+iout, error_message, len);
|
png_strncpy(buffer+iout, error_message, 63);
|
||||||
buffer[iout+len] = 0;
|
buffer[iout+63] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user