Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / libpng / pngerror.c

diff --git a/source/Irrlicht/libpng/pngerror.c b/source/Irrlicht/libpng/pngerror.c
index 3e5f33f7fbcc9146b50fc63b243e764fcf7dfbea..c612e7a9e66f2819f4f0b20f062339de994033e8 100644 (file)
--- a/source/Irrlicht/libpng/pngerror.c
+++ b/source/Irrlicht/libpng/pngerror.c
@@ -1,10 +1,10 @@
 \r
 /* pngerror.c - stub functions for i/o and memory allocation\r
  *\r
- * Last changed in libpng 1.6.15 [November 20, 2014]\r
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson\r
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)\r
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)\r
+ * Copyright (c) 2018 Cosmin Truta\r
+ * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\r
+ * Copyright (c) 1996-1997 Andreas Dilger\r
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\r
  *\r
  * This code is released under the libpng license.\r
  * For conditions of distribution and use, see the disclaimer\r
@@ -26,7 +26,7 @@ static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
 #ifdef PNG_WARNINGS_SUPPORTED\r
 static void /* PRIVATE */\r
 png_default_warning PNGARG((png_const_structrp png_ptr,\r
-   png_const_charp warning_message));\r
+    png_const_charp warning_message));\r
 #endif /* WARNINGS */\r
 \r
 /* This function is called whenever there is a fatal error.  This function\r
@@ -37,7 +37,7 @@ png_default_warning PNGARG((png_const_structrp png_ptr,
 #ifdef PNG_ERROR_TEXT_SUPPORTED\r
 PNG_FUNCTION(void,PNGAPI\r
 png_error,(png_const_structrp png_ptr, png_const_charp error_message),\r
-   PNG_NORETURN)\r
+    PNG_NORETURN)\r
 {\r
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED\r
    char msg[16];\r
@@ -65,18 +65,18 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message),
 \r
             else\r
                error_message += offset;\r
-      }\r
+         }\r
 \r
-      else\r
-      {\r
-         if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)\r
+         else\r
          {\r
-            msg[0] = '0';\r
-            msg[1] = '\0';\r
-            error_message = msg;\r
+            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)\r
+            {\r
+               msg[0] = '0';\r
+               msg[1] = '\0';\r
+               error_message = msg;\r
+            }\r
          }\r
-       }\r
-     }\r
+      }\r
    }\r
 #endif\r
    if (png_ptr != NULL && png_ptr->error_fn != NULL)\r
@@ -110,7 +110,7 @@ png_err,(png_const_structrp png_ptr),PNG_NORETURN)
  */\r
 size_t\r
 png_safecat(png_charp buffer, size_t bufsize, size_t pos,\r
-   png_const_charp string)\r
+    png_const_charp string)\r
 {\r
    if (buffer != NULL && pos < bufsize)\r
    {\r
@@ -131,7 +131,7 @@ png_safecat(png_charp buffer, size_t bufsize, size_t pos,
  */\r
 png_charp\r
 png_format_number(png_const_charp start, png_charp end, int format,\r
-   png_alloc_size_t number)\r
+    png_alloc_size_t number)\r
 {\r
    int count = 0;    /* number of digits output */\r
    int mincount = 1; /* minimum number required */\r
@@ -163,7 +163,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
          case PNG_NUMBER_FORMAT_02u:\r
             /* Expects at least 2 digits. */\r
             mincount = 2;\r
-            /* FALL THROUGH */\r
+            /* FALLTHROUGH */\r
 \r
          case PNG_NUMBER_FORMAT_u:\r
             *--end = digits[number % 10];\r
@@ -173,7 +173,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
          case PNG_NUMBER_FORMAT_02x:\r
             /* This format expects at least two digits */\r
             mincount = 2;\r
-            /* FALL THROUGH */\r
+            /* FALLTHROUGH */\r
 \r
          case PNG_NUMBER_FORMAT_x:\r
             *--end = digits[number & 0xf];\r
@@ -233,7 +233,7 @@ png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
    }\r
    if (png_ptr != NULL && png_ptr->warning_fn != NULL)\r
       (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),\r
-         warning_message + offset);\r
+          warning_message + offset);\r
    else\r
       png_default_warning(png_ptr, warning_message + offset);\r
 }\r
@@ -245,7 +245,7 @@ png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
  */\r
 void\r
 png_warning_parameter(png_warning_parameters p, int number,\r
-   png_const_charp string)\r
+    png_const_charp string)\r
 {\r
    if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)\r
       (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);\r
@@ -253,7 +253,7 @@ png_warning_parameter(png_warning_parameters p, int number,
 \r
 void\r
 png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,\r
-   png_alloc_size_t value)\r
+    png_alloc_size_t value)\r
 {\r
    char buffer[PNG_NUMBER_BUFFER_SIZE];\r
    png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));\r
