fix: fix warnings and deal with recent OIIO deprecations (#1844)

* fix: Handle OIIO deprecations
* int: Use ustring::strhash if it exists (not Strutil::strhash)
   If it exists, ustring::strhash has some planned special properties.
* Deal with OIIO deprecations

---------

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/include/OSL/hashes.h

@@ -40,7 +40,11 @@ constexpr inline size_t
 strhash(const char* s)
 {
     size_t len = pvt::pvtstrlen(s);
-    return OIIO::Strutil::strhash(OIIO::string_view(s, len));
+#ifdef OIIO_USTRING_SAFE_HASH
+    return ustring::strhash(string_view(s, len));
+#else
+    return OIIO::Strutil::strhash(string_view(s, len));
+#endif
 }
 
 // Template to ensure the hash is evaluated at compile time.

src/liboslexec/batched_llvm_gen.cpp

@@ -2929,7 +2929,8 @@ LLVMGEN(llvm_gen_filterwidth)
             }
 
             rop.ll.call_function(rop.build_name(func_spec),
-                                 { &args[0], argCount });
+                                 { &args[0],
+                                   cspan<llvm::Value*>::size_type(argCount) });
             // Don't have 2nd order derivs
             rop.llvm_zero_derivs(Result);
         }
@@ -6957,7 +6958,9 @@ LLVMGEN(llvm_gen_calculatenormal)
         args[arg_count++] = rop.ll.mask_as_int(rop.ll.current_mask());
         func_spec.mask();
     }
-    rop.ll.call_function(rop.build_name(func_spec), { &args[0], arg_count });
+    rop.ll.call_function(rop.build_name(func_spec),
+                         { &args[0],
+                           cspan<llvm::Value*>::size_type(arg_count) });
 
     if (Result.has_derivs())
         rop.llvm_zero_derivs(Result);

src/liboslexec/batched_llvm_instance.cpp

@@ -200,7 +200,7 @@ struct CStrHash {
     OSL_FORCEINLINE size_t operator()(const char* str) const
     {
         OSL_DASSERT(str != nullptr);
-        return OIIO::Strutil::strhash(str);
+        return OSL::strhash(str);
     }
 };
 

src/osltoy/osltoyapp.cpp

@@ -432,9 +432,8 @@ OSLToyMainWindow::OSLToyMainWindow(OSLToyRenderer* rend, int xr, int yr)
     QPixmap pixmap(xres, yres);
     OIIO::ImageBuf checks(
         OIIO::ImageSpec(xres, yres, 3, OIIO::TypeDesc::UINT8));
-    const float white[] = { 1, 1, 1 };
-    const float black[] = { 0, 0, 0 };
-    OIIO::ImageBufAlgo::checker(checks, 16, 16, 1, white, black);
+    OIIO::ImageBufAlgo::checker(checks, 16, 16, 1, 1.0f /* white */,
+                                0.0f /* black */);
     renderView->update(checks);
 
     textTabs = new QTabWidget;