Merge branch 'master' of https://github.com/mercury233/irrlicht

.gitignore

@@ -4,3 +4,4 @@
 /source/Irrlicht/MacOSX/MacOSX.xcodeproj/xcuserdata
 /bin/MacOSX
 /irrlicht.patch
+/premake*.lua

include/Keycodes.h

@@ -89,7 +89,7 @@ namespace irr
 		KEY_KEY_X            = 0x58,  // X key
 		KEY_KEY_Y            = 0x59,  // Y key
 		KEY_KEY_Z            = 0x5A,  // Z key
-		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft Natural keyboard)
+		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft® Natural® keyboard)
 		KEY_RWIN             = 0x5C,  // Right Windows key (Natural keyboard)
 		KEY_APPS             = 0x5D,  // Applications key (Natural keyboard)
 		KEY_SLEEP            = 0x5F,  // Computer Sleep key

include/SColor.h

@@ -444,7 +444,7 @@ namespace video
 		}
 
 		//! color in A8R8G8B8 Format
-		u32 color;
+		u32 color{};
 	};
 
 

include/SMaterialLayer.h

@@ -72,8 +72,11 @@ namespace video
 		//! Destructor
 		~SMaterialLayer()
 		{
-			MatrixAllocator.destruct(TextureMatrix);
-			MatrixAllocator.deallocate(TextureMatrix); 
+			if(TextureMatrix)
+			{
+				MatrixAllocator.destruct(TextureMatrix);
+				MatrixAllocator.deallocate(TextureMatrix);
+			}
 		}
 
 		//! Assignment operator

source/Irrlicht/CColorConverter.cpp

