Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenColorIO 2.2 support -- preliminaries #3662

Merged
merged 1 commit into from
Nov 15, 2022

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Nov 11, 2022

  • Make it so that when we build against OCIO 2.2, it is possible to specify the built-in configs. The logic had previously precluded this, because at one point it checks to see if the passed config or contents of env $OCIO was an existing file. Now you can set OCIO to "ocio://default", for example, and it will be used by OIIO.

  • Expose getAliases (I think that has been there for a while but we didn't expose in in our ColorConfig wrapper).

  • Expose isColorSpaceLinear (new to OCIO 2.2)

  • New OIIO global getattribute query: "opencolorio_version" returns the human-readable version string (such as "2.2.0").

  • Some miscellaneous other cleanup in color_ocio.cpp

  • Change in color methodology for test suite: Previously, for every call to oiiotool in the testsuite, we passed a --colorconfig argument to oiiotool pointing it to the sample colorconfig that we ship in the testsuite. Here, I'm changing it so that the cmake setup for tests sets the OCIO env variable for all tests, so no explicit --colorconfig is necessary, and thus you won't see a path to the config in any of the test output files if they need to echo the command line arguments (and you'll see several test outputs altered in this way). This is a prelude to later changes that will use the built-in configs themselves for tests, when available.

More interesting changes coming in subsequent PRs.

* Make it so that when we build against OCIO 2.2, it is possible to
  specify the built-in configs. The logic had previously precluded
  this, because at one point it checks to see if the passed config or
  contents of env $OCIO was an existing file. Now you can set OCIO to
  "ocio://default", for example, and it will be used by OIIO.

* Expose getAliases (I think that has been there for a while but we
  didn't expose in in our ColorConfig wrapper).

* Expose isColorSpaceLinear (new to OCIO 2.2)

* New OIIO global getattribute query: "opencolorio_version" returns the
  human-readable version string (such as "2.2.0").

* Some miscellaneous other cleanup in color_ocio.cpp

* Change in color methodology for test suite: Previously, for every
  call to oiiotool in the testsuite, we passed a `--colorconfig`
  argument to oiiotool pointing it to the sample colorconfig that we
  ship in the testsuite. Here, I'm changing it so that the cmake setup
  for tests sets the OCIO env variable for all tests, so no explicit
  --colorconfig is necessary, and thus you won't see a path to the
  config in any of the test output files if they need to echo the
  command line arguments (and you'll see several test outputs altered
  in this way). This is a prelude to later changes that will use the
  built-in configs themselves for tests, when available.

More interesting changes coming in subsequent PRs.
@lgritz lgritz merged commit 04fc83e into AcademySoftwareFoundation:master Nov 15, 2022
@lgritz lgritz deleted the lg-ocio22-part1 branch November 15, 2022 03:23
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Nov 16, 2022
)

* Make it so that when we build against OCIO 2.2, it is possible to
  specify the built-in configs. The logic had previously precluded
  this, because at one point it checks to see if the passed config or
  contents of env $OCIO was an existing file. Now you can set OCIO to
  "ocio://default", for example, and it will be used by OIIO.

* Expose getAliases (I think that has been there for a while but we
  didn't expose in in our ColorConfig wrapper).

* Expose isColorSpaceLinear (new to OCIO 2.2)

* New OIIO global getattribute query: "opencolorio_version" returns the
  human-readable version string (such as "2.2.0").

* Some miscellaneous other cleanup in color_ocio.cpp

* Change in color methodology for test suite: Previously, for every
  call to oiiotool in the testsuite, we passed a `--colorconfig`
  argument to oiiotool pointing it to the sample colorconfig that we
  ship in the testsuite. Here, I'm changing it so that the cmake setup
  for tests sets the OCIO env variable for all tests, so no explicit
  --colorconfig is necessary, and thus you won't see a path to the
  config in any of the test output files if they need to echo the
  command line arguments (and you'll see several test outputs altered
  in this way). This is a prelude to later changes that will use the
  built-in configs themselves for tests, when available.

More interesting changes coming in subsequent PRs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant