Merge branch 'release/v0.1.5'

Author: KelSolaar

.travis.yml

@@ -7,7 +7,6 @@ matrix:
   - python: 2.7
     env:
     - PYTHON_VERSION="2.7"
-    - NUMPY_VERSION="1.13.3"
 
 notifications:
   slack: colour-science:Y6lPPcN7y53Js94geqUpqsAP

BIBLIOGRAPHY.bib

@@ -12,6 +12,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2018 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| Copyright © 2015-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour-hdri <http://github.com/colour-science/colour-hdri>`_

CONTRIBUTORS.rst

@@ -1,10 +1,7 @@
-include COPYING
 include LICENSE
 include *.bib
 include *.rst
 graft colour_hdri/examples
-graft docs/_build
-graft utilities
 prune colour_hdri/examples/.ipynb_checkpoints
 global-exclude *.pyc
 global-exclude *.pyo

COPYING

@@ -59,6 +59,7 @@ Primary Dependencies
 
 -  `Python 2.7 <https://www.python.org/download/releases/>`_ or
    `Python 3.5 <https://www.python.org/download/releases/>`_
+-  `Colour Science <https://www.colour-science.org>`_
 -  `NumPy <http://www.numpy.org/>`_
 -  `OpenImageIO <https://github.com/OpenImageIO/oiio>`_
 
@@ -96,6 +97,10 @@ The documentation building dependencies are installed as follows::
 
     pip install 'colour-hdri[docs]'
 
+The overall development dependencies are installed as follows::
+
+    pip install 'colour-hdri[development]'
+
 Usage
 -----
 
@@ -115,7 +120,7 @@ Contributing
 ------------
 
 If you would like to contribute to `Colour - HDRI <https://github.com/colour-science/colour-hdri>`_,
-please refer to the following `Contributing <http://colour-science.org/contributing/>`_
+please refer to the following `Contributing <https://www.colour-science.org/contributing/>`_
 guide for `Colour <https://github.com/colour-science/colour>`_.
 
 Bibliography
@@ -129,6 +134,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2018 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| Copyright © 2015-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour-hdri <http://github.com/colour-science/colour-hdri>`_

MANIFEST.in

@@ -4,9 +4,14 @@ Colour - HDRI - TODO
 TODO
 ----
 
+-   colour_hdri/__init__.py
+
+    -   Line 144 : # TODO: Remove legacy printing support when deemed appropriate.
+
+
 -   colour_hdri/calibration/debevec1997.py
 
-    -   Line 168 : # TODO: Investigate if the normalisation value should account for the percentage of uncertain camera response functions values or be correlated to it and scaled accordingly. As an alternative of setting the uncertain camera response functions values to zero, it would be interesting to explore extrapolation as the camera response functions are essentially smooth. It is important to note that camera sensors are usually acting non linearly when reaching saturation level.
+    -   Line 167 : # TODO: Investigate if the normalisation value should account for the percentage of uncertain camera response functions values or be correlated to it and scaled according. As an alternative of setting the uncertain camera response functions values to zero, it would be interesting to explore extrapolation as the camera response functions are essentially smooth. It is important to note that camera sensors are usually acting non linearly when reaching saturation level.
 
 
 -   colour_hdri/tonemapping/global_operators/operators.py
@@ -17,6 +22,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2018 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| Copyright © 2015-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour-hdri <http://github.com/colour-science/colour-hdri>`_

README.rst

@@ -22,15 +22,20 @@
 
 from __future__ import absolute_import
 
+import numpy as np
 import os
+import recordclass
+import subprocess  # nosec
+
+import colour
 
 from .utilities import (
-    EXIF_EXECUTABLE, ExifTag, adjust_exposure, average_luminance,
-    copy_exif_tags, delete_exif_tags, exposure_value, filter_files, Image,
-    ImageStack, Metadata, parse_exif_array, parse_exif_data,
-    parse_exif_fraction, parse_exif_numeric, parse_exif_string, path_exists,
-    read_exif_tag, read_exif_tags, update_exif_tags, vivification,
-    vivified_to_dict, write_exif_tag)
+    EXIF_EXECUTABLE, ExifTag, adjust_exposure, average_illuminance,
+    average_luminance, copy_exif_tags, delete_exif_tags, exposure_value,
+    filter_files, Image, ImageStack, Metadata, parse_exif_array,
+    parse_exif_data, parse_exif_fraction, parse_exif_numeric,
+    parse_exif_string, path_exists, read_exif_tag, read_exif_tags,
+    update_exif_tags, vivification, vivified_to_dict, write_exif_tag)
 from .sampling import (
     light_probe_sampling_variance_minimization_Viriyothai2009,
     samples_Grossberg2003)
