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

Misc fixes to colourspace extension #171

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Documentation/sources/Reference/ofxPropertiesReference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ Properties Reference

.. doxygendefine:: kOfxImageEffectPropColourManagementAvailableConfigs

.. doxygendefine:: kOfxImageEffectPropColourManagementBasic
.. doxygendefine:: kOfxImageEffectColourManagementBasic

.. doxygendefine:: kOfxImageEffectPropColourManagementConfig
.. doxygendefine:: kOfxImageEffectColourManagementConfig

.. doxygendefine:: kOfxImageEffectPropColourManagementCore
.. doxygendefine:: kOfxImageEffectColourManagementCore

.. doxygendefine:: kOfxImageEffectPropColourManagementFull
.. doxygendefine:: kOfxImageEffectColourManagementFull

.. doxygendefine:: kOfxImageEffectPropColourManagementNone
.. doxygendefine:: kOfxImageEffectColourManagementNone

.. doxygendefine:: kOfxImageEffectPropColourManagementOCIO
.. doxygendefine:: kOfxImageEffectColourManagementOCIO

.. doxygendefine:: kOfxImageEffectPropColourManagementStyle

Expand Down
2 changes: 1 addition & 1 deletion Examples/ColourSpace/colourspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ getOutputColourspace( OfxImageEffectHandle effect, OfxPropertySetHandle /*inAr

OfxStatus status = kOfxStatReplyDefault;

if (gHostColourManagementStyle != kOfxImageEffectPropColourManagementNone) {
if (gHostColourManagementStyle != kOfxImageEffectColourManagementNone) {

// We could check kOfxImageClipPropPreferredColourspaces from inArgs here

Expand Down
18 changes: 7 additions & 11 deletions include/ofxColour.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ Hosts should set this property to the colourspace of the input clip. Typically
it will be set to the working colourspace of the host but could be any valid
colourspace.
Plug-ins may set this property on an output clip. Plug-ins which output motion
vectors or similar images which should not be colour managed should use
kOfxColourspaceRaw,
Both host and plug-in should use the value of
kOfxImageClipPropPreferredColourspace where reasonable.
Expand All @@ -131,11 +127,11 @@ be reported in this property. If an OCIO host has added the basic colourspaces
to its config as roles or aliases, they would be permitted here.
Cross-referencing between clips is possible by setting this property to
"OfxColourspace_<clip>". For example a plug-in may set this property on its
output clip to "OfxColourspace_Source", telling the host that the colourspace
of the output matches the "Source" input clip. In the basic style, plug-ins
are recommended to use cross-referencing for their output clip unless
kOfxColourspaceRaw is required.
"OfxColourspace_<clip>". For example a plug-in may set this property during
kOfxImageEffectActionGetOutputColourspace to "OfxColourspace_Source", telling
he host that the colourspace of the output matches the "Source" input clip.
In the basic style, plug-ins are recommended to use cross-referencing for
their output clip unless kOfxColourspaceRaw is required.
If a clip sets OfxImageClipPropIsMask or it only supports
OfxImageComponentAlpha, colour management is disabled and this property
Expand Down Expand Up @@ -253,10 +249,10 @@ If not defined, the default rules for choosing a view will be followed.
filter context, the host might request "OfxColourspace_Source".
@param handle handle to the instance, cast to an \ref OfxImageEffectHandle
@param inArgs has the property
@param inArgs a property set containing the property
- \ref kOfxImageClipPropPreferredColourspaces the host's list of preferred colourspaces
@param outArgs has the property
@param outArgs a property set containing the property
- \ref kOfxImageClipPropColourspace the colourspace selected by the plug-in,
which may be a cross-reference to an input clip.
Expand Down
Loading