Merge branch 'release/v0.1.7'

colour-science · Mar 31, 2020 · a3529eb · a3529eb
2 parents 452a656 + 7972974
commit a3529eb
Show file tree

Hide file tree

Showing 59 changed files with 1,671 additions and 757 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -7,7 +7,7 @@ jobs:
     name: Unix Build
     strategy:
       matrix:
-        os: [ubuntu-18.04, macOS-10.14]
+        os: [ubuntu-18.04, macOS-latest]
         python-version: [2.7, 3.6, 3.7]
     runs-on: ${{ matrix.os }}
     steps:
@@ -19,17 +19,10 @@ jobs:
         CI_PYTHON_VERSION=${{ matrix.python-version }}
         CI_PACKAGE=colour_hdri
         CI_SHA=${{ github.sha }}
-        CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
-        CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *${CI_SHA:0:7}* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
-        CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_SUCCESS_NOTIFICATION/4CAF50/F44336}"
-        CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_FAILURE_NOTIFICATION/succeeded/failed}"
         COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
         echo ::set-env name=CI_PYTHON_VERSION::$CI_PYTHON_VERSION
         echo ::set-env name=CI_PACKAGE::$CI_PACKAGE
         echo ::set-env name=CI_SHA::$CI_SHA
-        echo ::set-env name=CI_SLACK_WEBHOOK::$CI_SLACK_WEBHOOK
-        echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::$CI_SLACK_SUCCESS_NOTIFICATION
-        echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::$CI_SLACK_FAILURE_NOTIFICATION
         echo ::set-env name=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
@@ -41,7 +34,7 @@ jobs:
         sudo apt-get update
         sudo apt-get --yes install dcraw libimage-exiftool-perl
     - name: macOS - Install Homebrew Dependencies
-      if: matrix.os == 'macOS-10.14'
+      if: matrix.os == 'macOS-latest'
       run: |
         brew install dcraw exiftool
         brew cask install adobe-dng-converter
@@ -51,14 +44,14 @@ jobs:
         mkdir -p ~/.config/matplotlib
         echo "backend: Agg" > ~/.config/matplotlib/matplotlibrc
     - name: macOS - Set up Matplotlib Backend
-      if: matrix.os == 'macOS-10.14'
+      if: matrix.os == 'macOS-latest'
       run: |
         mkdir -p ~/.matplotlib
         echo "backend: Agg" > ~/.matplotlib/matplotlibrc
     - name: Install Poetry
       run: |
         curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
-        python get-poetry.py --preview
+        python get-poetry.py --preview --version 1.0.0b3
         PATH=$HOME/.poetry/bin:$PATH
         echo ::set-env name=PATH::$PATH
     # - "rawpy" raises a "UnicodeEncodeError" exception on Python 2.7 during installation thus skipping the "optional" packages.
@@ -67,15 +60,13 @@ jobs:
       if: matrix.python-version == '2.7'
       run: |
         poetry install --extras "plotting"
-        poetry env use $CI_PYTHON_VERSION
         source $(poetry env info -p)/bin/activate
         pip install pathlib
         python -c "import imageio;imageio.plugins.freeimage.download()"
     - name: Python 3.x - Install Package Dependencies
       if: matrix.python-version != '2.7'
       run: |
         poetry install --extras "optional plotting"
-        poetry env use $CI_PYTHON_VERSION
         source $(poetry env info -p)/bin/activate
         python -c "import imageio;imageio.plugins.freeimage.download()"
     - name: Lint with flake8
@@ -91,11 +82,6 @@ jobs:
       run: |
         source $(poetry env info -p)/bin/activate
         if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
-    - name: Notify Slack
-      if: always()
-      run: |
-        if [ "${{ job.status }}" == "Success" ]; then CI_SLACK_NOTIFICATION="$CI_SLACK_SUCCESS_NOTIFICATION"; else CI_SLACK_NOTIFICATION="$CI_SLACK_FAILURE_NOTIFICATION"; fi
-        if [ -z "$CI_SLACK_WEBHOOK" ]; then echo \"SLACK_WEBHOOK\" secret is undefined!; else curl -k -d "$CI_SLACK_NOTIFICATION" -X POST $CI_SLACK_WEBHOOK; fi
   windows-build:
     name: Windows Build
     strategy:
@@ -112,17 +98,10 @@ jobs:
         set CI_PYTHON_VERSION=${{ matrix.python-version }}
         set CI_PACKAGE=colour_hdri
         set CI_SHA=${{ github.sha }}
-        set CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
-        set CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *"%CI_SHA:~0,7%"* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
-        set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION:4CAF50=F44336%
-        set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION:succeeded=failed%
         set COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
         echo ::set-env name=CI_PYTHON_VERSION::%CI_PYTHON_VERSION%
         echo ::set-env name=CI_PACKAGE::%CI_PACKAGE%
         echo ::set-env name=CI_SHA::%CI_SHA%
-        echo ::set-env name=CI_SLACK_WEBHOOK::%CI_SLACK_WEBHOOK%
-        echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::%CI_SLACK_SUCCESS_NOTIFICATION%
-        echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::%CI_SLACK_FAILURE_NOTIFICATION%
         echo ::set-env name=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
       shell: cmd
     - name: Set up Python ${{ matrix.python-version }}
@@ -131,8 +110,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install Command Line Dependencies
       run: |
-        curl -L https://sourceforge.net/projects/exiftool/files/exiftool-11.73.zip/download -o exiftool-11.73.zip
-        powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('exiftool-11.73.zip', 'exiftool'); }"
+        curl -L https://www.sno.phy.queensu.ca/~phil/exiftool/exiftool-11.75.zip -o exiftool-11.75.zip
+        powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('exiftool-11.75.zip', 'exiftool'); }"
         copy %CD%\exiftool\"exiftool(-k).exe" %CD%\exiftool\exiftool.exe
         dir %CD%\exiftool\
         curl -L https://cdn.fastpictureviewer.com/bin/dcraw.zip?v=201605100 -o dcraw.zip
@@ -145,7 +124,7 @@ jobs:
     - name: Install Poetry
       run: |
         curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
-        python get-poetry.py --preview
+        python get-poetry.py --preview --version 1.0.0b3
         set PATH=%USERPROFILE%\.poetry\bin;%PATH%
         echo ::set-env name=PATH::%PATH%
       shell: cmd
@@ -185,9 +164,3 @@ jobs:
         call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
         IF "%COVERALLS_REPO_TOKEN%"=="" (echo "COVERALLS_REPO_TOKEN" secret is undefined!) ELSE (coveralls)
       shell: cmd
