Merge branch 'main' into remove-ofxa

Author: garyo

.github/workflows/build.yml

@@ -41,7 +41,8 @@ jobs:
             need_node20_vol: true
             has_cmake_presets: false
             buildtype: Release
-            conan_version: 2.1.0
+            # use old conan version for CentOS 7
+            conan_version: 2.10.3
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -58,7 +59,8 @@ jobs:
             need_node20_vol: true
             has_cmake_presets: false
             buildtype: Release
-            conan_version: 2.1.0
+            # use old conan version for CentOS 7
+            conan_version: 2.10.3
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -74,7 +76,7 @@ jobs:
             vfx-cy: 2023
             has_cmake_presets: false
             buildtype: Release
-            conan_version: 2.1.0
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -90,7 +92,7 @@ jobs:
             vfx-cy: 2023
             has_cmake_presets: false
             buildtype: Release
-            conan_version: 2.1.0
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -103,7 +105,7 @@ jobs:
             os: ubuntu-latest
             has_cmake_presets: true
             buildtype: Release
-            conan_version: 2.1.0
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -116,7 +118,7 @@ jobs:
             os: macos-latest
             has_cmake_presets: true
             buildtype: Release
-            conan_version: 2.1.0
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -129,7 +131,7 @@ jobs:
             os: windows-latest
             has_cmake_presets: true
             buildtype: Release
-            conan_version: 2.1.0
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang
@@ -142,7 +144,7 @@ jobs:
             os: windows-latest
             has_cmake_presets: true
             buildtype: Release