@@ -165,7 +165,7 @@ void CColorConverter::convert8BitTo32Bit(const u8* in, u8* out, s32 width, s32 h
 		out += lineWidth * height;
 
 	u32 x;
-	register u32 c;
+	u32 c;
 	for (u32 y=0; y < (u32) height; ++y)
 	{
 		if (flip)

source/Irrlicht/CD3D8NormalMapRenderer.cpp

@@ -24,9 +24,9 @@ namespace video
 		"; c0-3: Transposed world matrix \n"\
 		"; c8-11: Transposed worldViewProj matrix (Projection * View * World) \n"\
 		"; c12: Light01 position \n"\
-		"; c13: x,y,z: Light01 color; .w: 1/LightRadius \n"\
+		"; c13: x,y,z: Light01 color; .w: 1/LightRadius² \n"\
 		"; c14: Light02 position \n"\
-		"; c15: x,y,z: Light02 color; .w: 1/LightRadius \n"\
+		"; c15: x,y,z: Light02 color; .w: 1/LightRadius² \n"\
 		"\n"\
 		"; v0 - position \n"\
 		"; v1 - normal \n"\
@@ -65,13 +65,13 @@ namespace video
 		"mad oT3.xyz, r9.xyz, c95, c95 ; move light vector 2 from -1..1 into 0..1 \n"\
 		"\n"\
 		" ; calculate attenuation of light 1 \n"\
-		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x + r2.y + r2.z \n"\
+		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x² + r2.y² + r2.z² \n"\
 		"mul r2.x, r2.x, c13.w         ; r2.x * attenutation \n"\
 		"rsq r2, r2.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD0, r2, c13              ; resulting light color = lightcolor * attenuation \n"\
 		"\n"\
 		" ; calculate attenuation of light 2 \n"\
-		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x + r3.y + r3.z \n"\
+		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x² + r3.y² + r3.z² \n"\
 		"mul r3.x, r3.x, c15.w         ; r2.x * attenutation \n"\
 		"rsq r3, r3.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD1, r3, c15              ; resulting light color = lightcolor * attenuation \n"\

source/Irrlicht/CD3D8ParallaxMapRenderer.cpp

@@ -24,9 +24,9 @@ namespace video
 		"; c4: Eye position \n"\
 		"; c8-11: Transposed worldViewProj matrix (Projection * View * World) \n"\
 		"; c12: Light01 position \n"\
-		"; c13: x,y,z: Light01 color; .w: 1/LightRadius \n"\
+		"; c13: x,y,z: Light01 color; .w: 1/LightRadius² \n"\
 		"; c14: Light02 position \n"\
-		"; c15: x,y,z: Light02 color; .w: 1/LightRadius \n"\
+		"; c15: x,y,z: Light02 color; .w: 1/LightRadius² \n"\
 		"vs.1.1\n"\
 		"; v0              ; position \n"\
 		"; v1              ; normal \n"\
@@ -78,13 +78,13 @@ namespace video
 		"mad oT4.xyz, r10.xyz, c95, c95 ; move eye vector from -1..1 into 0..1 \n"\
 		"\n"\
 		" ; calculate attenuation of light 1 \n"\
-		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x + r2.y + r2.z \n"\
+		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x² + r2.y² + r2.z² \n"\
 		"mul r2.x, r2.x, c13.w         ; r2.x * attenutation \n"\
 		"rsq r2, r2.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD0, r2, c13              ; resulting light color = lightcolor * attenuation \n"\
 		"\n"\
 		" ; calculate attenuation of light 2 \n"\
-		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x + r3.y + r3.z \n"\
+		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x² + r3.y² + r3.z² \n"\
 		"mul r3.x, r3.x, c15.w         ; r2.x * attenutation \n"\
 		"rsq r3, r3.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD1, r3, c15              ; resulting light color = lightcolor * attenuation \n"\

source/Irrlicht/CD3D9NormalMapRenderer.cpp

@@ -24,9 +24,9 @@ namespace video
 		"; c0-3: Transposed world matrix \n"\
 		"; c8-11: Transposed worldViewProj matrix (Projection * View * World) \n"\
 		"; c12: Light01 position \n"\
-		"; c13: x,y,z: Light01 color; .w: 1/LightRadius \n"\
+		"; c13: x,y,z: Light01 color; .w: 1/LightRadius² \n"\
 		"; c14: Light02 position \n"\
-		"; c15: x,y,z: Light02 color; .w: 1/LightRadius \n"\
+		"; c15: x,y,z: Light02 color; .w: 1/LightRadius² \n"\
 		"vs.1.1\n"\
 		"dcl_position  v0              ; position \n"\
 		"dcl_normal    v1              ; normal \n"\
@@ -65,13 +65,13 @@ namespace video
 		"mad oT3.xyz, r9.xyz, c95, c95 ; move light vector 2 from -1..1 into 0..1 \n"\
 		"\n"\
 		" ; calculate attenuation of light 1 \n"\
-		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x + r2.y + r2.z \n"\
+		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x² + r2.y² + r2.z² \n"\
 		"mul r2.x, r2.x, c13.w         ; r2.x * attenutation \n"\
 		"rsq r2, r2.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD0, r2, c13              ; resulting light color = lightcolor * attenuation \n"\
 		"\n"\
 		" ; calculate attenuation of light 2 \n"\
-		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x + r3.y + r3.z \n"\
+		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x² + r3.y² + r3.z² \n"\
 		"mul r3.x, r3.x, c15.w         ; r2.x * attenutation \n"\
 		"rsq r3, r3.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD1, r3, c15              ; resulting light color = lightcolor * attenuation \n"\

source/Irrlicht/CD3D9ParallaxMapRenderer.cpp

@@ -30,9 +30,9 @@ namespace video
 		"; c4: Eye position \n"\
 		"; c8-11: Transposed worldViewProj matrix (Projection * View * World) \n"\
 		"; c12: Light01 position \n"\
-		"; c13: x,y,z: Light01 color; .w: 1/LightRadius \n"\
+		"; c13: x,y,z: Light01 color; .w: 1/LightRadius² \n"\
 		"; c14: Light02 position \n"\
-		"; c15: x,y,z: Light02 color; .w: 1/LightRadius \n"\
+		"; c15: x,y,z: Light02 color; .w: 1/LightRadius² \n"\
 		"vs.1.1\n"\
 		"dcl_position  v0              ; position \n"\
 		"dcl_normal    v1              ; normal \n"\
@@ -84,13 +84,13 @@ namespace video
 		"mad oT4.xyz, r10.xyz, c95, c95 ; move eye vector from -1..1 into 0..1 \n"\
 		"\n"\
 		" ; calculate attenuation of light 1 \n"\
-		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x + r2.y + r2.z \n"\
+		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x² + r2.y² + r2.z² \n"\
 		"mul r2.x, r2.x, c13.w         ; r2.x * attenutation \n"\
 		"rsq r2, r2.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD0, r2, c13              ; resulting light color = lightcolor * attenuation \n"\
 		"\n"\
 		" ; calculate attenuation of light 2 \n"\
-		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x + r3.y + r3.z \n"\
+		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x² + r3.y² + r3.z² \n"\
 		"mul r3.x, r3.x, c15.w         ; r2.x * attenutation \n"\
 		"rsq r3, r3.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
 		"mul oD1, r3, c15              ; resulting light color = lightcolor * attenuation \n"\

source/Irrlicht/COpenGLDriver.cpp

@@ -143,10 +143,10 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
 	PIXELFORMATDESCRIPTOR pfd = {
 		sizeof(PIXELFORMATDESCRIPTOR),             // Size Of This Pixel Format Descriptor
 		1,                                         // Version Number
-		PFD_DRAW_TO_WINDOW |                       // Format Must Support Window
-		PFD_SUPPORT_OPENGL |                       // Format Must Support OpenGL
-		(Params.Doublebuffer?PFD_DOUBLEBUFFER:0) | // Must Support Double Buffering
-		(Params.Stereobuffer?PFD_STEREO:0),        // Must Support Stereo Buffer
+		static_cast<DWORD>(PFD_DRAW_TO_WINDOW |          // Format Must Support Window
+		 PFD_SUPPORT_OPENGL |                            // Format Must Support OpenGL
+		 (Params.Doublebuffer ? PFD_DOUBLEBUFFER : 0) |  // Must Support Double Buffering
+		 (Params.Stereobuffer ? PFD_STEREO : 0)),        // Must Support Stereo Buffer
 		PFD_TYPE_RGBA,                             // Request An RGBA Format
 		Params.Bits,                               // Select Our Color Depth
 		0, 0, 0, 0, 0, 0,                          // Color Bits Ignored

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -667,7 +667,7 @@ bool CIrrDeviceMacOSX::createWindow()
 						NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias,
 						NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)(CreationParams.Stencilbuffer?1:0),
 						NSOpenGLPFADoubleBuffer,
-						(NSOpenGLPixelFormatAttribute)nil
+						(NSOpenGLPixelFormatAttribute)0
 					};
 
 					if (CreationParams.AntiAlias<2)
@@ -693,7 +693,7 @@ bool CIrrDeviceMacOSX::createWindow()
 						{
 							// Third try without Doublebuffer
 							os::Printer::log("No doublebuffering available.", ELL_WARNING);
-							windowattribs[14]=(NSOpenGLPixelFormatAttribute)nil;
+							windowattribs[14]=(NSOpenGLPixelFormatAttribute)0;
 						}
 
 						format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs];
@@ -1024,13 +1024,13 @@ bool CIrrDeviceMacOSX::run()
 		auto frameHeight = [[textView superview] frame].size.height;
 		NSRect rect = {
 			(frameHeight - crect.LowerRightCorner.Y > crect.getHeight()) ?
-				crect.UpperLeftCorner.X :
-				crect.UpperLeftCorner.X + crect.getWidth() / 2,
+				(CGFloat)crect.UpperLeftCorner.X :
+				(CGFloat)(crect.UpperLeftCorner.X + crect.getWidth() / 2),
 			(frameHeight - crect.LowerRightCorner.Y > crect.getHeight()) ?
-				frameHeight - crect.LowerRightCorner.Y - crect.getHeight() - 1 :
-				frameHeight - crect.LowerRightCorner.Y,
-			crect.getWidth() / 2,
-			crect.getHeight(),
+				(CGFloat)(frameHeight - crect.LowerRightCorner.Y - crect.getHeight() - 1) :
+				(CGFloat)(frameHeight - crect.LowerRightCorner.Y),
+			(CGFloat)(crect.getWidth() / 2),
+			(CGFloat)crect.getHeight(),
 		};
 		[textView setFrame:rect];
 		[textView setHidden:NO];

source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj

@@ -6088,12 +6088,13 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "x86_64 arm64";
-				GCC_PREPROCESSOR_DEFINITIONS = GLES_SILENCE_DEPRECATION;
+				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION PNG_ARM_NEON_OPT=0 PNG_ARM_NEON_IMPLEMENTATION=0";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = ../../../include;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_CFLAGS = (
 					"-DMACOSX",
 					"-D_DEBUG",
@@ -6106,18 +6107,19 @@
 		1DEB922408733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "x86_64 arm64";
+				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = GLES_SILENCE_DEPRECATION;
+				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION PNG_ARM_NEON_OPT=0 PNG_ARM_NEON_IMPLEMENTATION=0";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = ../../../include;
 				INSTALL_MODE_FLAG = "a+rwx";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_CFLAGS = "-DMACOSX";
 				PREBINDING = NO;
 				SDKROOT = "";

source/Irrlicht/libpng/ANNOUNCE

-libpng 1.6.37 - April 14, 2019
-==============================
+libpng 1.6.47 - February 18, 2025
+=================================
 
 This is a public release of libpng, intended for use in production code.
 
@@ -9,13 +9,13 @@ Files available for download
 
 Source files with LF line endings (for Unix/Linux):
 
- * libpng-1.6.37.tar.xz (LZMA-compressed, recommended)
- * libpng-1.6.37.tar.gz
+ * libpng-1.6.47.tar.xz (LZMA-compressed, recommended)
+ * libpng-1.6.47.tar.gz (deflate-compressed)
 
 Source files with CRLF line endings (for Windows):
 
- * lp1637.7z (LZMA-compressed, recommended)
- * lp1637.zip
+ * lpng1647.7z (LZMA-compressed, recommended)
+ * lpng1647.zip (deflate-compressed)
 
 Other information:
 
@@ -25,20 +25,19 @@ Other information:
  * TRADEMARK.md
 
 
-Changes since the previous public release (version 1.6.36)
-----------------------------------------------------------
-
- * Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free.
- * Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette.
- * Fixed a memory leak in pngtest.c.
- * Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in
-   contrib/pngminus; refactor.
- * Changed the license of contrib/pngminus to MIT; refresh makefile and docs.
-   (Contributed by Willem van Schaik)
- * Fixed a typo in the libpng license v2.
-   (Contributed by Miguel Ojeda)
- * Added makefiles for AddressSanitizer-enabled builds.
- * Cleaned up various makefiles.
+Changes from version 1.6.46 to version 1.6.47
+---------------------------------------------
+
+ * Modified the behaviour of colorspace chunks in order to adhere
+   to the new precedence rules formulated in the latest draft of
+   the PNG Specification.
+   (Contributed by John Bowler)
+ * Fixed a latent bug in `png_write_iCCP`.
+   This would have been a read-beyond-end-of-malloc vulnerability,
+   introduced early in the libpng-1.6.0 development, yet (fortunately!)
+   it was inaccessible before the above-mentioned modification of the
+   colorspace precedence rules, due to pre-existing colorspace checks.
+   (Reported by Bob Friesenhahn; fixed by John Bowler)
 
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.

source/Irrlicht/libpng/AUTHORS

@@ -4,7 +4,9 @@ PNG REFERENCE LIBRARY AUTHORS
 This is the list of PNG Reference Library ("libpng") Contributing
 Authors, for copyright and licensing purposes.
 
+ * Adam Richter
  * Andreas Dilger
+ * Chris Blume
  * Cosmin Truta
  * Dave Martindale
  * Eric S. Raymond
@@ -15,12 +17,16 @@ Authors, for copyright and licensing purposes.
  * James Yu
  * John Bowler
  * Kevin Bracey
+ * Lucas Chollet
  * Magnus Holmgren
  * Mandar Sahastrabuddhe
  * Mans Rullgard
  * Matt Sarett
  * Mike Klein
+ * Pascal Massimino
  * Paul Schmidt
