Skip to content

Commit

Permalink
Merge branch 'feature/v0.4.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Apr 22, 2022
2 parents 27e33fe + 033e02d commit bbaea60
Show file tree
Hide file tree
Showing 53 changed files with 105 additions and 105 deletions.
2 changes: 1 addition & 1 deletion colour/algebra/coordinates/tests/test_transformations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.algebra.coordinates.transformations` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/algebra/tests/test_interpolation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.algebra.interpolation` module.
Define the unit tests for the :mod:`colour.algebra.interpolation` module.
References
----------
Expand Down
2 changes: 1 addition & 1 deletion colour/algebra/tests/test_prng.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.algebra.prng` module.
Define the unit tests for the :mod:`colour.algebra.prng` module.
References
----------
Expand Down
2 changes: 1 addition & 1 deletion colour/biochemistry/tests/test_michaelis_menten.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.biochemistry.michaelis_menten`
Define the unit tests for the :mod:`colour.biochemistry.michaelis_menten`
module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/characterisation/tests/test_correction.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.characterisation.correction`
Define the unit tests for the :mod:`colour.characterisation.correction`
module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/colorimetry/tests/test_transformations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.colorimetry.transformations`
Define the unit tests for the :mod:`colour.colorimetry.transformations`
module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/colorimetry/tests/test_tristimulus_values.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.colorimetry.tristimulus_values`
Define the unit tests for the :mod:`colour.colorimetry.tristimulus_values`
module.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/difference/tests/test_delta_e.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.difference.delta_e` module.
Define the unit tests for the :mod:`colour.difference.delta_e` module.
References
----------
Expand Down
10 changes: 5 additions & 5 deletions colour/models/rgb/transfer_functions/filmic_pro.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def log_encoding_FilmicPro6(t: FloatingOrArrayLike) -> FloatingOrNDArray:
return as_float(from_range_1(y))


_LOG_DECODING_FILMICPRO_INTERPOLATOR_CACHE: Optional[Extrapolator] = None
_CACHE_LOG_DECODING_FILMICPRO_INTERPOLATOR: Optional[Extrapolator] = None


def _log_decoding_FilmicPro6_interpolator() -> Extrapolator:
Expand All @@ -109,15 +109,15 @@ def _log_decoding_FilmicPro6_interpolator() -> Extrapolator:
function interpolator.
"""

global _LOG_DECODING_FILMICPRO_INTERPOLATOR_CACHE
global _CACHE_LOG_DECODING_FILMICPRO_INTERPOLATOR

t = np.arange(0, 1, 0.0001)
if _LOG_DECODING_FILMICPRO_INTERPOLATOR_CACHE is None:
_LOG_DECODING_FILMICPRO_INTERPOLATOR_CACHE = Extrapolator(
if _CACHE_LOG_DECODING_FILMICPRO_INTERPOLATOR is None:
_CACHE_LOG_DECODING_FILMICPRO_INTERPOLATOR = Extrapolator(
LinearInterpolator(log_encoding_FilmicPro6(t), t)
)

return _LOG_DECODING_FILMICPRO_INTERPOLATOR_CACHE
return _CACHE_LOG_DECODING_FILMICPRO_INTERPOLATOR


def log_decoding_FilmicPro6(y: FloatingOrArrayLike) -> FloatingOrNDArray:
Expand Down
20 changes: 10 additions & 10 deletions colour/models/rgb/transfer_functions/filmlight_tlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ def log_encoding_FilmLightTLog(

x = to_domain_1(x)

b = 1.0 / (0.7107 + 1.2359 * np.log(w * g))
gs = g / (1.0 - o)
b = 1 / (0.7107 + 1.2359 * np.log(w * g))
gs = g / (1 - o)
C = b / gs
a = 1.0 - b * np.log(w + C)
a = 1 - b * np.log(w + C)
y0 = a + b * np.log(C)
s = (1.0 - o) / (1.0 - y0)
A = 1.0 + (a - 1.0) * s
s = (1 - o) / (1 - y0)
A = 1 + (a - 1) * s
B = b * s
G = gs * s

Expand Down Expand Up @@ -202,13 +202,13 @@ def log_decoding_FilmLightTLog(

t = to_domain_1(t)

b = 1.0 / (0.7107 + 1.2359 * np.log(w * g))
gs = g / (1.0 - o)
b = 1 / (0.7107 + 1.2359 * np.log(w * g))
gs = g / (1 - o)
C = b / gs
a = 1.0 - b * np.log(w + C)
a = 1 - b * np.log(w + C)
y0 = a + b * np.log(C)
s = (1.0 - o) / (1.0 - y0)
A = 1.0 + (a - 1.0) * s
s = (1 - o) / (1 - y0)
A = 1 + (a - 1) * s
B = b * s
G = gs * s

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.common` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_aces.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.aces`
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.aces`
module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.arib_std_b67` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.arri_alexa_log_c` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
blackmagic_design` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.canon_log` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_cineon.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.cineon` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_common.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.common` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
davinci_intermediate` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_dcdm.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.dcdm`
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.dcdm`
module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.dicom_gsdf` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
dji_dlog` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.exponent` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.filmic_pro` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
filmlight_tlog` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
fujifilm_flog` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_gamma.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.gamma` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_gopro.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.gopro` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.itur_bt_1886` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.itur_bt_2020` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.itur_bt_2100` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.itur_bt_601` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.itur_bt_709` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_linear.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.linear` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_log.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.log` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
nikon_nlog` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_panalog.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.panalog` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
panasonic_vlog` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.\
pivoted_log` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_red_log.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.red_log` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.rimm_romm_rgb` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.smpte_240m` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.sony_slog` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_srgb.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the :mod:`colour.models.rgb.transfer_functions.sRGB`
Define the unit tests for the :mod:`colour.models.rgb.transfer_functions.sRGB`
module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/tests/test_st_2084.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.st_2084` module.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the unit tests for the
Define the unit tests for the
:mod:`colour.models.rgb.transfer_functions.viper_log` module.
"""

Expand Down
2 changes: 1 addition & 1 deletion colour/notation/datasets/munsell/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
)
MUNSELL_COLOURS.__doc__ = """
Defines the *Munsell Renotation System* datasets.
Define the *Munsell Renotation System* datasets.
- ``Munsell Colours All``: *all* published *Munsell* colours, including the
extrapolated colors.
Expand Down
Loading

0 comments on commit bbaea60

Please sign in to comment.