Merge branch 'feature/v0.2.1' into develop

Author: KelSolaar

.github/workflows/continuous-integration-quality-unit-tests.yml

@@ -9,6 +9,9 @@ jobs:
       matrix:
         os: [macOS-latest, ubuntu-20.04, windows-latest]
         python-version: [3.8, 3.9, '3.10']
+        exclude:
+          - os: windows-latest
+            python-version: 3.8
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:

README.rst

@@ -21,7 +21,7 @@ Colour - HDRI
 .. end-badges
 
 A `Python <https://www.python.org/>`__ package implementing various
-HDRI / Radiance image processing algorithms.
+HDRI processing algorithms.
 
 It is open source and freely available under the
 `New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
@@ -39,7 +39,7 @@ Features
 
 The following features are available:
 
-- HDRI / Radiance Image Generation
+- HDRI Generation
 - Debevec (1997) Camera Response Function Computation
 - Grossberg (2003) Histogram Based Image Sampling
 - Variance Minimization Light Probe Sampling

colour_hdri/__init__.py

@@ -2,15 +2,15 @@
 Colour - HDRI
 =============
 
-HDRI - Radiance image processing algorithms for *Python*.
+HDRI processing algorithms for *Python*.
 
 Subpackages
 -----------
 -   calibration: Camera calibration computations.
 -   distortion: Lens vignette characterisation & correction.
 -   exposure: Exposure computations.
 -   examples: Examples for the sub-packages.
--   generation: HDRI / radiance image generation.
+-   generation: HDRI Generation.
 -   models: Colour models conversion.
 -   plotting: Diagrams, figures, etc...
 -   process: Image conversion helpers.
@@ -84,7 +84,7 @@
     normal_distribution_function,
     hat_function,
     weighting_function_Debevec1997,
-    image_stack_to_radiance_image,
+    image_stack_to_HDRI,
 )
 from .calibration import (
     absolute_luminance_calibration_Lagarde2016,
@@ -183,7 +183,7 @@
     "normal_distribution_function",
     "hat_function",
     "weighting_function_Debevec1997",
-    "image_stack_to_radiance_image",
+    "image_stack_to_HDRI",
 ]
 __all__ += [
     "absolute_luminance_calibration_Lagarde2016",
@@ -292,6 +292,10 @@ def __getattr__(self, attribute) -> Any:
             "colour_hdri.camera_space_to_XYZ_matrix",
             "colour_hdri.matrix_camera_space_to_XYZ",
         ],
+        [
+            "colour_hdri.image_stack_to_radiance_image",
+            "colour_hdri.image_stack_to_HDRI",
+        ],
     ]
 }
 """Defines the *colour_hdri* package API changes."""

colour_hdri/calibration/absolute_luminance.py

@@ -77,8 +77,8 @@ def upper_hemisphere_illuminance_Lagarde2016(
 
     theta = np.linspace(0, 1, height) * np.pi
 
-    theta_cos = np.cos(theta)[..., np.newaxis]
-    theta_sin = np.sin(theta)[..., np.newaxis]
+    theta_cos = np.cos(theta)[..., None]
+    theta_sin = np.sin(theta)[..., None]
 
     E_v = np.sum(np.where(theta_cos > 0, L * theta_cos * theta_sin, 0))
 
@@ -135,7 +135,7 @@ def upper_hemisphere_illuminance_weights_Lagarde2016(
     w = np.zeros((height, width))
 
     theta = np.linspace(0, 1, height) * np.pi
-    theta = np.tile(theta[..., np.newaxis], (1, width))
+    theta = np.tile(theta[..., None], (1, width))
 
     theta_cos = np.cos(theta)
     theta_sin = np.sin(theta)

colour_hdri/distortion/vignette.py

@@ -154,10 +154,10 @@ def apply_radial_gradient(
     samples_y += offset_y - 0.5
 
     distance = np.sqrt(
-        (samples_x**2)[..., np.newaxis] + (samples_y**2)[np.newaxis, ...]
+        (samples_x**2)[..., None] + (samples_y**2)[None, ...]
     )
 
-    image *= 1 - distance[..., np.newaxis] * intensity
+    image *= 1 - distance[..., None] * intensity
     image **= bias
 
     image += np.random.random(image.shape) * noise