From 76c602f5686af4d5e21c8791f16403b1a85bda88 Mon Sep 17 00:00:00 2001
From: Mathias Heyer <mheyer@nvidia.com>
Date: Tue, 7 Mar 2023 11:38:33 -0800
Subject: [PATCH] Bulk update nvpro-samples 03/07/23

---
 common/obj_loader.cpp             | 5 ++---
 ray_tracing_gltf/hello_vulkan.cpp | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/obj_loader.cpp b/common/obj_loader.cpp
index d0fe0e4..6d6e70b 100644
--- a/common/obj_loader.cpp
+++ b/common/obj_loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2021-2023, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,7 @@ void ObjLoader::loadModel(const std::string& filename)
   reader.ParseFromFile(filename);
   if(!reader.Valid())
   {
-    LOGE(reader.Error().c_str());
-    std::cerr << "Cannot load: " << filename << std::endl;
+    LOGE("Cannot load %s: %s", filename.c_str(), reader.Error().c_str());
     assert(reader.Valid());
   }
 
diff --git a/ray_tracing_gltf/hello_vulkan.cpp b/ray_tracing_gltf/hello_vulkan.cpp
index 81f1fd5..5107bc9 100644
--- a/ray_tracing_gltf/hello_vulkan.cpp
+++ b/ray_tracing_gltf/hello_vulkan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2021, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2023, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -196,8 +196,8 @@ void HelloVulkan::loadScene(const std::string& filename)
   {
     assert(!"Error while loading scene");
   }
-  LOGW(warn.c_str());
-  LOGE(error.c_str());
+  LOGW("%s", warn.c_str());
+  LOGE("%s", error.c_str());
 
 
   m_gltfScene.importMaterials(tmodel);