Fix default fmt logic changing in latest openimageio release (#1725 )

Signed-off-by: Larry Gritz <lg@larrygritz.com>
docs: Move logos and add an icon-only logo (#1707 )
2023-09-05 18:38:05 -07:00 · 2023-08-20 17:46:23 -07:00 · 2023-08-20 17:41:26 -07:00 · 2023-07-01 17:49:33 -07:00
9 changed files with 19 additions and 12 deletions
@@ -1,15 +1,20 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->
 <!-- Copyright Contributors to the Open Shading Language Project. -->

+Release 1.12.14.0 -- 1 Aug? 2023 (compared to 1.12.13.0)
+--------------------------------------------------------
+
+
+
 Release 1.12.13.0 -- 1 July 2023 (compared to 1.12.12.0)
 --------------------------------------------------------
 - *fix*: Fix constant float values being converted to ints
  [#1674](https://github.com/OpenImageIO/oiio/pull/1674)  (by Declan Russell)
- *build* Fix builds when USE_PYTHON=OFF
+- *build*: Fix builds when USE_PYTHON=OFF
  [#1675](https://github.com/OpenImageIO/oiio/pull/1675)  (by Declan Russell)
- *build* Changes to support fmt 10.0
+- *build*: Changes to support fmt 10.0
  [#1691](https://github.com/OpenImageIO/oiio/pull/1691)
- *cleanup* Switch deprecated oiio simd names to modern
+- *cleanup*: Switch deprecated oiio simd names to modern
  [#1679](https://github.com/OpenImageIO/oiio/pull/1679)
 - *testing*: Avoid deprecated OSLQuery ctr in test example
  [#1699](https://github.com/OpenImageIO/oiio/pull/1699)
@@ -19,14 +24,14 @@ Release 1.12.13.0 -- 1 July 2023 (compared to 1.12.12.0)
  [#1696](https://github.com/OpenImageIO/oiio/pull/1696)
 - *ci*: Switch oiio obsolete branch names to immutable tags
  [#1701](https://github.com/OpenImageIO/oiio/pull/1701)
- *docs* Improve documentation of `trace` function
+- *docs*: Improve documentation of `trace` function
  [#1671](https://github.com/OpenImageIO/oiio/pull/1671)  (by AidanWelch)
- *docs* README.md: added filmography and Siggraph OSL course info.
+- *docs*: README.md: added filmography and Siggraph OSL course info.
  [#1692](https://github.com/OpenImageIO/oiio/pull/1692)
  [#1694](https://github.com/OpenImageIO/oiio/pull/1694) (by Mitch Prater)
- *docs* Amend the filmography
+- *docs*: Amend the filmography
  [#1695](https://github.com/OpenImageIO/oiio/pull/1695)
- *docs* Fix incorrect links in CONTRIBUTING
+- *docs*: Fix incorrect links in CONTRIBUTING
  [#1688](https://github.com/OpenImageIO/oiio/pull/1688)


@@ -4,7 +4,7 @@

 cmake_minimum_required (VERSION 3.12)

-set (OSL_VERSION "1.12.13.0")
+set (OSL_VERSION "1.12.14.0")
 set (OSL_VERSION_OVERRIDE "" CACHE STRING
     "Version override (use with caution)!")
 mark_as_advanced (OSL_VERSION_OVERRIDE)
@@ -1,7 +1,7 @@
 <div align="center">
-  <img src="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/main/src/doc/Figures/osl-short.png" width=256 height=128>
+  <img src="ASWF/logos/openshadinglanguage-stacked-Shaded.png">

-  <H1>Open Shading Language</H1>
+  <!-- <H1>Open Shading Language</H1> -->
 </div>

 [![Open Shading Language Reel 2020](http://img.youtube.com/vi/nmwMz1YnGPA/0.jpg)](https://www.youtube.com/watch?v=nmwMz1YnGPA "Open Shading Language Reel 2020")
@@ -73,7 +73,8 @@ __OSL_MASKED_OP1(naninf_check_offset,
                        "Detected {} value in {}{} at {}:{} (op {}) batch lane:{}",
                        vals[i * __OSL_WIDTH + lane],
                        d > 0 ? "the derivatives of " : "", USTR(symbolname),
-                        USTR(sourcefile), sourceline, USTR(opname), lane);
+                        USTR(sourcefile), sourceline, USTR(opname),
+                        lane.value());
                    // continue checking all data lanes, and all components
                    // for that matter, we want to find all issues, not just
                    // the 1st, right?
@@ -111,7 +112,8 @@ __OSL_MASKED_OP1(naninf_check_offset, Wi)(int mask_value, int ncomps,
                        "Detected {} value in {}{} at {}:{} (op {}) batch lane:{}",
                        vals[i * __OSL_WIDTH + lane],
                        d > 0 ? "the derivatives of " : "", USTR(symbolname),
-                        USTR(sourcefile), sourceline, USTR(opname), lane);
+                        USTR(sourcefile), sourceline, USTR(opname),
+                        lane.value());
                    // continue checking all data lanes, and all components
                    // for that matter, we want to find all issues, not just
                    // the 1st, right?
Author	SHA1	Message	Date
Larry Gritz	facfe0b74a	Fix default fmt logic changing in latest openimageio release (#1725 ) Signed-off-by: Larry Gritz <lg@larrygritz.com>	2023-09-05 18:38:05 -07:00
Larry Gritz	2cdd061a5f	docs: Move logos and add an icon-only logo (#1707 ) Move from cryptically named ASWF/images to more descriptive ASWF/logos. Add an icon only version of the logo. Signed-off-by: Larry Gritz <lg@larrygritz.com>	2023-08-20 17:46:23 -07:00
Larry Gritz	17e0449263	docs: Update logos (#1705 ) Signed-off-by: Larry Gritz <lg@larrygritz.com>	2023-08-20 17:41:26 -07:00
Larry Gritz	2d29966c48	Bump version after release Signed-off-by: Larry Gritz <lg@larrygritz.com>	2023-07-01 17:49:33 -07:00