no_rtti fix was not having correct eval order

[wxWidgets.git] / src / png / pngerror.c

diff --git a/src/png/pngerror.c b/src/png/pngerror.c
index d0da28333e920026f6ed97aac0a6b2f5976f8848..fda078ef58582b95f3dd816800cd92a600e21f3d 100644 (file)
--- a/src/png/pngerror.c
+++ b/src/png/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *

- * libpng version 1.2.6 - August 15, 2004
+ * libpng version 1.2.7 - September 12, 2004

  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2004 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2004 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)


@@ -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 */
 png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
    error_message)
 static void /* PRIVATE */
 png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
    error_message)


@@ -143,12 +135,10 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
       buffer[iout] = 0;
    else
    {
       buffer[iout] = 0;
    else
    {

-      int len = wxstrnlen(error_message, 64);
- 

       buffer[iout++] = ':';
       buffer[iout++] = ' ';
       buffer[iout++] = ':';
       buffer[iout++] = ' ';

-      png_strncpy(buffer+iout, error_message, len);
-      buffer[iout+len] = 0;
+      png_strncpy(buffer+iout, error_message, 63);
+      buffer[iout+63] = 0;

    }
 }
 
    }
 }