diff --git a/docs/dev/Build_Profiling.md b/docs/dev/Build_Profiling.md index ef4c96e0b1..7850921b0d 100644 --- a/docs/dev/Build_Profiling.md +++ b/docs/dev/Build_Profiling.md @@ -7,7 +7,7 @@ These are instructions for profiling the build process of OpenImageIO -- useful for figuring out where the build process is spending its time, and where it might be optimized. -## Profiling module compilating with clang -ftime-trace +## Profiling module compilation with clang -ftime-trace These instructions are based on the following references: diff --git a/docs/dev/CodeReview.md b/docs/dev/CodeReview.md index 1a82c1b9ea..35f2c0ca7b 100644 --- a/docs/dev/CodeReview.md +++ b/docs/dev/CodeReview.md @@ -1,3 +1,7 @@ + + + + Code Review Procedures ====================== @@ -131,7 +135,7 @@ stakeholders. These include: critical cases. - *Compatibility breaks*: changes that propose to break backward API compatibility with existing code or data files, or that change the required - toolchain or depeendencies needed to build the project. + toolchain or dependencies needed to build the project. - *Security*: Changes that could introduce security vulnerabilities, or that fix tricky security issues where the best fix is not obvious. diff --git a/docs/dev/RELEASING.md b/docs/dev/RELEASING.md index f2dc0715ee..b5977ac7d2 100644 --- a/docs/dev/RELEASING.md +++ b/docs/dev/RELEASING.md @@ -412,7 +412,7 @@ having CC prefixes in as many commit messages possible helps make the release notes process be simpler and more automated. We have been using the [git-cliff](https://github.com/orhun/git-cliff) tool -as the starting point for relese notes. The command we use is: +as the starting point for release notes. The command we use is: git cliff -c src/doc/cliff.toml -d v1.2.3.4..HEAD > cliff.out.md diff --git a/src/doc/oiiointro.rst b/src/doc/oiiointro.rst index 01ba7411f8..9b47320a7a 100644 --- a/src/doc/oiiointro.rst +++ b/src/doc/oiiointro.rst @@ -61,7 +61,7 @@ different formats, comparing image data between two images, and examining image metadata. All of this is released as "open source" software using the very permissive -"BSD 3-clause" license. So you should feel free to use any or all of +"Apache-2.0" license. So you should feel free to use any or all of OpenImageIO in your own software, whether it is private or public, open source or proprietary, free or commercial. You may also modify it on your own. You are encouraged to contribute to the continued development of diff --git a/src/include/OpenImageIO/strutil.h b/src/include/OpenImageIO/strutil.h index c107b683fd..07460b09e0 100644 --- a/src/include/OpenImageIO/strutil.h +++ b/src/include/OpenImageIO/strutil.h @@ -980,15 +980,15 @@ bool OIIO_UTIL_API parse_int (string_view &str, int &val, bool eat=true) noexcep bool OIIO_UTIL_API parse_float (string_view &str, float &val, bool eat=true) noexcept; /// Synonym for parse_int -inline bool parse_value(string_view &str, float &val, bool eat=true) noexcept +inline bool parse_value(string_view &str, int &val, bool eat=true) noexcept { - return parse_float(str, val, eat); + return parse_int(str, val, eat); } /// Synonym for parse_float -inline bool parse_value(string_view &str, int &val, bool eat=true) noexcept +inline bool parse_value(string_view &str, float &val, bool eat=true) noexcept { - return parse_int(str, val, eat); + return parse_float(str, val, eat); } /// Parse from `str`: a `prefix`, a series of int values separated by the