* Fixinactive colorspaces in cg-config.
Fix OpenColorIO errors that was introduced a while ago in the unit test because of requirement for config.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Reverting changes in cg-config
Other warnings are not muted anymore when we check for role warnings.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Refactoring the new function in unit test log utils.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Integrating the code into LogGuard
Changing some misuses of StartsWith
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding a MuteLogging class for python side
Mute log from built-in config test
Comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding new utilities function to mute inactive colorspace info log while not muting all logs (C++ side)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* findAllAndRemove method from LogGuard now takes a regex pattern instead of just the line to find
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Adsk Contrib - Improve file rules for v1 configs
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Adsk Contrib - Emergency GPU build fix (#1391)
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Adsk Contrib - Fix some bugs found by Maya and SonarCloud (#1403)
* Adsk Contrib - Fix some bugs found by Maya and SonarCloud
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Fix a Windows warning
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* After Effects and Photoshop plug-in updates (#1373)
* Set Mac OS deployment target to 10.10
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* More 10.10 targets
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Ditch ADD_EXTRA_BUILTINS
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Getting strange callback when AE effect is pasted
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Use NDEBUG in AE project
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Disable radio buttons with no config
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Update version
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Move to AE 2021 SDK, set PF_OutFlag2_MUTABLE_RENDER_SEQUENCE_DATA_SLOWER
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Define OCIO_DEPRECATED in After Effects builds
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Verify change from color space menu
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Handle situation where color space has a '/' in it
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Windows family separator fix
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Invert everything
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Invert everything Windows
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Disable more controls
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Incorporate invert into LUT export
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Get rid of fullPaths stuff
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
* Fix changed config settings retention
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Add OpenColorIOConfig.cmake generation (#1397)
* Initial OpenColorIO Config CMake implementation
Signed-off-by: Rémi Achard <remiachard@gmail.com>
* Remove macro, improve documentation
Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Use CMake visibility flags (#1411)
* Update install doc minimal version numbers
Signed-off-by: Rémi Achard <remiachard@gmail.com>
* Use CMake visibility presets variables
Signed-off-by: Rémi Achard <remiachard@gmail.com>
* Fix python package case
Signed-off-by: Rémi Achard <remiachard@gmail.com>
* Allow advanced user to override symbol visibility
Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Fix Windows build
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Update include/OpenColorIO/OpenColorIO.h
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Update src/OpenColorIO/FileRules.cpp
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Hide dependency symbol visibility (#1409) (#1416)
When creating libOpenColorIO.so, we lacked the linker commands that
hide symbol visibility from the dependent libraries, which is
necessary to prevent OCIO from exporting the symbols from Expat and
the other dependencies that OCIO needs to use internally but is not
trying intentionally to expose via its API.
Failing to do this can result in symbol clashes and all sorts of
subtle errors if OCIO is used in an app that also uses and is linked
against a potentially different version of Expat (or any of the other
deps).
Signed-off-by: Larry Gritz <lg@larrygritz.com>
Co-authored-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Adsk Contrib - Improve DX11 & Cg fragment shader language support (#1406)
* Adsk Contrib - Improve DX11 support
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Improve Cg support
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Improve GPU comments
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Fix unit test failures
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
Co-authored-by: Brendan Bolles <brendan@fnordware.com>
Co-authored-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Larry Gritz <lg@larrygritz.com>
Co-authored-by: doug-walker <43830961+doug-walker@users.noreply.github.com>
* Move AppHelpers to core
Following up on the request from a recent TSC meeting, this PR moves the App Helpers code into the core library. This adds no new third-party dependencies. (The App Helpers code is intended to simplify the work of integrating OCIO into a real-world DCC application.) Also, following up on another suggestion, the ViewingPipeline class was renamed LegacyViewingPipeline.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Forgot to remove function declaration
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Add python exposure
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Fixing the build with DOC. Still have to update the rst doc files.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Add filtering options to app helpers as described in issue 1222
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Fix merge issue
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Add missing destructor
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* cast issue
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
Co-authored-by: doug-walker <43830961+doug-walker@users.noreply.github.com>
* Named color transforms
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Allow NamedTransforms to be inactive using the same mechanism as color spaces.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Wrong enum
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Fix issue introduced by merge from master (version checking for NamedTransform serialization in config)
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Adsk Contrib - Add processor caches and improve the context variable support
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Fix merge issues with the Grading pull request
Signed-off-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
* Follow up on conflicting merges
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Some changes following the code review
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
* Display reference space
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Fix tests on linux & macos: expacted exception message is not the same because typeid(*this).name() does not give the same result on different platforms.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Change how ColorSpace is serialized
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
Co-authored-by: Patrick Hodoul <patrickhodoul@gmail.com>
* Adding file rules to config.
The file rules are a set of filepath to color space mappings that are evaluated from first to last. The first rule to match is what determines which color space is returned. There are four types of rules available. Each rule type has a name key that may be used by applications to refer to that rule. Name values must be unique. The other keys depend on the rule type:
- Basic Rule: This is the basic rule type that uses Unix glob style pattern matching and is thus very easy to use. It contains the keys:
* name: Name of the rule
* colorspace: Color space name to be returned.
* pattern: Glob pattern to be used for the main part of the name/path.
* extension: Glob pattern to be used for the file extension. Note that if glob tokens are not used, the extension will be used in a non-case-sensitive way by default.
- Regex Rule: This is similar to the basic rule but allows additional capabilities for power-users. It contains the keys:
* name: Name of the rule
* colorspace: Color space name to be returned.
* regex: Regular expression to be evaluated.
- OCIO v1 style Rule: This rule allows the use of the OCIO v1 style, where the string is searched for color space names from the config. This rule may occur 0 or 1 times in the list. The position in the list prioritizes it with respect to the other rules. It has the key:
* name: Must be "ColorSpaceNamePathSearch".
- Default Rule: The file_rules must always end with this rule. If no prior rules match, this rule specifies the color space applications will use. It has the keys:
* name: must be "Default".
* colorspace : Color space name to be returned.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Remove unused constexpr.
Do not check system specific regex error.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Add comments.
Rename some FileRules releated functions for clarity.
Add new FileRules function to insert the "ColorSpaceNamePathSearch" rule with specifying its name.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
* Add new helper function setDefaultRuleColorSpace.
More comments.
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