+ * Philippe Antoine
+ * Qiang Zhou
  * Sam Bushell
  * Samuel Williams
  * Simon-Pierre Cadieux
@@ -30,16 +36,27 @@ Authors, for copyright and licensing purposes.
  * Vadim Barkov
  * Willem van Schaik
  * Zhijie Liang
+ * Apple Inc.
+    - Zixu Wang (王子旭)
  * Arm Holdings
-   - Richard Townsend
+    - Richard Townsend
  * Google Inc.
-   - Matt Sarett
-   - Mike Klein
+    - Dan Field
+    - Leon Scroggins III
+    - Matt Sarett
+    - Mike Klein
+    - Sami Boukortt
+    - Wan-Teh Chang
+ * Loongson Technology Corporation Ltd.
+    - GuXiWei (顾希伟)
+    - JinBo (金波)
+    - ZhangLixia (张利霞)
 
 The build projects, the build scripts, the test scripts, and other
-files in the "projects", "scripts" and "tests" directories, have other
-copyright owners, but are released under the libpng license.
+files in the "projects", "scripts" and "tests" directories, have
+other copyright owners, but are released under the libpng license.
 
-Some files in the "contrib" directory, and some tools-generated files
-that are distributed with libpng, have other copyright owners, and are
-released under other open source licenses.
+Some files in the "ci" and "contrib" directories, as well as some
+of the tools-generated files that are distributed with libpng, have
+other copyright owners, and are released under other open source
+licenses.

source/Irrlicht/libpng/LICENSE

@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 1995-2025 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2025 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

source/Irrlicht/libpng/TODO

-TODO - list of things to do for libpng:
+TODO list for libpng
+--------------------
 
-* Fix all defects (duh!)
-* Better C++ wrapper / full C++ implementation (?)
-* Fix the problems with C++ and 'extern "C"'.
-* cHRM transformation.
-* Palette creation.
-* "grayscale->palette" transformation and "palette->grayscale" detection.
-* Improved dithering.
-* Multi-lingual error and warning message support.
-* Complete sRGB transformation.  (Currently it simply uses gamma=0.45455.)
-* Man pages for function calls.
-* Better documentation.
-* Better filter selection
-  (e.g., counting huffman bits/precompression; filter inertia; filter costs).
-* Histogram creation.
-* Text conversion between different code pages (e.g., Latin-1 -> Mac).
-* Avoid building gamma tables whenever possible.
-* Greater precision in changing to linear gamma for compositing against
-  background, and in doing rgb-to-gray transformations.
-* Investigate pre-incremented loop counters and other loop constructions.
-* Interpolated method of handling interlacing.
-* More validations for libpng transformations.
+ * Fix all defects (duh!)
+ * cHRM transformation.
+ * Palette creation.
+ * "grayscale->palette" transformation and "palette->grayscale" detection.
+ * Improved dithering.
+ * Multi-lingual error and warning message support.
+ * Complete sRGB transformation.  (Currently it simply uses gamma=0.45455.)
+ * Man pages for function calls.
+ * Better documentation.
+ * Better filter selection
+   (e.g., counting huffman bits/precompression; filter inertia; filter costs).
+ * Histogram creation.
+ * Text conversion between different code pages (e.g., Latin-1 to Mac).
+ * Avoid building gamma tables whenever possible.
+ * Greater precision in changing to linear gamma for compositing against
+   background, and in doing rgb-to-gray transformations.
+ * Investigate pre-incremented loop counters and other loop constructions.
+ * Interpolated method of handling interlacing.
+ * More validations for libpng transformations.

source/Irrlicht/libpng/autogen.sh