@@ -48,7 +53,7 @@
                       RAW_CONVERTER, RAW_D_CONVERSION_ARGUMENTS,
                       convert_dng_files_to_intermediate_files,
                       convert_raw_files_to_dng_files, read_dng_files_exif_tags)
-from .recovery import (highlights_recovery_blend, highlights_recovery_LCHab)
+from .recovery import highlights_recovery_blend, highlights_recovery_LCHab
 from .tonemapping import (
     tonemapping_operator_exponential,
     tonemapping_operator_exponentiation_mapping, tonemapping_operator_filmic,
@@ -59,19 +64,20 @@
     tonemapping_operator_Tumblin1999)
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2015-2018 - Colour Developers'
+__copyright__ = 'Copyright (C) 2015-2019 - Colour Developers'
 __license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'
 __status__ = 'Production'
 
 __all__ = [
-    'EXIF_EXECUTABLE', 'ExifTag', 'adjust_exposure', 'average_luminance',
-    'copy_exif_tags', 'delete_exif_tags', 'exposure_value', 'filter_files',
-    'Image', 'ImageStack', 'Metadata', 'parse_exif_array', 'parse_exif_data',
-    'parse_exif_fraction', 'parse_exif_numeric', 'parse_exif_string',
-    'path_exists', 'read_exif_tag', 'read_exif_tags', 'update_exif_tags',
-    'vivification', 'vivified_to_dict', 'write_exif_tag'
+    'EXIF_EXECUTABLE', 'ExifTag', 'adjust_exposure', 'average_illuminance',
+    'average_luminance', 'copy_exif_tags', 'delete_exif_tags',
+    'exposure_value', 'filter_files', 'Image', 'ImageStack', 'Metadata',
+    'parse_exif_array', 'parse_exif_data', 'parse_exif_fraction',
+    'parse_exif_numeric', 'parse_exif_string', 'path_exists', 'read_exif_tag',
+    'read_exif_tags', 'update_exif_tags', 'vivification', 'vivified_to_dict',
+    'write_exif_tag'
 ]
 __all__ += [
     'light_probe_sampling_variance_minimization_Viriyothai2009',
@@ -119,8 +125,25 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '4'
+__change_version__ = '5'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,
      __change_version__))  # yapf: disable
+
+try:
+    version = subprocess.check_output(  # nosec
+        ['git', 'describe'], cwd=os.path.dirname(__file__)).strip()
+    version = version.decode('utf-8')
+except Exception:
+    version = __version__
+
+colour.utilities.ANCILLARY_COLOUR_SCIENCE_PACKAGES['colour-hdri'] = version
+colour.utilities.ANCILLARY_RUNTIME_PACKAGES[
+    'recordclass'] = recordclass.__version__
+
+# TODO: Remove legacy printing support when deemed appropriate.
+try:
+    np.set_printoptions(legacy='1.13')
+except TypeError:
+    pass

TODO.rst

@@ -23,9 +23,10 @@
 import numpy as np
 
 from colour import RGB_COLOURSPACES, RGB_luminance
+from colour.utilities import as_float_array
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2015-2018 - Colour Developers'
+__copyright__ = 'Copyright (C) 2015-2019 - Colour Developers'
 __license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'
