Skip to content

Commit c5b2afa

Browse files
committed
Fix typos in comments (#1243)
Ran a spell checker on our comments. So many fixes. Signed-off-by: Larry Gritz <[email protected]>
1 parent 991c224 commit c5b2afa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+138
-138
lines changed

ASWF/project_intake.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ This is a checklist for TSC's to review as part of the intake process. The TSC s
44

55
- Existing Project Governance
66
- [X] Project License exists ( [LICENSE.md](../LICENSE.md) ) and is OSI-approved
7-
- [X] Any third-party components/dependencies included are listed along with thier licenses ( [THIRD_PARTY.md](../THIRD_PARTY.md) )
8-
- [X] Governamce defined, outlining community roles and how decsions are made ( [GOVERNANCE.md](../GOVERNANCE.md] )
7+
- [X] Any third-party components/dependencies included are listed along with their licenses ( [THIRD_PARTY.md](../THIRD_PARTY.md) )
8+
- [X] Governance defined, outlining community roles and how decsions are made ( [GOVERNANCE.md](../GOVERNANCE.md] )
99
- Closed by https://github.com/imageworks/OpenShadingLanguage/pull/1137
1010
- [X] Contribution Policy defined ( [CONTRIBUTING.md](../CONTRIBUTING.md) )
1111
- Closed by https://github.com/imageworks/OpenShadingLanguage/pull/1137
1212
- [X] Code of Conduct defined ( existing or pull from [ASWF Sample Project](https://github.com/AcademySoftwareFoundation/aswf-sample-project/blob/master/CODE_OF_CONDUCT.md) )
1313
- Closed by https://github.com/imageworks/OpenShadingLanguage/pull/1137
1414
- [ ] Release methodology defined ( [release.md](process/release.md) )
15-
- New Project Goverance
15+
- New Project Governance
1616
- [X] TSC members identified
1717
- [X] First TSC meeting held
1818
- [X] TSC meeting cadence set and added to project calendar
@@ -38,7 +38,7 @@ This is a checklist for TSC's to review as part of the intake process. The TSC s
3838
- [X] Logo(s) ( https://github.com/AcademySoftwareFoundation/artwork/blob/master/examples/incubating.md#open-shading-language-logos )
3939
- [ ] Trademarks/mark ownership rights ( John to follow up with Larry on this )
4040
- Outreach
41-
- [X] New project annoucement done ( https://www.aswf.io/osl-joins-aswf/ )
41+
- [X] New project announcement done ( https://www.aswf.io/osl-joins-aswf/ )
4242
- [X] Project added to ASWF website and ASWF landscape
4343
- Graduation
4444
- [ ] CII Badge achieved

CHANGES.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ API changes, new options, new ShadingSystem features (for renderer writers):
146146
system attribute) now defaults to 1, not 0. That should be the best
147147
performance while still having reasonable JIT times. #1114 (1.11.4)
148148
* We no longer automatically build the MaterialX shaders (you need to set
149-
build option OSL_BUILD_MATRIALX to ON). This will eventually be deprecated
149+
build option OSL_BUILD_MATERIALX to ON). This will eventually be deprecated
150150
entirely. #1136 (1.11.5)
151151
* Helper varieties of ShadingSystem::Parameter() and ReParameter() that
152152
handle the common cases of a single float, int, or string. #1195 #1196
@@ -186,7 +186,7 @@ Performance improvements:
186186
* Range checking of matrix component access is skipped for certain cases
187187
where it was unnecessary. #1174 (1.11.6)
188188
* LLVM JIT+optimize time has been sped up around 10% by doing a better job
189-
of pruning unused functions and symbols in the generated modul. #1172
189+
of pruning unused functions and symbols in the generated module. #1172
190190
(1.11.6)
191191
* `ShadingSystem::symbol_address()` no longer checks for the symbol to be
192192
NULL (though it will assert on a debug build). #1237 (1.11.7.1)
@@ -232,13 +232,13 @@ Bug fixes and other improvements (internals):
232232
Internals/developer concerns:
233233
* Switch much of the internals where we do string formatting using printf-like
234234
conventions to errorf(), etc., naming convention, reserving the non-f
235-
names for future use with C++20 std::format/python convenetions. #1076
235+
names for future use with C++20 std::format/python conventions. #1076
236236
(1.11.3)
237237
* Remove pointless assertions from the TypeSpec class. #1079
238238
* Assertion overhaul: use OSL_ASSERT/OSL_DASSERT instead of borrowing from
239239
OIIO's dassert.h. Note that OSL_ASSERT always tests, prints error if the
240240
test fails, but then only aborts for debug builds (no abort for release
241-
builds). In ocntrast, OSL_DASSERT does all for debug builds, and none
241+
builds). In contrast, OSL_DASSERT does all for debug builds, and none
242242
(not even the test) for release builds. #1080 #1087 (1.11.3)
243243
* Refactor the implementation of the `Dual` template to support more
244244
efficient code generation when used in vectorized loops (this will be
@@ -282,7 +282,7 @@ Build & test system improvements:
282282
- The ENABLERTTI build option has been renamed `ENABLE_RTTI`.
283283
- Config based install and usage.
284284
* testshade:
285-
- Make sure that no unreported errors accumulted in the texture system
285+
- Make sure that no unreported errors accumulated in the texture system
286286
or image cache. #939 (1.11.0)
287287
- Check that no leftover errors are in the TextureSystem or ImageCache
288288
at the end of the test (that would indicate that someplace in OSL we
@@ -330,7 +330,7 @@ Build & test system improvements:
330330
#956 (1.10.0)
331331
* When OptiX mode is enabled (USE_OPTIX=1), the testsuite will some tests in
332332
an additional time forcing OptiX mode: any test containing a file named
333-
`OPTIX` in its test directory; or all tests if enviroment variable
333+
`OPTIX` in its test directory; or all tests if environment variable
334334
`TESTSUITE_OPTIX=1` (except tests that contain a file named `NOOPTIX` in
335335
their directory. #1004 (1.10.0)
336336
* Allow OSL to build with `USE_LLVM_BITCODE` enabled on Windows. #998 (1.10.0)
@@ -351,7 +351,7 @@ Build & test system improvements:
351351
* oslconfig.h is now generated by a cmake configure_file step, from
352352
oslconfig.h.in. #1141 (1.11.5)
353353
* Use ASWF docker images to speed up many of the CI matrix entries, as well
354-
as to excactly test several VFX Platform specs. #1169 (1.11.6)
354+
as to exactly test several VFX Platform specs. #1169 (1.11.6)
355355
* Fix typo that botched the version in the .pc pkgconfig file. #1168 (1.11.6)
356356
* CI test against gcc9 and gcc10. #1192 (1.11.6)
357357
* Propagate RTTI compile options to exported cmake config. #1194 (1.11.6)
@@ -621,7 +621,7 @@ Shaders:
621621
* mandelbrot.osl: computes Mandelbrot and Julia images. #827 (1.10.0)
622622
* MaterialX support:
623623
* Improved support for MaterialX 1.36: add sin, cos, tan, atan2, ceil,
624-
sqrt, exp, determinent, ln, transpose, sign, rotate, transforms,
624+
sqrt, exp, determinant, ln, transpose, sign, rotate, transforms,
625625
rgb/hsv convert, extract, separate, tiledimage. Rename exponent ->
626626
power, pack -> combine, hsvadjust -> hueshift. Add some color2/4
627627
mutual conversion operators. Fixes to ramp4, clean up texture mapping
@@ -679,7 +679,7 @@ API changes, new options, new ShadingSystem features (for renderer writers):
679679
Bug fixes and other improvements (internals):
680680
* The context's `texture_thread_info` is now properly passed to the
681681
RenderServices callbacks instead of passing NULL. (1.10.0)
682-
* Symbols are enbled in the JIT, allowing Intel Vtune profiler to correctly
682+
* Symbols are enabled in the JIT, allowing Intel Vtune profiler to correctly
683683
report which JITed OSL code is being executed. #830 (1.10.0)
684684
* ASTNode and OSLCompilerImpl -- add info() and message() methods to
685685
complement the existing error and warning. #854 (1.10.0)
@@ -760,7 +760,7 @@ Release 1.9.10 -- 1 Sep 2018 (compared to 1.9.9)
760760
* Add more functions to color2.h, color4.h, vector2.h, vector4.h: ceil,
761761
sqrt, exp, log2, log, sign, sin, cos, tan, asin, acos, atan2. #903, #904
762762
* Improved support for MaterialX 1.36: add sin, cos, tan, atan2, ceil, sqrt,
763-
exp, determinent, ln, transpose, sign, rotate, transforms, rgb/hsv convert,
763+
exp, determinant, ln, transpose, sign, rotate, transforms, rgb/hsv convert,
764764
extract, separate, tiledimage. Rename exponent -> power, pack -> combine,
765765
hsvadjust -> hueshift. Add some color2/4 mutual conversion operators.
766766
Fixes to ramp4, clean up texture mapping nodes, fixes to triplanarprojection
@@ -845,7 +845,7 @@ Standard library additions/changes:
845845
* `smoothstep()` has been extended to `T smoothstep(T edge0, T edge1, T x)`
846846
for T of any the `triple` types (previously, `smoothstep` only came in
847847
the `float` variety). #765 (1.9.0/1.8.10)
848-
* `mix()` has been extenended to support
848+
* `mix()` has been extended to support
849849
`color closure mix (color closure A, color closure B, color x)`
850850
#766 (1.9.0/1.8.10)
851851
* `hashnoise()` is like cellnoise (1D, 2D, 3D, or 4D input, 1D or 4D output
@@ -1042,7 +1042,7 @@ Developer goodies:
10421042
This lets you use the `Dual` templates for automatic differentiation of
10431043
of ordinary 1D functions (e.g., `Dual<float,1>`) or 3D volumetric
10441044
computations (e.g., `Dual<float,3>`). Most of OSL internals use automatic
1045-
differentiation on 2 dimenstions (`Dual<float,2>` a.k.a. `Dual2<float>`),
1045+
differentiation on 2 dimensions (`Dual<float,2>` a.k.a. `Dual2<float>`),
10461046
but this change makes `dual.h` a lot more useful outside of OSL.
10471047
#803 (1.9.1)
10481048

@@ -1182,7 +1182,7 @@ Language features:
11821182
nested `{ {...}, {...} }`. #640 (1.8.0)
11831183
* oslc (and liboslcomp) now supports UTF-8 filenames, including on
11841184
Windows. #643 (1.8.0)
1185-
* osl now accepts hexidecimal integer constants (such as `0x01ff`).
1185+
* osl now accepts hexadecimal integer constants (such as `0x01ff`).
11861186
#653 (1.8.1)
11871187

11881188
Standard library additions/changes:
@@ -1198,7 +1198,7 @@ Standard library additions/changes:
11981198
message passed to the renderer (leaving error handling and reporting
11991199
entirely up to the shader). #686 (1.8.2)
12001200
* `select(a,b,cond)` is similar to `mix`, but without interpolation --
1201-
if cond is 0, returns a, else return b (per comonent). #696 (1.8.3)
1201+
if cond is 0, returns a, else return b (per component). #696 (1.8.3)
12021202

12031203
API changes, new options, new ShadingSystem features (for renderer writers):
12041204
* ShadingSystem API changes:
@@ -1228,7 +1228,7 @@ API changes, new options, new ShadingSystem features (for renderer writers):
12281228
* When the attribute "profile" is set, the statistics report will
12291229
include a count of the total number of noise calls. #642 (1.8.0)
12301230
* ShadingSystem and shader group attribute "exec_repeat" (int; default is
1231-
1) can artifically manipulate how many times the shader is executed.
1231+
1) can artificially manipulate how many times the shader is executed.
12321232
This can sometimes be handy for tricky benchmarks. #659 (1.8.2)
12331233
* Attribute "force_derivs" can force derivatives to be computed
12341234
everywhere. (Mostly good for debugging or benchmarking derivatives,
@@ -1241,7 +1241,7 @@ Performance improvements:
12411241
output parameters and what optimizations can be done based on that. #657
12421242
(1.8.1)
12431243
* Better runtime optimization of certain matrix constructors. #676 (1.8.2)
1244-
* Improved alias analyis for parameters with simple initialization ops.
1244+
* Improved alias analysis for parameters with simple initialization ops.
12451245
#679 (1.8.2)
12461246
* Runtime optimizer now constant-folds bitwise `&`, `|`, `^`, `~`
12471247
operators. #682 (1.8.2)
@@ -1362,7 +1362,7 @@ Release 1.7.2 -- 1 Mar 2016 (compared to 1.7.1)
13621362

13631363
Release 1.7 [1.7.1] -- 29 Jan 2016 (compared to 1.6)
13641364
--------------------------------------------------
1365-
Language, standard libary, and compiler changes (for shader writers):
1365+
Language, standard library, and compiler changes (for shader writers):
13661366
* Language features:
13671367
* Support for closure arrays in shader inputs. #544 (1.7.0)
13681368
* Disallow quote strings from spanning lines (just like you can't in
@@ -1373,7 +1373,7 @@ Language, standard libary, and compiler changes (for shader writers):
13731373
* isconstant(expr) returns 1 if the expression can be turned into
13741374
a constant at runtime (with full knowledge of the shader group's
13751375
parameter values and connections). This is helpful mostly for advanced
1376-
shader writers to verify their assuptions about which expressions can
1376+
shader writers to verify their assumptions about which expressions can
13771377
end up being fully constant-folded by the runtime optimizer. #578 (1.7.1)
13781378
* New behavior of isconnected(parmaname): return 1 if the parameter
13791379
is connected to an upstream layer, 2 if connected to a downstream layer,
@@ -1407,7 +1407,7 @@ API changes, new options, new ShadingSystem features (for renderer writers):
14071407
users). (1.7.0)
14081408
* "opt_passes" controls the number of optimization passes over each
14091409
instance (default: 10). This is mainly for developer debugging, you
1410-
should not need to change or expost this. #576 (1.7.1)
1410+
should not need to change or expose this. #576 (1.7.1)
14111411
* "connection_error" controls whether a bad connection is considered
14121412
a true error (or is just ignored). #583 (1.7.1)
14131413
* Shader group attribute additions/changes:
@@ -1505,7 +1505,7 @@ Documentation:
15051505

15061506
Release 1.6 -- 26 May 2015 (compared to 1.5)
15071507
-----------------------------------------------
1508-
Language, standard libary, and compiler changes (for shader writers):
1508+
Language, standard library, and compiler changes (for shader writers):
15091509
* It is now supported to have shader parameters that are arrays of
15101510
unspecified length (like 'float foo[] = {...}'). Their length will be
15111511
fixed when they are assigned an instance value of fixed length, or when
@@ -1646,11 +1646,11 @@ Bug fixes and other improvements:
16461646
* Improved detection of shader groups that optimize away to nothing. (1.6.2)
16471647
* Fix of possible (but never reported) bug with instancing merging.
16481648
#431 (1.6.2)
1649-
* Fix incorrect oslc code generation when assigining an element of an
1649+
* Fix incorrect oslc code generation when assigning an element of an
16501650
array-of-structs to another element of array-of-structs. #432 (1.6.2)
16511651
* Bug fix in code generation of constant folding of getmatrix() calls
16521652
(never reported symptomatic). #440 (1.6.2)
1653-
* Fixes to constuction of temporary filename used for group serialization
1653+
* Fixes to construction of temporary filename used for group serialization
16541654
archive. (1.6.2)
16551655
* Internals fix: logb() incorrectly declaring derivative functions (it
16561656
has no derivs). #437 (1.5.12/1.6.2)
@@ -1666,7 +1666,7 @@ Bug fixes and other improvements:
16661666
* Bug fix: runtime optimizer should not consider a layer unused if its
16671667
outputs are renderer outputs. Also fix subtle bug in detecting whether
16681668
an output param is a renderer output. #457 (1.6.2)
1669-
* Clear derivatives properly in the implementaiton of gettextureinfo.
1669+
* Clear derivatives properly in the implementation of gettextureinfo.
16701670
#463 (1.6.2)
16711671
* Correct handling of point-like shader parameters defined with default
16721672
values that use the constructors that provide "space" names. #465 (1.6.2)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ Namespaces: yes, use them!
309309
Prefer C++11 `std` rather than Boost or other third party libraries, where
310310
both can do the same task.
311311

312-
If you see a third party libary already used as a dependency (such as OIIO,
312+
If you see a third party library already used as a dependency (such as OIIO,
313313
Boost, Ilmbase, or LLVM), feel free to any of its public features in OSL
314314
internals (provided those features are present in the minimum version of
315315
that library that we support).

GOVERNANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ represents the project at all ASWF TAC meetings.
128128
(Proposed list, subject to revision, some are placeholders while their
129129
organizations decide who should be the permanent representative)
130130

131-
* **Chair and TAC repreentative**: Chris Kulla - Sony Pictures Imageworks
131+
* **Chair and TAC representative**: Chris Kulla - Sony Pictures Imageworks
132132
* **Chief Architect**: Larry Gritz, Sony Pictures Imageworks
133133

134134
* Luke Emrose - Animal Logic

LICENSE-THIRD-PARTY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In no particular order:
1212
BSD 3-Clause License
1313
SPDX-License-Identifier: BSD-3-Clause
1414

15-
* OpenImgageIO Copyright (c) Larry Gritz, et al.
15+
* OpenImageIO Copyright (c) Larry Gritz, et al.
1616
https://github.com/OpenImageIO/oiio
1717

1818
Many bits of code flow back and forth between OIIO and OSL, especially

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Simple "how do I...", "I'm having trouble", or "is this a bug" questions are
386386
best asked on the [osl-dev developer mail
387387
list](https://lists.aswf.io/g/osl-dev).
388388
That's where the most people will see it and potentially be able to answer
389-
your question quickly (moreso than a GH "issue").
389+
your question quickly (more so than a GH "issue").
390390

391391
Bugs, build problems, and discovered vulnerabilities that you are relatively
392392
certain is a legit problem in the code, and for which you can give clear

src/cmake/check_is_enabled.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Is the named package "enabled" via our disabling convention? If either
66
# USE_pkgname (or the all-uppercase USE_PKGNAME, or ENABLE_pkgname, or
77
# ENABLE_PKGNAME) exists as either a CMake or environment variable, is
8-
# nonempty by contains a non-true/nonnzero value, store false in the
8+
# nonempty by contains a non-true/nonzero value, store false in the
99
# variable named by <enablevar>, otherwise store true.
1010
function (check_is_enabled pkgname enablevar)
1111
string (TOUPPER ${pkgname} pkgname_upper)

src/cmake/compiler.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ if (${CXX_VISIBILITY_PRESET} STREQUAL "hidden" AND
116116
(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU"))
117117
# Linux/FreeBSD/Hurd: also hide all the symbols of dependent libraries
118118
# to prevent clashes if an app using this project is linked against
119-
# other verions of our dependencies.
119+
# other versions of our dependencies.
120120
set (VISIBILITY_MAP_COMMAND "-Wl,--version-script=${VISIBILITY_MAP_FILE}")
121121
endif ()
122122

@@ -202,9 +202,9 @@ endif ()
202202
# Use ccache if found
203203
#
204204
# This can really speed up compilation by caching object files that have
205-
# been compiled previously with idential arguments and inputs. Putting this
205+
# been compiled previously with identical arguments and inputs. Putting this
206206
# logic here makes it work even if the user is unaware of ccache. If it's
207-
# not found on the system, it will simply be silnetly not used.
207+
# not found on the system, it will simply be silently not used.
208208
option (USE_CCACHE "Use ccache if found" ON)
209209
find_program (CCACHE_FOUND ccache)
210210
if (CCACHE_FOUND AND USE_CCACHE)
@@ -249,8 +249,8 @@ endif ()
249249
###########################################################################
250250
# SIMD and machine architecture options.
251251
#
252-
# The USE_SIMD optinon may be set to a comma-separated list of machine /
253-
# instruction set optinos, such as "avx3,f16c". The list will be parsed and
252+
# The USE_SIMD option may be set to a comma-separated list of machine /
253+
# instruction set options, such as "avx3,f16c". The list will be parsed and
254254
# the proper compiler directives added to generate code for those ISA
255255
# capabilities.
256256
#

src/cmake/externalpackages.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ set (OPTIONAL_DEPS "" CACHE STRING
5353
# following extra features:
5454
# * If either `USE_pkgname` or the all-uppercase `USE_PKGNAME` (or
5555
# `ENABLE_pkgname` or `ENABLE_PKGNAME`) exists as either a CMake or
56-
# environment variable, is nonempty by contains a non-true/nonnzero
56+
# environment variable, is nonempty by contains a non-true/nonzero
5757
# value, do not search for or use the package. The optional ENABLE <var>
5858
# arguments allow you to override the name of the enabling variable. In
5959
# other words, support for the dependency is presumed to be ON, unless
@@ -289,7 +289,7 @@ if (USE_CUDA OR USE_OPTIX)
289289

290290
STRING (FIND ${LLVM_TARGETS} "NVPTX" nvptx_index)
291291
if (NOT ${nvptx_index} GREATER -1)
292-
message (FATAL_ERROR "NVTPX target is not available in the provided LLVM build")
292+
message (FATAL_ERROR "NVPTX target is not available in the provided LLVM build")
293293
endif()
294294

295295
if (${CUDA_VERSION} VERSION_GREATER 8 AND ${LLVM_VERSION} VERSION_LESS 6)

src/cmake/fancy_add_executable.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
# Macro to add an executable build target. The executable name can be
66
# specified with NAME, otherwise is inferred from the subdirectory name. The
7-
# source files of the binary can be specifeied with SRC, otherwise are
7+
# source files of the binary can be specified with SRC, otherwise are
88
# inferred to be all the .cpp files within the subdirectory. Optional
9-
# compile DEFINITIONS, private INCLUDE_DIRS, and priviate LINK_LIBRARIES may
9+
# compile DEFINITIONS, private INCLUDE_DIRS, and private LINK_LIBRARIES may
1010
# also be specified.
1111
#
1212
# The executable may be disabled individually using any of the usual

0 commit comments

Comments
 (0)