+#! /bin/sh
+#
+# Run 'autoreconf' to build 'configure', 'Makefile.in' and other configure
+# control files.
+#
+# The first time this is run on a GIT checkout the only files that exist are
+# configure.ac and Makefile.am; all of the autotools support scripts are
+# missing.  They are instantiated with autoreconf --force --install.
+#
+# For regular ("tarball") distributions all the files should exist.  We do not
+# want them to be updated *under any circumstances*.  It should never be
+# necessary to run autogen.sh because ./configure --enable-maintainer-mode says
+# what to do if Makefile.am or configure.ac are changed.
+#
+# It is *probably* OK to update the files on a GIT checkout, because they have
+# come from the local tools, but leave that to the user who is assumed to know
+# whether it is ok or required.
+#
+# This script is intended to work without arguments, there are, however, hidden
+# arguments (a) for use while testing the script and (b) to fix up systems that
+# have been broken.  If (b) is required the script prompts for the correct
+# options.  For this reason the options are *NOT* documented in the help; this
+# is deliberate; UTSL.
+#
+clean=
+maintainer=
+while test $# -gt 0
+do
+   case "$1" in
+      --maintainer)
+         maintainer=1;;
+
+      --clean)
+         clean=1;;
+
+      *)
+         exec >&2
+         echo "$0: usage: ./autogen.sh"
+         if test -d .git
+         then
+            echo "  ./autogen.sh generates the configure script and"
+            echo "  Makefile.in, or refreshes them after changes to Makefile.am"
+            echo "  or configure.ac.  You may prefer to just run autoreconf."
+         elif test -z "$maintainer"
+         then
+            echo "  DO NOT RUN THIS SCRIPT."
+            echo "  If you need to change Makefile.am or configure.ac then you"
+            echo "  also need to run ./configure --enable-maintainer-mode and"
+            echo "  use the appropriate autotools, *NOT* this script, to update"
+            echo "  everything, please check the documentation of autoreconf."
+            echo "  WARNING: libpng is intentionally generated with a known,"
+            echo "  fixed, set of autotools.  It is known *NOT* to work with"
+            echo "  the collection of autotools distributed on highly reputable"
+            echo "  operating systems."
+            echo "  Remember: autotools is GNU software, you are expected to"
+            echo "  pay for support."
+         else
+            echo "  You have run autogen.sh with --maintainer enabled and you"
+            echo "  are not using a GIT distribution, then you have given an"
+            echo "  unrecognized argument.  This is not good. --maintainer"
+            echo "  switches off any assumptions that you might not know what"
+            echo "  you are doing."
+         fi
+         exit 1;;
+   esac
+
+   shift
+done
+#
+# First check for a set of the autotools files; if absent then this is assumed
+# to be a GIT version and the local autotools must be used.  If present this
+# is a tarball distribution and the script should not be used.  If partially
+# present bad things are happening.
+#
+# The autotools generated files:
+libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in
+   config.sub configure depcomp install-sh ltmain.sh missing\
+   test-driver"
+#
+# Files generated by versions of autoconf >2.68 or automake >1.13 (i.e. later
+# versions than those required by configure.ac):
+libpng_autotools_extra="compile config.h.in~"
+#
+# These are separate because 'maintainer-clean' does not remove them.
+libpng_libtool_files="scripts/autoconf/libtool.m4 scripts/autoconf/ltoptions.m4\
+   scripts/autoconf/ltsugar.m4 scripts/autoconf/ltversion.m4\
+   scripts/autoconf/lt~obsolete.m4"
+
+libpng_autotools_dirs="autom4te.cache" # not required
+#
+# The configure generated files:
+libpng_configure_files="Makefile config.h config.log config.status\
+   libpng-config libpng.pc libtool stamp-h1"
+
+libpng_configure_dirs=".deps"
+#
+# We must remove the configure generated files as well as the autotools
+# generated files if autotools are regenerated because otherwise if configure
+# has been run without "--enable-maintainer-mode" make can do a partial update
+# of Makefile.  These functions do the two bits of cleaning.
+clean_autotools(){
+   rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs
+   rm -rf $libpng_autotools_extra
+}
+
+clean_configure(){
+   rm -rf $libpng_configure_files $libpng_configure_dirs
+}
+#
+# Clean: remove everything (this is to help with testing)
+if test -n "$clean"
+then
+   clean_configure
+   if test -n "$maintainer"
+   then
+      clean_autotools
+   fi
+
+   exit 0
+fi
+#
+# Validate the distribution.
+libpng_autotools_file_found=
+libpng_autotools_file_missing=
+for file in $libpng_autotools_files
+do
+   if test -f  "$file"
+   then
+      libpng_autotools_file_found=1
+   else
+      libpng_autotools_file_missing=1
+   fi
+done
+#
+# Presence of one of these does not *invalidate* missing, but absence
+# invalidates found.
+for file in $libpng_libtool_files
+do
+   if test ! -f "$file"
+   then
+      libpng_autotools_file_missing=1
+   fi
+done
+#
+# The cache directory doesn't matter - it will be regenerated and does not exist
+# anyway in a tarball.
+#
+# Either everything is missing or everything is there, the --maintainer option
+# just changes this so that the mode is set to generate all the files.
+mode=
+if test -z "$libpng_autotools_file_found" -o -n "$maintainer"
+then
+   mode="autoreconf"
+else
+   if test -n "$libpng_autotools_file_missing"
+   then
+      mode="broken"
+   else
+      mode="configure"
+   fi
+fi
+#
+# So:
+case "$mode" in
+   autoreconf)
+      # Clean in case configure files exist
+      clean_configure
+      clean_autotools
+      # Everything must be initialized, so use --force
+      if autoreconf --warnings=all --force --install
+      then
+         missing=
+         for file in $libpng_autotools_files
+         do
+            test -f "$file" || missing=1
+         done
+         # ignore the cache directory
+         test -z "$missing" || {
+            exec >&2
+            echo "autoreconf was run, but did not produce all the expected"
+            echo "files.  It is likely that your autotools installation is"
+            echo "not compatible with that expected by libpng."
+            exit 1
+         }
+      else
+         exec >&2
+         echo "autoreconf failed: your version of autotools is incompatible"
+         echo "with this libpng version.  Please use a distributed archive"
+         echo "(which includes the autotools generated files) and run configure"
+         echo "instead."
+         exit 1
+      fi;;
+
+   configure)
+      if test -d .git
+      then
+         exec >&2
+         echo "ERROR: running autoreconf on an initialized system"
+         echo "  This is not necessary; it is only necessary to remake the"
+         echo "  autotools generated files if Makefile.am or configure.ac"
+         echo "  change and make does the right thing with:"
+         echo
+         echo "     ./configure --enable-maintainer-mode."
+         echo
+         echo "  You can run autoreconf yourself if you don't like maintainer"
+         echo "  mode and you can also just run autoreconf -f -i to initialize"
+         echo "  everything in the first place; this script is only for"
+         echo "  compatibility with prior releases."
+         exit 1
+      else
+         exec >&2
+         echo "autogen.sh is intended only to generate 'configure' on systems"
+         echo "that do not have it.  You have a complete 'configure', if you"
+         echo "need to change Makefile.am or configure.ac you also need to"
+         echo "run configure with the --enable-maintainer-mode option."
+         exit 1
+      fi;;
+
+   broken)
+      exec >&2
+      echo "Your system has a partial set of autotools generated files."
+      echo "autogen.sh is unable to proceed.  The full set of files is"
+      echo "contained in the libpng 'tar' distribution archive and you do"
+      echo "not need to run autogen.sh if you use it."
+      exit 1;;
+esac

source/Irrlicht/libpng/libpng.pc.in

@@ -6,6 +6,7 @@ includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 Name: libpng
 Description: Loads and saves PNG files
 Version: @PNGLIB_VERSION@
+Requires.private: zlib
 Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 Libs.private: @LIBS@
 Cflags: -I${includedir}

source/Irrlicht/libpng/libpngpf.3

-.TH LIBPNGPF 3 "April 14, 2019"
+.TH LIBPNGPF 3 "February 18, 2025"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.37
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.47
 (private functions)
 
 .SH SYNOPSIS

source/Irrlicht/libpng/pngdebug.h

-
 /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
  *
  * Copyright (c) 2018 Cosmin Truta

source/Irrlicht/libpng/pngrio.c

-
 /* pngrio.c - functions for data input
  *
  * Copyright (c) 2018 Cosmin Truta

source/Irrlicht/libpng/pngwio.c

-
 /* pngwio.c - functions for data output
  *
  * Copyright (c) 2018 Cosmin Truta