@@ -261,7 +261,7 @@ png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
 \r
 void\r
 png_warning_parameter_signed(png_warning_parameters p, int number, int format,\r
-   png_int_32 value)\r
+    png_int_32 value)\r
 {\r
    png_alloc_size_t u;\r
    png_charp str;\r
@@ -282,7 +282,7 @@ png_warning_parameter_signed(png_warning_parameters p, int number, int format,
 \r
 void\r
 png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,\r
-   png_const_charp message)\r
+    png_const_charp message)\r
 {\r
    /* The internal buffer is just 192 bytes - enough for all our messages,\r
     * overflow doesn't happen because this code checks!  If someone figures\r
@@ -391,10 +391,10 @@ png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
 void /* PRIVATE */\r
 png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)\r
 {\r
-  if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)\r
-     png_warning(png_ptr, error_message);\r
-  else\r
-     png_error(png_ptr, error_message);\r
+   if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)\r
+      png_warning(png_ptr, error_message);\r
+   else\r
+      png_error(png_ptr, error_message);\r
 \r
 #  ifndef PNG_ERROR_TEXT_SUPPORTED\r
       PNG_UNUSED(error_message)\r
@@ -404,10 +404,10 @@ png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
 void /* PRIVATE */\r
 png_app_error(png_const_structrp png_ptr, png_const_charp error_message)\r
 {\r
-  if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)\r
-     png_warning(png_ptr, error_message);\r
-  else\r
-     png_error(png_ptr, error_message);\r
+   if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)\r
+      png_warning(png_ptr, error_message);\r
+   else\r
+      png_error(png_ptr, error_message);\r
 \r
 #  ifndef PNG_ERROR_TEXT_SUPPORTED\r
       PNG_UNUSED(error_message)\r
@@ -425,7 +425,7 @@ png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
  * if the character is invalid.\r
  */\r
 #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))\r
-static PNG_CONST char png_digit[16] = {\r
+static const char png_digit[16] = {\r
    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',\r
    'A', 'B', 'C', 'D', 'E', 'F'\r
 };\r
@@ -478,7 +478,7 @@ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
 #if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)\r
 PNG_FUNCTION(void,PNGAPI\r
 png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),\r
-   PNG_NORETURN)\r
+    PNG_NORETURN)\r
 {\r
    char msg[18+PNG_MAX_ERROR_TEXT];\r
    if (png_ptr == NULL)\r
@@ -573,7 +573,7 @@ png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
 {\r
 #  define fixed_message "fixed point overflow in "\r
 #  define fixed_message_ln ((sizeof fixed_message)-1)\r
-   int  iin;\r
+   unsigned int  iin;\r
    char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];\r
    memcpy(msg, fixed_message, fixed_message_ln);\r
    iin = 0;\r
@@ -620,7 +620,7 @@ png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,
       else\r
       {\r
          png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,\r
-            png_malloc_warn(png_ptr, jmp_buf_size));\r
+             png_malloc_warn(png_ptr, jmp_buf_size));\r
 \r
          if (png_ptr->jmp_buf_ptr == NULL)\r
             return NULL; /* new NULL return on OOM */\r
@@ -709,7 +709,7 @@ png_free_jmpbuf(png_structrp png_ptr)
  */\r
 static PNG_FUNCTION(void /* PRIVATE */,\r
 png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),\r
-   PNG_NORETURN)\r
+    PNG_NORETURN)\r
 {\r
 #ifdef PNG_CONSOLE_IO_SUPPORTED\r
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED\r
@@ -883,9 +883,9 @@ png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
     */\r
 PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI\r
 png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),\r
-   PNG_NORETURN)\r
+    PNG_NORETURN)\r
 {\r
-   const png_const_structrp png_ptr = png_nonconst_ptr;\r
+   png_const_structrp png_ptr = png_nonconst_ptr;\r
    png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);\r
 \r
    /* An error is always logged here, overwriting anything (typically a warning)\r
@@ -906,7 +906,7 @@ png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
       /* Missing longjmp buffer, the following is to help debugging: */\r
       {\r
          size_t pos = png_safecat(image->message, (sizeof image->message), 0,\r
-            "bad longjmp: ");\r
+             "bad longjmp: ");\r
          png_safecat(image->message, (sizeof image->message), pos,\r
              error_message);\r
       }\r
@@ -920,7 +920,7 @@ png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
 void /* PRIVATE */ PNGCBAPI\r
 png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)\r
 {\r
-   const png_const_structrp png_ptr = png_nonconst_ptr;\r
+   png_const_structrp png_ptr = png_nonconst_ptr;\r
    png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);\r
 \r
    /* A warning is only logged if there is no prior warning or error. */\r