-    - name: Notify Slack
-      if: always()
-      run: |
-        IF "${{ job.status }}"=="Success" (set CI_SLACK_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION%) ELSE (set CI_SLACK_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION%)
-        IF "%CI_SLACK_WEBHOOK%"=="" (echo "SLACK_WEBHOOK" secret is undefined!) ELSE (curl -k -d %CI_SLACK_NOTIFICATION% -X POST %CI_SLACK_WEBHOOK%)
-      shell: cmd
diff --git a/BIBLIOGRAPHY.bib b/BIBLIOGRAPHY.bib
@@ -1,10 +1,4 @@
-@misc{AdobeSystems2015d,
-  author       = {{Adobe Systems}},
-  title        = {{Adobe DNG SDK 1.4}},
-  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
-  year         = 2015,
-}
-@incollection{AdobeSystems2012d,
+@misc{AdobeSystems2012f,
   abstract     = {This publication and the information herein is
     furnished AS IS, is subject to change without notice, and should
     not be construed as a commitment by Adobe Systems Incorporated.
@@ -15,13 +9,11 @@ @incollection{AdobeSystems2012d
     fitness for particular purposes, and noninfringement of third
     party rights.},
   author       = {{Adobe Systems}},
-  booktitle    = {Digital Negative (DNG) Specification},
-  pages        = 80,
-  title        = {{Translating White Balance xy Coordinates to Camera
-    Neutral Coordinates}},
+  pages        = {1--101},
+  title        = {{Digital Negative (DNG) Specification}},
   year         = 2012,
 }
-@incollection{AdobeSystems2012e,
+@incollection{AdobeSystems2012d,
   abstract     = {This publication and the information herein is
     furnished AS IS, is subject to change without notice, and should
     not be construed as a commitment by Adobe Systems Incorporated.
@@ -33,27 +25,12 @@ @incollection{AdobeSystems2012e
     party rights.},
   author       = {{Adobe Systems}},
   booktitle    = {Digital Negative (DNG) Specification},
-  pages        = {80--81},
-  title        = {{Translating Camera Neutral Coordinates to White
-    Balance xy Coordinates}},
+  pages        = 80,
+  title        = {{Translating White Balance xy Coordinates to Camera
+    Neutral Coordinates}},
   year         = 2012,
 }
-@misc{AdobeSystems2015c,
-  author       = {{Adobe Systems}},
-  title        = {{Adobe DNG SDK 1.4 -
-    dng_sdk_1_4/dng_sdk/source/dng_camera_profile.cpp -
-    dng_camera_profile::IlluminantToTemperature}},
-  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
-  year         = 2015,
-}
-@misc{AdobeSystems2015e,
-  author       = {{Adobe Systems}},
-  title        = {{Adobe DNG SDK 1.4 -
-    dng_sdk_1_4/dng_sdk/source/dng_tag_values.h - LightSource tag}},
-  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
-  year         = 2015,
-}
-@misc{AdobeSystems2012f,
+@incollection{AdobeSystems2012g,
   abstract     = {This publication and the information herein is
     furnished AS IS, is subject to change without notice, and should
     not be construed as a commitment by Adobe Systems Incorporated.
@@ -64,11 +41,18 @@ @misc{AdobeSystems2012f
     fitness for particular purposes, and noninfringement of third
     party rights.},
   author       = {{Adobe Systems}},
-  pages        = {1--101},
-  title        = {{Digital Negative (DNG) Specification}},
+  booktitle    = {Digital Negative (DNG) Specification},
+  pages        = 81,
+  title        = {{Camera to XYZ (D50) Transform}},
   year         = 2012,
 }
-@incollection{AdobeSystems2012g,
+@misc{AdobeSystems2015d,
+  author       = {{Adobe Systems}},
+  title        = {{Adobe DNG SDK 1.4}},
+  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
+  year         = 2015,
+}
+@incollection{AdobeSystems2012e,
   abstract     = {This publication and the information herein is
     furnished AS IS, is subject to change without notice, and should
     not be construed as a commitment by Adobe Systems Incorporated.
@@ -80,29 +64,45 @@ @incollection{AdobeSystems2012g
     party rights.},
   author       = {{Adobe Systems}},
   booktitle    = {Digital Negative (DNG) Specification},
-  pages        = 81,
-  title        = {{Camera to XYZ (D50) Transform}},
+  pages        = {80--81},
+  title        = {{Translating Camera Neutral Coordinates to White
+    Balance xy Coordinates}},
   year         = 2012,
 }
-@book{Banterle2011n,
+@misc{AdobeSystems2015e,
+  author       = {{Adobe Systems}},
+  title        = {{Adobe DNG SDK 1.4 -
+    dng_sdk_1_4/dng_sdk/source/dng_tag_values.h - LightSource tag}},
+  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
+  year         = 2015,
+}
+@misc{AdobeSystems2015c,
+  author       = {{Adobe Systems}},
+  title        = {{Adobe DNG SDK 1.4 -
+    dng_sdk_1_4/dng_sdk/source/dng_camera_profile.cpp -
+    dng_camera_profile::IlluminantToTemperature}},
+  url          = {http://download.adobe.com/pub/adobe/dng/dng_sdk_1_4.zip},
+  year         = 2015,
+}
+@incollection{Banterle2011k,
   author       = {Banterle, Francesco and Artusi, Alessandro and
     Debattista, Kurt and Chalmers, Alan},
   booktitle    = {Advanced High Dynamic Range Imaging},
   isbn         = {978-1568817194},
-  pages        = {12--17},
+  pages        = {38--41},
   publisher    = {A K Peters/CRC Press},
-  title        = {{2.1.1 Generating HDR Content by Combining Multiple
-    Exposures}},
+  title        = {{3.2.1 Simple Mapping Methods}},
   year         = 2011,
 }
-@incollection{Banterle2011k,
+@book{Banterle2011n,
   author       = {Banterle, Francesco and Artusi, Alessandro and
     Debattista, Kurt and Chalmers, Alan},
   booktitle    = {Advanced High Dynamic Range Imaging},
   isbn         = {978-1568817194},
-  pages        = {38--41},
+  pages        = {12--17},
   publisher    = {A K Peters/CRC Press},
-  title        = {{3.2.1 Simple Mapping Methods}},
+  title        = {{2.1.1 Generating HDR Content by Combining Multiple
+    Exposures}},
   year         = 2011,
 }
 @misc{Banterle2014a,
@@ -193,20 +193,36 @@ @article{Grossberg2003g
   volume       = 25,
   year         = 2003,
 }
-@misc{Habble2010e,
+@misc{Habble2010d,
   author       = {Habble, John},
-  title        = {{Uncharted 2: HDR Lighting}},
-  url          = {http://www.slideshare.net/ozlael/hable-john-uncharted2-hdr-lighting},
+  title        = {{Filmic Tonemapping Operators}},
+  url          = {http://filmicgames.com/archives/75},
   urldate      = {2015-03-15},
   year         = 2010,
 }
-@misc{Habble2010d,
+@misc{Habble2010e,
   author       = {Habble, John},
-  title        = {{Filmic Tonemapping Operators}},
-  url          = {http://filmicgames.com/archives/75},
+  title        = {{Uncharted 2: HDR Lighting}},
+  url          = {http://www.slideshare.net/ozlael/hable-john-uncharted2-hdr-lighting},
   urldate      = {2015-03-15},
   year         = 2010,
 }
+@misc{ISO2006,
+  author       = {ISO},
+  title        = {{INTERNATIONAL STANDARD ISO12232-2006 - Photography
+    - Digital still cameras - Determination of exposure index, ISO
+    speed ratings, standard output sensitivity, and recommended
+    exposure index}},
+  year         = 2006,
+}
+@article{Lagarde2014,
+  author       = {Lagarde, S{\'{e}}bastian and de Rousiers, Charles},
+  journal      = {Siggraph 2014},
+  keywords     = {frostbite,pbr,physically based rendering},
+  pages        = 119,
+  title        = {{Moving Frostbite to Physically Based Rendering 3.0}},
+  year         = 2014,
+}
 @misc{Lagarde2016b,
   author       = {Lagarde, Sebastien and Lachambre, Sebastien and
     Jover, Cyril},

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -12,6 +12,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2019 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
+| Copyright © 2015-2020 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019, Colour Developers
+Copyright (c) 2015-2020, Colour Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.rst b/README.rst
@@ -5,7 +5,7 @@ Colour - HDRI
 
 |actions| |coveralls| |codacy| |version|
 
-.. |actions| image:: https://github.com/colour-science/colour-hdri/workflows/Continuous%20Integration/badge.svg
+.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-hdri/Continuous%20Integration?label=actions&logo=github&style=flat-square
     :target: https://github.com/colour-science/colour-hdri/actions
     :alt: Develop Build Status
 .. |coveralls| image:: http://img.shields.io/coveralls/colour-science/colour-hdri/develop.svg?style=flat-square
@@ -46,6 +46,7 @@ The following features are available:
 -   Global Tonemapping Operators
 -   Adobe DNG SDK Colour Processing
 -   Absolute Luminance Calibration
+-   Digital Still Camera (DSC) Exposure Model
 -   Raw Processing Helpers
 
 Installation
@@ -137,6 +138,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2019 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
+| Copyright © 2015-2020 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__
diff --git a/TODO.rst b/TODO.rst
@@ -6,7 +6,7 @@ TODO
 
 -   colour_hdri/__init__.py
 
-    -   Line 146 : # TODO: Remove legacy printing support when deemed appropriate.
+    -   Line 158 : # TODO: Remove legacy printing support when deemed appropriate.
 
 
 -   colour_hdri/calibration/debevec1997.py
@@ -22,6 +22,6 @@ About
 -----
 
 | **Colour - HDRI** by Colour Developers
-| Copyright © 2015-2019 – Colour Developers – `colour-[email protected] <colour-[email protected]>`_
+| Copyright © 2015-2020 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
-| `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`_
+| `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__