@@ -58,7 +59,7 @@ def upper_hemisphere_illuminance_Lagarde2016(
 
     References
     ----------
-    -   :cite:`Lagarde2016b`
+    :cite:`Lagarde2016b`
 
     Examples
     --------
@@ -67,7 +68,7 @@ def upper_hemisphere_illuminance_Lagarde2016(
     2.9344691...
     """
 
-    RGB = np.asarray(RGB)
+    RGB = as_float_array(RGB)
 
     height, width, _channels = RGB.shape
 
@@ -104,7 +105,7 @@ def upper_hemisphere_illuminance_weights_Lagarde2016(height, width):
 
     References
     ----------
-    -   :cite:`Lagarde2016b`
+    :cite:`Lagarde2016b`
 
     Examples
     --------
@@ -204,7 +205,7 @@ def absolute_luminance_calibration_Lagarde2016(
             [ 233.9912506...,  233.9912506...,  233.9912506...]]])
     """
 
-    RGB = np.asarray(RGB)
+    RGB = as_float_array(RGB)
 
     E_v = upper_hemisphere_illuminance_Lagarde2016(RGB, colourspace)
 

colour_hdri/__init__.py

@@ -27,14 +27,14 @@
 
 import numpy as np
 
-from colour.utilities import tstack
+from colour.utilities import as_float_array, as_int_array, tstack
 
 from colour_hdri.generation import weighting_function_Debevec1997
 from colour_hdri.sampling import samples_Grossberg2003
 from colour_hdri.utilities import average_luminance
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2015-2018 - Colour Developers'
+__copyright__ = 'Copyright (C) 2015-2019 - Colour Developers'
 __license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'
@@ -55,9 +55,9 @@ def g_solve(Z, B, l_s=30, w=weighting_function_Debevec1997, n=256):
     Z : array_like
         Set of pixel values observed for several pixels in several images.
     B : array_like
-        Log :math:`\Delta t`, or log shutter speed for images.
+        Log :math:`\\Delta t`, or log shutter speed for images.
     l_s : numeric, optional
-        :math:`\lambda` smoothing term.
+        :math:`\\lambda` smoothing term.
     w : callable, optional
         Weighting function :math:`w`.
     n : int, optional
@@ -71,12 +71,12 @@ def g_solve(Z, B, l_s=30, w=weighting_function_Debevec1997, n=256):
 
     References
     ----------
-    -   :cite:`Debevec1997a`
+    :cite:`Debevec1997a`
     """
 
-    Z = np.asarray(Z).astype(int)
-    B = np.asarray(B)
-    l_s = np.asarray(l_s)
+    Z = as_int_array(Z)
+    B = as_float_array(B)
+    l_s = as_float_array(l_s)
 
     Z_x, Z_y = Z.shape
 
@@ -134,7 +134,7 @@ def camera_response_functions_Debevec1997(image_stack,
     samples : int, optional
         Samples count per images.
     l_s : numeric, optional
-        :math:`\lambda` smoothing term.
+        :math:`\\lambda` smoothing term.
     w : callable, optional
         Weighting function :math:`w`.
     n : int, optional
@@ -151,14 +151,13 @@ def camera_response_functions_Debevec1997(image_stack,
 
     References
     ----------
-    -   :cite:`Debevec1997a`
+    :cite:`Debevec1997a`
     """
 
     s_o = s(image_stack.data, samples, n)
 
-    L_l = np.log(
-        average_luminance(image_stack.f_number, image_stack.exposure_time,
-                          image_stack.iso))
+    L_l = np.log(1 / average_luminance(
+        image_stack.f_number, image_stack.exposure_time, image_stack.iso))
 
     g_c = [
         g_solve(s_o[..., x], L_l, l_s, w, n)[0] for x in range(s_o.shape[-1])
@@ -168,7 +167,7 @@ def camera_response_functions_Debevec1997(image_stack,
     if normalise:
         # TODO: Investigate if the normalisation value should account for the
         # percentage of uncertain camera response functions values or be
-        # correlated to it and scaled accordingly. As an alternative of setting
+        # correlated to it and scaled according. As an alternative of setting
         # the uncertain camera response functions values to zero, it would be
         # interesting to explore extrapolation as the camera response functions
         # are essentially smooth. It is important to note that camera sensors

colour_hdri/calibration/absolute_luminance.py

@@ -21,7 +21,7 @@
     upper_hemisphere_illuminance_Lagarde2016)
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2015-2018 - Colour Developers'
+__copyright__ = 'Copyright (C) 2015-2019 - Colour Developers'
 __license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'

colour_hdri/calibration/debevec1997.py

@@ -17,7 +17,7 @@
 from colour_hdri.utilities import ImageStack, average_luminance, filter_files
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2015-2018 - Colour Developers'
+__copyright__ = 'Copyright (C) 2015-2019 - Colour Developers'
 __license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'
@@ -49,9 +49,8 @@ def test_g_solve(self):
         """
 
         image_stack = ImageStack.from_files(JPG_IMAGES)
-        L_l = np.log(
-            average_luminance(image_stack.f_number, image_stack.exposure_time,
-                              image_stack.iso))
+        L_l = np.log(1 / average_luminance(
+            image_stack.f_number, image_stack.exposure_time, image_stack.iso))
         samples = samples_Grossberg2003(image_stack.data)
 
         for i in range(3):