Skip to content

Commit 23aee74

Browse files
github-actions[bot]github-actions[bot]
committed
Synchronize changes from 1.6 master branch [ci skip]
c6dffcb Update libpng from 1.6.43 to 1.6.47 (#4143)
2 parents 74f34cd + c6dffcb commit 23aee74

File tree

581 files changed

+132441
-3156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

581 files changed

+132441
-3156
lines changed

‎Client/core/CFileFormatPng.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "StdInc.h"
1212
#include <libpng/png.h>
13-
#include <libpng/pngstruct.h>
13+
#include <libpng/pngpriv.h>
1414

1515
///////////////////////////////////////////////////////////////
1616
//

‎vendor/libpng/.appveyor.yml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
version: 1.6.x-{build}
2+
3+
branches:
4+
except:
5+
- /libpng[0-1][0-8]/
6+
- /v[0-1][.][0-8][.][0-9]+/
7+
8+
image:
9+
- Visual Studio 2022
10+
11+
shallow_clone: true
12+
13+
environment:
14+
matrix:
15+
- TOOLCHAIN: vstudio
16+
AUTOMATION: cmake
17+
ARCH: x86
18+
- TOOLCHAIN: vstudio
19+
AUTOMATION: cmake
20+
ARCH: x64
21+
- TOOLCHAIN: vstudio
22+
AUTOMATION: cmake
23+
ARCH: arm64
24+
- TOOLCHAIN: llvm
25+
AUTOMATION: cmake
26+
ARCH: x64
27+
- TOOLCHAIN: msys2
28+
AUTOMATION: cmake
29+
ARCH: i686
30+
- TOOLCHAIN: msys2
31+
AUTOMATION: cmake
32+
ARCH: x86_64
33+
- TOOLCHAIN: msys2
34+
AUTOMATION: configure
35+
ARCH: i686
36+
- TOOLCHAIN: msys2
37+
AUTOMATION: configure
38+
ARCH: x86_64
39+
- TOOLCHAIN: msys2
40+
AUTOMATION: makefiles
41+
ARCH: i686
42+
- TOOLCHAIN: msys2
43+
AUTOMATION: makefiles
44+
ARCH: x86_64
45+
46+
install:
47+
- 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
48+
- 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe integrate install'
49+
- 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
50+
- 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe integrate install'
51+
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-ninja'
52+
53+
before_build:
54+
- 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_GENERATOR=Visual Studio 17 2022'
55+
- 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake'
56+
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x86" set CI_CMAKE_GENERATOR_PLATFORM=Win32'
57+
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x64" set CI_CMAKE_GENERATOR_PLATFORM=x64'
58+
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_GENERATOR_PLATFORM=ARM64'
59+
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_VARS=-DPNG_TESTS=0'
60+
- 'if "%TOOLCHAIN%"=="llvm" set CI_CMAKE_GENERATOR=Ninja'
61+
- 'if "%TOOLCHAIN%"=="llvm" set CI_CMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake'
62+
- 'if "%TOOLCHAIN%"=="llvm" set CI_CC=clang'
63+
- 'if "%TOOLCHAIN%"=="msys2" set CI_CMAKE_GENERATOR=Ninja'
64+
- 'if "%TOOLCHAIN%"=="msys2" set CI_CC=gcc'
65+
- 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="i686" set MSYSTEM=MINGW32'
66+
- 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="x86_64" set MSYSTEM=MINGW64'
67+
- 'set CI_CMAKE_BUILD_FLAGS=-j2'
68+
- 'set CI_CTEST_FLAGS=-j2'
69+
- 'set CI_MAKE_FLAGS=-j2'
70+
- 'set CI_MAKEFILES=scripts/makefile.gcc scripts/makefile.msys scripts/makefile.std'
71+
72+
build_script:
73+
- 'if "%TOOLCHAIN%"=="vstudio" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
74+
- 'if "%TOOLCHAIN%"=="llvm" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
75+
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
76+
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="configure" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_configure.sh"'
77+
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="makefiles" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_makefiles.sh"'
78+
79+
cache:
80+
- 'C:\tools\vcpkg\installed'
81+
- 'C:\msys64\var\cache\pacman'

‎vendor/libpng/.cmake-format.yaml

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# https://pypi.org/project/cmakelang
2+
# https://github.com/cheshirekow/cmake_format
3+
4+
# ----------------------
5+
# Options for formatting
6+
# ----------------------
7+
8+
# How wide to allow formatted cmake files
9+
# TODO: Reflow the CMake files to allow setting the maximum line width to 100.
10+
line_width: 255
11+
12+
# How many spaces to tab for indent
13+
tab_size: 2
14+
15+
# If true, lines are indented using tab characters (utf-8 0x09) instead of
16+
# <tab_size> space characters (utf-8 0x20). In cases where the layout would
17+
# require a fractional tab character, the behavior of the fractional
18+
# indentation is governed by <fractional_tab_policy>
19+
use_tabchars: false
20+
21+
# If <use_tabchars> is True, then the value of this variable indicates how
22+
# fractional indentions are handled during whitespace replacement. If set to
23+
# 'use-space', fractional indentation is left as spaces (utf-8 0x20). If set
24+
# to `round-up` fractional indentation is replaced with a single tab character
25+
# (utf-8 0x09) effectively shifting the column to the next tabstop
26+
fractional_tab_policy: "use-space"
27+
28+
# Enable comment markup parsing and reflow
29+
enable_markup: false
30+
31+
# -------------------
32+
# Options for linting
33+
# -------------------
34+
35+
# Lint codes to disable
36+
disabled_codes: [
37+
# TODO:
38+
# Reconcile the CMake variable names with the patterns below, then
39+
# re-enable the "invalid variable name XXX" messages.
40+
"C0103",
41+
42+
# A custom command with one output doesn't really need a comment because
43+
# the default "generating XXX" is a good message already.
44+
"C0113",
45+
]
46+
47+
# Regular expression pattern describing valid function names
48+
function_pattern: "[0-9a-z_]+"
49+
50+
# Regular expression pattern describing valid macro names
51+
macro_pattern: "[0-9A-Z_]+"
52+
53+
# Regular expression pattern describing valid names for variables with global
54+
# (cache) scope
55+
global_var_pattern: "[A-Z][0-9A-Z_]+"
56+
57+
# Regular expression pattern describing valid names for variables with global
58+
# scope (but internal semantic)
59+
internal_var_pattern: "_[A-Z][0-9A-Z_]+"
60+
61+
# Regular expression pattern describing valid names for variables with local
62+
# scope
63+
local_var_pattern: "[a-z][a-z0-9_]+"
64+
65+
# Regular expression pattern describing valid names for privatedirectory
66+
# variables
67+
private_var_pattern: "_[0-9a-z_]+"
68+
69+
# Regular expression pattern describing valid names for public directory
70+
# variables
71+
public_var_pattern: "[A-Z][0-9A-Z_]+"
72+
73+
# Regular expression pattern describing valid names for function/macro
74+
# arguments and loop variables.
75+
argument_var_pattern: "[a-z][a-z0-9_]+"
76+
77+
# Regular expression pattern describing valid names for keywords used in
78+
# functions or macros
79+
keyword_pattern: "[A-Z][0-9A-Z_]+"
80+
81+
# In the heuristic for C0201, how many conditionals to match within a loop in
82+
# before considering the loop a parser
83+
max_conditionals_custom_parser: 2
84+
85+
# Require at least this many newlines between statements
86+
min_statement_spacing: 1
87+
88+
# Require no more than this many newlines between statements
89+
max_statement_spacing: 2
90+
max_returns: 6
91+
max_branches: 12
92+
max_arguments: 5
93+
max_localvars: 15
94+
max_statements: 50

‎vendor/libpng/.editorconfig

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# https://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.txt]
11+
indent_size = unset
12+
indent_style = space
13+
14+
[*.[chS]]
15+
indent_size = 3
16+
indent_style = space
17+
max_doc_length = 80
18+
max_line_length = 80
19+
20+
[*.dfa]
21+
indent_size = 3
22+
indent_style = space
23+
max_doc_length = 80
24+
max_line_length = 80
25+
26+
[*.awk]
27+
indent_size = 3
28+
indent_style = space
29+
max_doc_length = 80
30+
max_line_length = 100
31+
32+
[*.cmake]
33+
indent_size = 2
34+
indent_style = space
35+
max_doc_length = 80
36+
max_line_length = 100
37+
38+
[*.sh]
39+
indent_size = 4
40+
indent_style = space
41+
max_doc_length = 100
42+
max_line_length = 100
43+
44+
[{Makefile.in,aclocal.m4,ltmain.sh}]
45+
indent_size = unset
46+
indent_style = unset
47+
insert_final_newline = unset
48+
max_doc_length = unset
49+
max_line_length = unset
50+
trim_trailing_whitespace = unset
51+
52+
[COMMIT_EDITMSG]
53+
indent_style = space
54+
max_doc_length = unset
55+
max_line_length = 72

‎vendor/libpng/.editorconfig-checker.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Disable": {
3+
"IndentSize": true
4+
},
5+
"Exclude": [
6+
".git/",
7+
"out/"
8+
]
9+
}

‎vendor/libpng/.github/workflows/lint.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Linting libpng
2+
3+
on:
4+
push:
5+
branches:
6+
- libpng16
7+
- libpng18
8+
pull_request:
9+
branches:
10+
- libpng16
11+
- libpng18
12+
13+
jobs:
14+
lint:
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 5
17+
steps:
18+
- name: Set up the cache
19+
uses: actions/cache@v4
20+
with:
21+
path: ~/.cache/pip
22+
key: ${{ runner.os }}-pip-${{ hashFiles('**/pip.txt') }}
23+
restore-keys: ${{ runner.os }}-pip-
24+
- name: Install yamllint
25+
run: pip install yamllint
26+
- name: Check out the code
27+
uses: actions/checkout@v4
28+
- name: Run the linting script
29+
run: bash ./ci/ci_lint.sh

0 commit comments

Comments
 (0)