Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
14 changes: 7 additions & 7 deletions Support/Library/ofxsImageEffect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ namespace OFX {
return v;
}

/** @brief get the RoD for this clip in the cannonical coordinate system */
/** @brief get the RoD for this clip in the canonical coordinate system */
OfxRectD Clip::getRegionOfDefinition(double t)
{
OfxRectD bounds;
Expand All @@ -1178,7 +1178,7 @@ namespace OFX {
return new Image(imageHandle);
}

/** @brief fetch an image, with a specific region in cannonical coordinates */
/** @brief fetch an image, with a specific region in canonical coordinates */
Image *Clip::fetchImage(double t, const OfxRectD &bounds)
{
OfxPropertySetHandle imageHandle;
Expand Down Expand Up @@ -1310,13 +1310,13 @@ namespace OFX {
return _effectProps.propGetInt(kOfxPropIsInteractive) != 0;
}

/** @brief set the instance to be sequentially renderred, this should have been part of clip preferences! */
/** @brief set the instance to be sequentially rendered, this should have been part of clip preferences! */
void ImageEffect::setSequentialRender(bool v)
{
_effectProps.propSetInt(kOfxImageEffectInstancePropSequentialRender, int(v));
}

/** @brief Have we informed the host we want to be seqentially renderred ? */
/** @brief Have we informed the host we want to be seqentially rendered ? */
bool ImageEffect::getSequentialRender(void) const
{
return _effectProps.propGetInt(kOfxImageEffectInstancePropSequentialRender) != 0;
Expand Down Expand Up @@ -1351,7 +1351,7 @@ namespace OFX {
}
#endif

/** @brief notify host that the internal data structures need syncing back to parameters for persistance and so on. This is reset by the host after calling SyncPrivateData. */
/** @brief notify host that the internal data structures need syncing back to parameters for persistence and so on. This is reset by the host after calling SyncPrivateData. */
void ImageEffect::setParamSetNeedsSyncing()
{
_effectProps.propSetInt(kOfxPropParamSetNeedsSyncing, 1, false); // introduced in OFX 1.2
Expand Down Expand Up @@ -1506,7 +1506,7 @@ namespace OFX {
// fa niente
}

/** @brief The sync private data action, called when the effect needs to sync any private data to persistant parameters */
/** @brief The sync private data action, called when the effect needs to sync any private data to persistent parameters */
void ImageEffect::syncPrivateData(void)
{
// fa niente
Expand Down Expand Up @@ -1747,7 +1747,7 @@ namespace OFX {
}
}

/** @brief Set whether the effect can be continously sampled. */
/** @brief Set whether the effect can be continuously sampled. */
void ClipPreferencesSetter::setOutputHasContinousSamples(bool v)
{
doneSomething_ = true;
Expand Down
6 changes: 3 additions & 3 deletions Support/Library/ofxsInteract.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace OFX {
throwSuiteStatusException(stat);
_interactProperties.propSetHandle(propHandle);

// set othe instance data on the property handle to point to this interact
// set other instance data on the property handle to point to this interact
_interactProperties.propSetPointer(kOfxPropInstanceData, (void *)this);

// get the effect handle from this handle
Expand All @@ -92,7 +92,7 @@ namespace OFX {
return _interactProperties.propGetInt(kOfxInteractPropHasAlpha) != 0;
}

/** @brief Returns the size of a real screen pixel under the interact's cannonical projection */
/** @brief Returns the size of a real screen pixel under the interact's canonical projection */
OfxPointD
Interact::getPixelScale(void) const
{
Expand Down Expand Up @@ -130,7 +130,7 @@ namespace OFX {
throwSuiteStatusException(stat);
}

/** @brief Swap a buffer in the case of a double bufferred interact, this is possibly a silly one */
/** @brief Swap a buffer in the case of a double buffered interact, this is possibly a silly one */
void
Interact::swapBuffers(void) const
{
Expand Down
2 changes: 1 addition & 1 deletion Support/Library/ofxsLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace OFX {
gLogFileName = value;
}

/** @brief Opens the log file, returns whether this was sucessful or not. */
/** @brief Opens the log file, returns whether this was successful or not. */
bool open(void)
{
#ifdef DEBUG
Expand Down
14 changes: 7 additions & 7 deletions Support/Library/ofxsParams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ namespace OFX {
, _paramType(type)
, _paramProps(props)
{
// validate the properities on this descriptor
// validate the properties on this descriptor
if(type != eDummyParam)
OFX::Validation::validateParameterProperties(type, props, true);
}
Expand Down Expand Up @@ -201,7 +201,7 @@ namespace OFX {
_paramProps.propSetInt(kOfxParamPropAnimates, v);
}

/** @brief set whether the param is persistant, defaults to true */
/** @brief set whether the param is persistent, defaults to true */
void ValueParamDescriptor::setIsPersistant(bool v)
{
_paramProps.propSetInt(kOfxParamPropPersistant, v);
Expand Down Expand Up @@ -1050,7 +1050,7 @@ namespace OFX {
}
}

/** @brief estabilishes the order of page params. Do it by calling it in turn for each page */
/** @brief establishes the order of page params. Do it by calling it in turn for each page */
void
ParamSetDescriptor::setPageParamOrder(PageParamDescriptor &p)
{
Expand Down Expand Up @@ -1391,21 +1391,21 @@ namespace OFX {
return _paramProps.propGetInt(kOfxParamPropIsAutoKeying) != 0;
}

/** @brief is the param persistant */
/** @brief is the param persistent */
bool
ValueParam::getIsPersistant(void) const
{
return _paramProps.propGetInt(kOfxParamPropPersistant) != 0;
}

/** @brief Get's whether the value of the param is significant (ie: affects the rendered image) */
/** @brief Gets whether the value of the param is significant (ie: affects the rendered image) */
bool
ValueParam::getEvaluateOnChange(void) const
{
return _paramProps.propGetInt(kOfxParamPropEvaluateOnChange) != 0;
}

/** @brief Get's whether the value of the param is significant (ie: affects the rendered image) */
/** @brief Gets whether the value of the param is significant (ie: affects the rendered image) */
CacheInvalidationEnum
ValueParam::getCacheInvalidation(void) const
{
Expand Down Expand Up @@ -2775,7 +2775,7 @@ namespace OFX {

@returns
- ::kOfxStatOK - all was fine
- ::kOfxStatErrBadHandle - if the paramter handle was invalid
- ::kOfxStatErrBadHandle - if the parameter handle was invalid
- ::kOfxStatErrUnknown - if the type is unknown

This modifies an existing control point. Note that by changing key, the order of the
Expand Down
4 changes: 2 additions & 2 deletions Support/Library/ofxsProperty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace OFX {
break;

case kOfxStatErrUnknown :
case kOfxStatErrUnsupported : // unsupported implies unknow here
case kOfxStatErrUnsupported : // unsupported implies unknown here
if(OFX::PropertySet::getThrowOnUnsupportedProperties()) // are we suppressing this?
throw OFX::Exception::PropertyUnknownToHost(propName.c_str());
break;
Expand Down Expand Up @@ -72,7 +72,7 @@ namespace OFX {
{
assert(_propHandle != 0);
OfxStatus stat = gPropSuite->propReset(_propHandle, property);
Log::error(stat != kOfxStatOK, "Failed on reseting property %s to its defaults, host returned status %s.", property, mapStatusToString(stat));
Log::error(stat != kOfxStatOK, "Failed on resetting property %s to its defaults, host returned status %s.", property, mapStatusToString(stat));
throwPropertyException(stat, property);

if(_gPropLogging > 0) Log::print("Reset property %s.", property);
Expand Down
2 changes: 1 addition & 1 deletion Support/Library/ofxsPropertyValidation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ namespace OFX {
PropertyDescription(kOfxImageEffectPropSupportedComponents, OFX::eString, -1, eDescFinished),
PropertyDescription(kOfxImageEffectPropSupportedContexts, OFX::eString, -1, eDescFinished),

// multi dimensional int properities
// multi dimensional int properties
PropertyDescription(kOfxParamHostPropPageRowColumnCount, OFX::eInt, 2, eDescFinished),
};

Expand Down
2 changes: 1 addition & 1 deletion Support/OSXStaticLoader/pluginLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ main(int argc, char *argv[])
int nP = nPluginsFunc();


printf("Sucessfully loaded '%s', containing %d %s\n", argv[1], nP, (nP == 1 ? "plugin" : "plugins"));
printf("Successfully loaded '%s', containing %d %s\n", argv[1], nP, (nP == 1 ? "plugin" : "plugins"));

for(int i = 0; i < nP; i++) {
// get a plugin
Expand Down
10 changes: 5 additions & 5 deletions Support/Plugins/Basic/basic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,15 @@ BasicPlugin:: isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &iden
return true;
}

// nope, idenity we is
// nope, identity we is
return false;
}

// set the enabledness of the individual component scales
void
BasicPlugin::setEnabledness(void)
{
// the componet enabledness depends on the clip being RGBA and the param being true
// the component enabledness depends on the clip being RGBA and the param being true
bool v = componentScalesEnabled_->getValue() && srcClip_->getPixelComponents() == OFX::ePixelComponentRGBA;

// enable them
Expand Down Expand Up @@ -502,11 +502,11 @@ bool BasicInteract::draw(const OFX::DrawArgs &args)
bool
BasicInteract::penMotion(const OFX::PenArgs &args)
{
// figure the size of the box in cannonical coords
// figure the size of the box in canonical coords
float dx = (float)(kBoxSize.x * args.pixelScale.x);
float dy = (float)(kBoxSize.y * args.pixelScale.y);

// pen position is in cannonical coords
// pen position is in canonical coords
OfxPointD penPos = args.penPosition;

switch(_state) {
Expand Down Expand Up @@ -564,7 +564,7 @@ BasicInteract::penDown(const OFX::PenArgs &args)
// move our position
_position = args.penPosition;

// and request a redraw just incase
// and request a redraw just in case
_effect->redrawOverlays();
}

Expand Down
6 changes: 3 additions & 3 deletions Support/Plugins/ChoiceParams/choiceparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -481,11 +481,11 @@ bool ChoiceParamsInteract::draw(const OFX::DrawArgs &args)
bool
ChoiceParamsInteract::penMotion(const OFX::PenArgs &args)
{
// figure the size of the box in cannonical coords
// figure the size of the box in canonical coords
float dx = (float)(kBoxSize.x * args.pixelScale.x);
float dy = (float)(kBoxSize.y * args.pixelScale.y);

// pen position is in cannonical coords
// pen position is in canonical coords
OfxPointD penPos = args.penPosition;

switch(_state) {
Expand Down Expand Up @@ -543,7 +543,7 @@ ChoiceParamsInteract::penDown(const OFX::PenArgs &args)
// move our position
_position = args.penPosition;

// and request a redraw just incase
// and request a redraw just in case
_effect->redrawOverlays();
}

Expand Down
4 changes: 2 additions & 2 deletions Support/Plugins/Retimer/retimer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ namespace OFX

void RetimerExamplePluginFactory::load()
{
// we can't be used on hosts that don't perfrom temporal clip access
// we can't be used on hosts that don't perform temporal clip access
if(!gHostDescription.temporalClipAccess) {
throw OFX::Exception::HostInadequate("Need random temporal image access to work");
}
Expand Down Expand Up @@ -331,7 +331,7 @@ void RetimerExamplePluginFactory::describeInContext(OFX::ImageEffectDescriptor &
dstClip->setFieldExtraction(eFieldExtractDoubled); // which is the default anyway
dstClip->setSupportsTiles(true);

// what param we have is dependant on the host
// what param we have is dependent on the host
if(context == OFX::eContextRetimer) {
// Define the mandated kOfxImageEffectRetimerParamName param, note that we don't do anything with this other than.
// describe it. It is not a true param but how the host indicates to the plug-in which frame
Expand Down
4 changes: 2 additions & 2 deletions Support/Plugins/Tester/Tester.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ bool PositionInteract::draw(const OFX::DrawArgs &args)
// overridden functions from OFX::Interact to do things
bool PositionInteract::penMotion(const OFX::PenArgs &args)
{
// figure the size of the box in cannonical coords
// figure the size of the box in canonical coords
float dx = (float)(kBoxSize.x / args.pixelScale.x);
float dy = (float)(kBoxSize.y / args.pixelScale.y);

OfxPointD pos = getCanonicalPosition(args.time);

// pen position is in cannonical coords
// pen position is in canonical coords
OfxPointD penPos = args.penPosition;

switch(_state)
Expand Down
2 changes: 1 addition & 1 deletion Support/Plugins/Transition/crossFade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ CrossFadePlugin::isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &i
return true;
}

// nope, identity we isnt
// nope, identity we isn't
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions Support/README
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Release Notes
Still to be done,
decent set of exceptions and exception specifiers on each function,
skin the parameter custom interact,
parameter integration and differentiation functions needed on 2D and 3D doubles and the colour classses,
parameter integration and differentiation functions needed on 2D and 3D doubles and the colour classes,
parameters should return their values in a struct, as well as by a reference arg (some do already),
write examples showing custom param and param animation,
write an example showing use of external resource files,
Expand All @@ -66,7 +66,7 @@ Release Notes

Implemented most of the basic classes, need to do more work on clip instances and image effect instances.
Library builds fine on OSX 10.3, not fully tested yet.
No where near finsihed yet,
No where near finished yet,
Need to finish off the actions.
Need to do a cleaner set of exception classes.
Need to test somewhat more (hey they do compile though!).
Expand Down
4 changes: 2 additions & 2 deletions Support/include/ofxsCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ namespace OFX {

/** @brief Enumerates the reasons a plug-in instance may have had one of its values changed */
enum InstanceChangeReason {
eChangeUserEdit, /**< @brief A user actively editted something in the plugin, eg: changed the value of an integer param on an interface */
eChangePluginEdit, /**< @brief The plugin's own code changed something in the instance, eg: a callback on on param settting the value of another */
eChangeUserEdit, /**< @brief A user actively edited something in the plugin, eg: changed the value of an integer param on an interface */
eChangePluginEdit, /**< @brief The plugin's own code changed something in the instance, eg: a callback on on param setting the value of another */
eChangeTime /**< @brief The current value of a parameter has changed because the param animates and the current time has changed */
};

Expand Down
Loading
Loading