Skip to content

Commit

Permalink
Merge branch 'pnggroup:libpng16' into libpng16-ACES-AP0
Browse files Browse the repository at this point in the history
  • Loading branch information
jbowler authored Sep 22, 2024
2 parents 521e8e8 + b8a0a54 commit 9029345
Show file tree
Hide file tree
Showing 15 changed files with 517 additions and 46 deletions.
16 changes: 14 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,41 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.txt]
indent_size = unset
indent_style = space

[*.[chS]]
indent_size = 3
indent_style = space
max_doc_length = 80
max_line_length = 80

[*.dfa]
indent_size = 3
indent_style = space
max_doc_length = 80
max_line_length = 80

[*.{awk,cmake}]
[*.awk]
indent_size = 3
indent_style = space
max_doc_length = 80
max_line_length = 100

[*.{in,sh}]
[*.cmake]
indent_size = 2
indent_style = space
max_doc_length = 80
max_line_length = 100

[*.sh]
indent_size = 4
indent_style = space
max_doc_length = 100
max_line_length = 100

[{Makefile.in,ltmain.sh}]
indent_size = unset
indent_style = unset
insert_final_newline = unset
max_doc_length = unset
Expand Down
9 changes: 9 additions & 0 deletions .editorconfig-checker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Disable": {
"IndentSize": true
},
"Exclude": [
".git/",
"out/"
]
}
96 changes: 82 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,39 +31,111 @@
# Compiled executables
*.app/
*.exe
a.out

# Debug files
*.dSYM/
*.idb
*.pdb
*.su

# Tag files
TAGS
.TAGS
!TAGS/
tags
.tags
!tags/
gtags.files
GTAGS
GRTAGS
GPATH
GSYMS
cscope.files
cscope.out
cscope.*.out

# Text editing and text processing artifacts
\#*\#
.\#*
[._]*.sw[a-p]
[._]sw[a-p]
*.bak
*.orig
*.rej
*.tmp
*~

# IDE files and directories
## Eclipse
.cproject/
.project/
.settings/
## JetBrains
.idea/
## NetBeans
nbbuild/
nbdist/
nbproject/
## Visual Studio
.vs/
### Visual Studio user files
*.rsuser
*.sln.docstates
*.suo
*.user
*.userosscache
*.userprefs
### Visual Studio cache files (for older versions)
*.aps
*.cachefile
*.ncb
*.opensdf
*.sdf
*.VC.db
*.VC.opendb
ipch/
## Visual Studio Code
.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/settings.json
!.vscode/tasks.json
## (Various)
[._]*_history
.history/

# Build, test and CI output directories
*[Dd]ebug/
*[Rr]elease/
*[Rr]eleases/
[Ll]og/
[Ll]ogs/
[Oo]ut/

# Libpng configuration and build artifacts
*.out
*out.png
.deps/
.dirstamp
/Makefile
/autom4te.cache/
/config.guess~
/config.h.in~
/config*~
/config.h
/config.log
/config.status
/config.sub~
/configure~
/install-sh~
/libpng-config
/libpng.pc
/install*~
/libpng*-config
/libpng*.pc
/libpng.vers
/libpng16-config
/libpng16.pc
/libtool
/stamp-h1
pnglibconf.[ch]
pnglibconf.dfn
pnglibconf.pre
pngprefix.h

# Libpng test artifacts
# Libpng test programs
png-fix-itxt
pngcp
pngfix
Expand All @@ -73,7 +145,3 @@ pngtest
pngunknown
pngvalid
timepng
pngout.png

# Libpng CI artifacts
out/
6 changes: 4 additions & 2 deletions ci/ci_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function ci_lint_text_files {
}
ci_info "## LINTING: text files ##"
ci_spawn "$CI_EDITORCONFIG_CHECKER" --version
ci_spawn "$CI_EDITORCONFIG_CHECKER" || {
ci_spawn "$CI_EDITORCONFIG_CHECKER" --config .editorconfig-checker.json || {
# Linting failed.
return 1
}
Expand All @@ -93,7 +93,9 @@ function ci_lint_yaml_files {
}
ci_info "## LINTING: YAML files ##"
ci_spawn "$CI_YAMLLINT" --version
find . \( -iname "*.yml" -o -iname "*.yaml" \) -not -path "./out/*" | {
# Considering that the YAML format is an extension of the JSON format,
# we can lint both the YAML files and the plain JSON files here.
find . \( -iname "*.yml" -o -iname "*.yaml" -o -iname "*.json" \) -not -path "./out/*" | {
local my_file
while IFS="" read -r my_file
do
Expand Down
2 changes: 2 additions & 0 deletions contrib/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
root = false

[*.[ch]]
indent_size = unset
indent_style = unset
max_doc_length = unset
max_line_length = unset
2 changes: 1 addition & 1 deletion contrib/libtests/pngstest.c
Original file line number Diff line number Diff line change
Expand Up @@ -3500,7 +3500,7 @@ main(int argc, char **argv)
int retval = 0;
int c;

#if PNG_LIBPNG_VER >= 10700
#if PNG_LIBPNG_VER == 10700
/* This error should not exist in 1.7 or later: */
opts |= GBG_ERROR;
#endif
Expand Down
Loading

0 comments on commit 9029345

Please sign in to comment.