diff --git a/website/SceneLinear.rst b/website/SceneLinear.rst index 956b6de29a..e6d147ff0e 100644 --- a/website/SceneLinear.rst +++ b/website/SceneLinear.rst @@ -11,12 +11,12 @@ proportional to the amount of light they represent. Most image formats are display-referred, where the values indicate how much light should be used to display the image on a screen (or how much ink to use to print the image onto paper), and many image formats apply an encoding to the image so that the -numbers are not linear. Some sources use the term 'input-referred' and -'output-referred' as alternatives to “scene-referred” and “display-referred” +numbers are not linear. Some sources use the term "input-referred" and +"output-referred" as alternatives to "scene-referred" and "display-referred" [#fterms]_. This is a brief description of the difference between scene-referred and -display-refrred representations, what linear-light means, and why using +display-referred representations, what linear-light means, and why using scene-referred images may be beneficial. For simplicity, the explanation here assumes the image is photographed by a digital camera and is displayed on a computer monitor. This discussion also applies to software generated images @@ -81,8 +81,9 @@ the colorfulness of bright areas, and increasing the colorfulness of dark ones. Such film-based images are so common that an image which has not had that process applied appears incorrect, so many digital tone mapping approaches are inspired by reproducing what film would do, to make the image appear more familiar and so -more natural. The images above illustrate this. The first version of the image -presents the pixels with the same color and intensity that the real objects had +more natural. The images above illustrate this. The first image is the +:doc:`test_images/ScanLines/Carrots` test image +processed so the pixels have the same color and intensity that the real objects had [#fsrgb]_. This particular scene has low enough contrast and subtle enough colors that monitors are capable of displaying it faithfully. The second image is a JPEG created by the camera using its built-in tone mapping of the image. This @@ -125,7 +126,7 @@ combined image appear as if a camera really photographed it, so we need to compute what light would have been captured by the camera. This task is much easier if the photographed background is a scene-referred image, and the software that generates the character also stores a scene-referred image as seen -by the 'virtual camera' in the software. If both the photograph of the +by the "virtual camera" in the software. If both the photograph of the background and the computer generated image are display-referred, with some artistic look applied, it will be much harder to produce a convincing composite image. OpenEXR images are widely used for motion picture visual effects @@ -253,7 +254,7 @@ OpenColorIO. .. [#ftonemap] Other terms are used for tone mapping and gamut compression, such as applying a Rendering Transform, Look, Display LUT, Filter, or OOTF (Opto-Optical Transfer function); many approaches combine both color and - contrast modification into a single step. Here, the term 'tone mapping' is used. + contrast modification into a single step. Here, the term "tone mapping" is used. .. [#fsrgb] The colors in the first image will be rendered as observed on monitors which are calibrated for sRGB with a maximum intensity of @@ -261,7 +262,7 @@ OpenColorIO. but slightly too bright. .. [#feotf] Other terms for EOTF include applying a gamma or log function, - or simply a 'monitor curve'. + or simply a "monitor curve". .. [#fscenelinear] One convention is to use the term *input-referred linear* for any image where the values are proportional to how much light the camera captured, diff --git a/website/test_images.txt b/website/test_images.txt index e4cf3510a3..e8ade404b6 100644 --- a/website/test_images.txt +++ b/website/test_images.txt @@ -14,6 +14,7 @@ ScanLines/README.rst ScanLines/Blobbies.exr ScanLines/CandleGlass.exr ScanLines/Cannon.exr +ScanLines/Carrots.exr ScanLines/Desk.exr ScanLines/MtTamWest.exr ScanLines/PrismsLenses.exr diff --git a/website/test_images/ScanLines/Carrots.rst b/website/test_images/ScanLines/Carrots.rst new file mode 100644 index 0000000000..6281769cf7 --- /dev/null +++ b/website/test_images/ScanLines/Carrots.rst @@ -0,0 +1,56 @@ +.. + SPDX-License-Identifier: BSD-3-Clause + Copyright Contributors to the OpenEXR Project. + +Carrots.exr +########### + +:download:`https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images/main/ScanLines/Carrots.exr` + +.. image:: https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images/main/ScanLines/Carrots.jpg + :target: https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images/main/ScanLines/Carrots.exr + + +Stored with ACES2065-1 (AP0) chromaticities + +.. list-table:: + :align: left + + * - lensModel + - 70-300mm F4.5-5.6 G SSM + * - channels + - A, B, G, R + * - expTime + - 0.625 + * - lineOrder + - increasing y + * - displayWindow + - (0 0) - (599 399) + * - effectiveFocalLength + - 120 + * - cameraModel + - SLT-A99 + * - dataWindow + - (0 0) - (599 399) + * - chromaticities + - red (0.7347 0.2653), green (0 1), blue (0.0001 -0.077), white (0.32168 0.33767) + * - pixelAspectRatio + - 1 + * - type + - scanlineimage + * - screenWindowWidth + - 1 + * - screenWindowCenter + - (0 0) + * - adoptedNeutral + - (0.32168 0.33767) + * - compression + - zip + * - cameraLabel + - Sony SLT-A99 + * - aperture + - 8 + * - cameraMake + - Sony + * - isoSpeed + - 100 diff --git a/website/test_images/index.rst b/website/test_images/index.rst index 5e944cbde0..7c1ec5da4c 100644 --- a/website/test_images/index.rst +++ b/website/test_images/index.rst @@ -57,7 +57,7 @@ values.
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -85,7 +85,7 @@ values.
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -183,7 +183,7 @@ values.
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -250,7 +250,7 @@ Examples of scanline images.
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -295,6 +295,25 @@ Examples of scanline images.

    + + + + + + Carrots.exr + + + +

    + Stored with ACES2065-1 (AP0) chromaticities +

    + + @@ -435,7 +454,7 @@ Examples of tiled images.
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1186,7 +1205,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1200,7 +1219,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1214,7 +1233,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1228,7 +1247,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1242,7 +1261,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1256,7 +1275,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1270,7 +1289,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1284,7 +1303,7 @@ Note the following about these images:
  • 10 parts
  • 118 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1298,7 +1317,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1312,7 +1331,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1326,7 +1345,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1340,7 +1359,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1354,7 +1373,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1368,7 +1387,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1382,7 +1401,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1396,7 +1415,7 @@ Note the following about these images:
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1491,7 +1510,7 @@ displayed images should be about 5 to 10 inches (12 to 25 cm).
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1551,7 +1570,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1593,7 +1612,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1612,7 +1631,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • cube-face map
  • @@ -1634,7 +1653,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • latitude-longitude map
  • @@ -1655,7 +1674,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1676,7 +1695,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • cube-face map
  • @@ -1697,7 +1716,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • latitude-longitude map
  • @@ -1718,7 +1737,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • @@ -1739,7 +1758,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • cube-face map
  • @@ -1760,7 +1779,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • latitude-longitude map
  • @@ -1781,7 +1800,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • cube-face map
  • @@ -1813,7 +1832,7 @@ Regular Images
  • single part
  • 1 channel
  • tiledimage
  • -
  • zips compression
  • +
  • zip compression
  • latitude-longitude map
  • @@ -1891,7 +1910,7 @@ EXR. The composited image has four separate parts.
  • 2 parts
  • 28 channels
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1905,7 +1924,7 @@ EXR. The composited image has four separate parts.
  • 2 parts
  • 28 channels
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1919,7 +1938,7 @@ EXR. The composited image has four separate parts.
  • 2 parts
  • 28 channels
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1933,7 +1952,7 @@ EXR. The composited image has four separate parts.
  • 2 parts
  • 28 channels
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1947,7 +1966,7 @@ EXR. The composited image has four separate parts.
  • 4 parts
  • 53 channels
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1982,7 +2001,7 @@ These images are the left view only of the above stereo images.
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -1996,7 +2015,7 @@ These images are the left view only of the above stereo images.
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2010,7 +2029,7 @@ These images are the left view only of the above stereo images.
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2024,7 +2043,7 @@ These images are the left view only of the above stereo images.
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2062,7 +2081,7 @@ composited, flattened image, with no depth channel, as a regular
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2076,7 +2095,7 @@ composited, flattened image, with no depth channel, as a regular
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2090,7 +2109,7 @@ composited, flattened image, with no depth channel, as a regular
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2104,7 +2123,7 @@ composited, flattened image, with no depth channel, as a regular
  • single part
  • 1 channel
  • deepscanline
  • -
  • zip compression
  • +
  • zips compression
  • @@ -2118,7 +2137,7 @@ composited, flattened image, with no depth channel, as a regular
  • single part
  • 1 channel
  • scanlineimage
  • -
  • zip compression
  • +
  • zips compression
  • diff --git a/website/test_images/toctree.rst b/website/test_images/toctree.rst index 6168a9441c..ad3c2d33e0 100644 --- a/website/test_images/toctree.rst +++ b/website/test_images/toctree.rst @@ -19,6 +19,7 @@ ScanLines/Blobbies ScanLines/CandleGlass ScanLines/Cannon + ScanLines/Carrots ScanLines/Desk ScanLines/MtTamWest ScanLines/PrismsLenses