-            conan_version: 2.0.16
+            conan_version: 2.20.1
             cxx-standard: 17
             cxx-compiler: clang++
             cc-compiler: clang

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Committee provides general project oversight.
 There are several ways to connect with the OpenFX project:
 
 * The [openfx-discussion](https://lists.aswf.io/g/openfx-discussion)
-  mail list: This is our primary mailing list, intended for techical
+  mail list: This is our primary mailing list, intended for technical
   discussion and help implementing and using OpenFX.
 
 * [GitHub Issues](https://github.com/ofxa/openfx/issues): GitHub
@@ -273,9 +273,19 @@ All new source files should begin with a copyright and license stating:
 
     //
     // SPDX-License-Identifier: BSD-3-Clause
-    // Copyright (c) Contributors to the OpenFX Project.
+    // Copyright (c) OpenFX and contributors to the OpenFX Project.
     //
 
+Prior to becoming an ASWF project, OpenFX was controlled by The Open Effects
+Association, a legal entity which had been assigned copyright in the original
+contributions by a variety of companies and individuals. When the project
+transferred to ASWF, these copyrights were assigned to a new legal entity, 
+OpenFX a Series of LF Projects, LLC (abbreviated to "OpenFX" in the notice).
+In line with ASWF principles, new contributions do not require a copyright
+assignment, but our copyright notice reflects this mixed history, and is 
+applied consistently across the project to avoid confusion when code is moved
+between old and new files.
+
 #### Third-party libraries
 
 The standard itself should not depend on any third-party library or

Documentation/sourceforge/index.html

@@ -33,7 +33,7 @@ <h3>Programming Reference </h3>
 
 <h3>Doxygen Documentation </h3>
 <para>
-The doxygen documentation extracted from the header files is a useful adjunct to the programmming reference. It is available in two forms...
+The doxygen documentation extracted from the header files is a useful adjunct to the programming reference. It is available in two forms...
 <ul>
 <li><a href="Doxygen/index.html">A set of HTML files, one per section,</a></li>
 <li><a href="ofxDoxygenDocs_1.3.tgz">A tarball of the set of HTML files (229K).</a></li>

Documentation/sources/Guide/Code/Example1/basics.cpp

@@ -86,7 +86,7 @@ namespace {
   int  gNumInstancesLiving = 0;
 
   ////////////////////////////////////////////////////////////////////////////////
-  // The first _action_ called after the binary is loaded (three boot strapper functions will be howeever)
+  // The first _action_ called after the binary is loaded (three boot strapper functions will be however)
   OfxStatus LoadAction(void)
   {
     ERROR_ABORT_IF(gHost == NULL, "The OfxHost pointer has not been set, it should have been set in 'setHostFunc' before any action is called.");
@@ -152,7 +152,7 @@ namespace {
     char *context;
     gPropertySuite->propGetString(inArgs, kOfxImageEffectPropContext, 0, &context);
 
-    ERROR_IF(strcmp(context, kOfxImageEffectContextFilter) != 0, "DescribeInContextAction called on unsupported contex %s", context);
+    ERROR_IF(strcmp(context, kOfxImageEffectContextFilter) != 0, "DescribeInContextAction called on unsupported context %s", context);
 
     OfxPropertySetHandle props;
     // define the mandated single output clip
@@ -300,7 +300,7 @@ namespace {
 static OfxPlugin effectPluginStruct =
 {
   kOfxImageEffectPluginApi,                // The API this plugin satisfies.
-  1,                                       // The version of the API it satisifes.
+  1,                                       // The version of the API it satisfies.
   "org.openeffects:BasicsExamplePlugin",   // The unique ID of this plugin.
   1,                                       // The major version number of this plugin.
   0,                                       // The minor version number of this plugin.

Documentation/sources/Guide/Code/Example2/invert.cpp

@@ -73,7 +73,7 @@ namespace {
   OfxImageEffectSuiteV1 *gImageEffectSuite = 0;
 
   ////////////////////////////////////////////////////////////////////////////////
-  // The first _action_ called after the binary is loaded (three boot strapper functions will be howeever)
+  // The first _action_ called after the binary is loaded (three boot strapper functions will be however)
   OfxStatus LoadAction(void)
   {
     /// now fetch a suite out of the host via it's fetch suite function.
@@ -426,7 +426,7 @@ namespace {
 static OfxPlugin effectPluginStruct =
 {
   kOfxImageEffectPluginApi,                // The API this plugin satisfies.
-  1,                                       // The version of the API it satisifes.
+  1,                                       // The version of the API it satisfies.
   "org.openeffects:InvertExamplePlugin",   // The unique ID of this plugin.
   1,                                       // The major version number of this plugin.
   0,                                       // The minor version number of this plugin.

Documentation/sources/Guide/Code/Example3/gain.cpp

@@ -131,7 +131,7 @@ namespace {
   }
 
   ////////////////////////////////////////////////////////////////////////////////
-  // The first _action_ called after the binary is loaded (three boot strapper functions will be howeever)
+  // The first _action_ called after the binary is loaded (three boot strapper functions will be however)
   OfxStatus LoadAction(void)
   {
     // fetch our three suites
@@ -648,7 +648,7 @@ namespace {
 static OfxPlugin effectPluginStruct =
 {
   kOfxImageEffectPluginApi,                // The API this plugin satisfies.
-  1,                                       // The version of the API it satisifes.
+  1,                                       // The version of the API it satisfies.
   "org.openeffects:GainExamplePlugin",     // The unique ID of this plugin.
   1,                                       // The major version number of this plugin.
   0,                                       // The minor version number of this plugin.

Documentation/sources/Guide/Code/Example4/saturation.cpp

@@ -287,7 +287,7 @@ namespace {
   }
 
   ////////////////////////////////////////////////////////////////////////////////
-  // The first _action_ called after the binary is loaded (three boot strapper functions will be howeever)
+  // The first _action_ called after the binary is loaded (three boot strapper functions will be however)
   OfxStatus LoadAction(void)
   {
     // fetch our three suites
@@ -779,7 +779,7 @@ namespace {
 static OfxPlugin effectPluginStruct =
 {
   kOfxImageEffectPluginApi,                  // The API this plugin satisfies.
-  1,                                         // The version of the API it satisifes.
+  1,                                         // The version of the API it satisfies.
   "org.openeffects:SaturationExamplePlugin", // The unique ID of this plugin.
   1,                                         // The major version number of this plugin.
   0,                                         // The minor version number of this plugin.

Documentation/sources/Guide/Code/Example5/circle.cpp

@@ -318,7 +318,7 @@ namespace {
   }
 
   ////////////////////////////////////////////////////////////////////////////////
-  // The first _action_ called after the binary is loaded (three boot strapper functions will be howeever)
+  // The first _action_ called after the binary is loaded (three boot strapper functions will be however)
   OfxStatus LoadAction(void)
   {
     // fetch our three suites
@@ -978,7 +978,7 @@ namespace {
 static OfxPlugin effectPluginStruct =
 {
   kOfxImageEffectPluginApi,                  // The API this plugin satisfies.
-  1,                                         // The version of the API it satisifes.
+  1,                                         // The version of the API it satisfies.
   "org.openeffects:CircleExamplePlugin",     // The unique ID of this plugin.
   1,                                         // The major version number of this plugin.
   0,                                         // The minor version number of this plugin.

Documentation/sources/Guide/ofxExample1_Basics.rst

@@ -550,7 +550,7 @@ in context action…
         char *context;
         gPropertySuite->propGetString(inArgs, kOfxImageEffectPropContext, 0, &context);
 
-        ERROR_IF(strcmp(context, kOfxImageEffectContextFilter) != 0, "DescribeInContextAction called on unsupported contex %s", context);
+        ERROR_IF(strcmp(context, kOfxImageEffectContextFilter) != 0, "DescribeInContextAction called on unsupported context %s", context);
 
         OfxPropertySetHandle props;
         // define the mandated single output clip
@@ -737,7 +737,7 @@ should clearly specify the calling sequence. Failure to call them in the
 right sequence will lead to all sorts of undefined behaviour.
 
 Assuming the host has done nothing apart from load the dynamic library
-that contains plugins and has found the two :ref:`boostrapping
+that contains plugins and has found the two :ref:`bootstrapping
 symbols <bootstrapperFunctions>` in the plugin, the host
 should then...
 

Documentation/sources/Guide/ofxExample4_Saturation.rst

@@ -6,7 +6,7 @@ be used in more than one context, as well as how to make a multi-input
 effect. Its source can be found in the C++ file
 `saturation.cpp <https://github.com/ofxa/openfx/blob/master/Guide/Code/Example4/saturation.cpp>`_.
 This plugin takes an RGB or RGBA
-image and increases or descreases the saturation by a parameter. It can
+image and increases or decreases the saturation by a parameter. It can
 be used in two contexts, firstly as a simple filter, secondly as a
 general effect, where it has an optional second input clip which is used
 to control where the effect is applied.
@@ -158,7 +158,7 @@ space.
 
 Here we have the describe in context action. This will now be called
 once for each context that a host application wants to support. You know
-which contex you are being described in by the
+which context you are being described in by the
 :c:macro:`kOfxImageEffectPropContext` property on inArgs.
 
 Regardless of the context, it describes two clips, "Source" and