Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 30 insertions, 12 deletions

diff --git a/sdk/extensions/serialization/source/NvBlastExtInputStream.cpp b/sdk/extensions/serialization/source/NvBlastExtInputStream.cpp
index 7ef9b62..805990d 100644
--- a/sdk/extensions/serialization/source/NvBlastExtInputStream.cpp
+++ b/sdk/extensions/serialization/source/NvBlastExtInputStream.cpp
@@ -1,17 +1,35 @@
-/*
-* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
-*
-* NVIDIA CORPORATION and its licensors retain all intellectual property
-* and proprietary rights in and to this software, related documentation
-* and any modifications thereto.  Any use, reproduction, disclosure or
-* distribution of this software and related documentation without an express
-* license agreement from NVIDIA CORPORATION is strictly prohibited.
-*/
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2017 NVIDIA Corporation. All rights reserved.
+
 
 #include "NvBlastExtInputStream.h"
 
 
-Nv::Blast::ExtInputStream::ExtInputStream(std::istream &inputStream):
+Nv::Blast::ExtInputStream::ExtInputStream(std::istream &inputStream) :
 	m_inputStream(inputStream)
 {
 
@@ -25,13 +43,13 @@ size_t Nv::Blast::ExtInputStream::tryRead(void* buffer, size_t /*minBytes*/, siz
 	if (m_inputStream.fail())
 	{
 		// Throw exception, log error
-//		NVBLASTEXT_LOG_ERROR("Failure when reading from stream");
+//		NVBLAST_LOG_ERROR("Failure when reading from stream");
 	}
 
 	// Since we're using a blocking read above, if we don't have maxBytes we're probably done
 	if ((size_t) m_inputStream.gcount() < maxBytes)
 	{
-//		NVBLASTEXT_LOG_ERROR("Failed to read requested number of bytes during blocking read.");
+//		NVBLAST_LOG_ERROR("Failed to read requested number of bytes during blocking read.");
 	}
 
 	return m_inputStream.gcount();