Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: colour-science/colour
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 645c2fd12a369c8e14fa2693de29b155302d3620
Choose a base ref
..
head repository: colour-science/colour
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65b9f3f5a9cf65c6f2b6f0c609fa3f8524b769c2
Choose a head ref
Showing 558 changed files with 10,992 additions and 7,518 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -6,4 +6,5 @@ sigterm = True
exclude_lines =
pragma: no cover
if __name__ == .__main__.:
if TYPE_CHECKING:
pass
Original file line number Diff line number Diff line change
@@ -52,10 +52,10 @@ jobs:
uv run python -c "import imageio;imageio.plugins.freeimage.download()"
shell: bash
- name: Install OpenImageIO (macOs)
if: matrix.os == 'macOS-latest' && matrix.python-version == '3.12'
if: matrix.os == 'macOS-latest' && matrix.python-version == '3.13'
run: |
brew install openimageio
ln -s /opt/homebrew/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/OpenImageIO*.so ./.venv/lib/python3.12/site-packages/OpenImageIO.so
ln -s /opt/homebrew/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/OpenImageIO*.so ./.venv/lib/python${{ matrix.python-version }}/site-packages/OpenImageIO.so
uv run python -c "import OpenImageIO;print(OpenImageIO.__version__)"
shell: bash
- name: Pre-Commit (All Files)
29 changes: 17 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
# Common Files
*.egg-info
*.pyc
*.pyo
.DS_Store
.coverage*
.fleet
.idea
.ipynb_checkpoints
uv.lock

# Common Directories
.fleet/
.idea/
.ipynb_checkpoints/
.python-version
.vs
.vscode
.sandbox
.vs/
.vscode/
.sandbox/
build/
dist/
docs/_build/
docs/generated/
node_modules/
references/

__pycache__

build
dist
docs/_build
# Project Files
docs/_static/Basics_*.png
docs/_static/Examples_*.png
docs/_static/Plotting_*.png
docs/_static/Tutorial_*.png
docs/generated
references
uv.lock
21 changes: 10 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.5.0"
rev: "v5.0.0"
hooks:
- id: check-added-large-files
- id: check-case-conflict
@@ -16,32 +16,31 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
args: ["--ignore-words-list=co-ordinates,exitance,fro,hart,ist"]
args:
[
"--ignore-words-list=co-ordinates,exitance,hart,ist,rIn,socio-economic",
]
exclude: "BIBLIOGRAPHY.bib|CONTRIBUTORS.rst"
- repo: https://github.com/ikamensh/flynt
rev: "1.0.1"
hooks:
- id: flynt
args: [--verbose]
- repo: https://github.com/PyCQA/isort
rev: "5.13.2"
hooks:
- id: isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.1.14"
rev: "v0.8.2"
hooks:
- id: ruff-format
- id: ruff
args: [--fix]
- repo: https://github.com/adamchainz/blacken-docs
rev: 1.16.0
rev: 1.19.1
hooks:
- id: blacken-docs
language_version: python3.10
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.1.0"
rev: "v4.0.0-alpha.8"
hooks:
- id: prettier
exclude: config-aces-reference.ocio.yaml
44 changes: 28 additions & 16 deletions BIBLIOGRAPHY.bib
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
@article{Abasi2020,
author = {Abasi, Saeedeh and Amani Tehran, Mohammad and Fairchild, Mark D.},
title = {Distance metrics for very large color differences},
journal = {Color Research \& Application},
volume = {45},
number = {2},
pages = {208-223},
keywords = {color difference formula, distance metric, perceived color difference, very large color difference},
doi = {https://doi.org/10.1002/col.22451},
url = {https://onlinelibrary.wiley.com/doi/abs/10.1002/col.22451},
eprint = {https://onlinelibrary.wiley.com/doi/pdf/10.1002/col.22451},
abstract = {Abstract Small, supra-threshold color differences are typically described with Euclidean distance metrics, or dimension-weighted Euclidean metrics, in color appearance spaces such as CIELAB. This research examines the perception and modeling of very large color differences in the order of 10 CIELAB units or larger, with an aim of describing the salience of color differences between distinct objects in real-world scenes and images. A psychophysical experiment was completed to compare directly large color-difference pairs designed to probe various Euclidean and non-Euclidean distance metrics. The results indicate that very large color differences are best described by HyAB, a combination of a Euclidean metric in hue and chroma with a city-block metric to incorporate lightness differences.},
year = {2020},
urldate = {2024-10-23},
howpublished = {http://markfairchild.org/PDFs/PAP40.pdf},
}
@misc{ANSI2003a,
title = {Specification of {{ROMM RGB}}},
author = {{ANSI}},
@@ -93,6 +77,34 @@ @misc{ASTMInternational2015b
pages = {1--47},
doi = {10.1520/E0308-15},
}
@article{Abasi2020a,
title = {Distance Metrics for Very Large Color Differences},
author = {Abasi, Saeedeh and Amani Tehran, Mohammad and
Fairchild, Mark D.},
year = 2020,
month = apr,
journal = {Color Research \& Application},
volume = 45,
number = 2,
pages = {208--223},
issn = {0361-2317, 1520-6378},
doi = {10.1002/col.22451},
urldate = {2024-10-23},
abstract = {Abstract Small, supra-threshold color differences
are typically described with Euclidean distance metrics, or
dimension-weighted Euclidean metrics, in color appearance spaces
such as CIELAB. This research examines the perception and modeling
of very large color differences in the order of 10 CIELAB units or
larger, with an aim of describing the salience of color
differences between distinct objects in real-world scenes and
images. A psychophysical experiment was completed to compare
directly large color-difference pairs designed to probe various
Euclidean and non-Euclidean distance metrics. The results indicate
that very large color differences are best described by HyAB, a
combination of a Euclidean metric in hue and chroma with a
city-block metric to incorporate lightness differences.},
langid = {english},
}
@article{Abebe2017,
title = {Perceptual {{Lightness Modeling}} for
{{High-Dynamic-Range Imaging}}},
Loading