aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-21 21:19:34 +0100
committerSven Gothel <[email protected]>2015-03-21 21:19:34 +0100
commite490c3c7f7bb5461cfa78a214827aa534fb43a3e (patch)
treeb86b0291ef529ec6b75cc548d73599fa9c283cd6 /LibOVR/Src/Kernel/OVR_String_PathUtil.cpp
parent05bb4364bfd9930fb1902efec86446ef035ee07a (diff)
Bump OculusVR RIFT SDK to 0.4.4
Diffstat (limited to 'LibOVR/Src/Kernel/OVR_String_PathUtil.cpp')
-rw-r--r--LibOVR/Src/Kernel/OVR_String_PathUtil.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp b/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp
index 02abe15..95f3de9 100644
--- a/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp
+++ b/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp
@@ -5,16 +5,16 @@ Content : String filename/url helper function
Created : September 19, 2012
Notes :
-Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright : Copyright 2014 Oculus VR, LLC All Rights reserved.
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License");
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License");
you may not use the Oculus VR Rift SDK except in compliance with the License,
which is provided at the time of installation or download, or which
otherwise accompanies this software in either electronic or hard copy form.
You may obtain a copy of the License at
-http://www.oculusvr.com/licenses/LICENSE-3.1
+http://www.oculusvr.com/licenses/LICENSE-3.2
Unless required by applicable law or agreed to in writing, the Oculus VR SDK
distributed under the License is distributed on an "AS IS" BASIS,
@@ -39,7 +39,7 @@ void ScanFilePath(const char* url, const char** pfilename, const char** pext)
const char *filename = 0;
const char *lastDot = 0;
- UInt32 charVal = UTF8Util::DecodeNextChar(&url);
+ uint32_t charVal = UTF8Util::DecodeNextChar(&url);
while (charVal != 0)
{
@@ -76,8 +76,8 @@ void ScanFilePath(const char* url, const char** pfilename, const char** pext)
// - protocol: 'file://', 'http://'
const char* ScanPathProtocol(const char* url)
{
- UInt32 charVal = UTF8Util::DecodeNextChar(&url);
- UInt32 charVal2;
+ uint32_t charVal = UTF8Util::DecodeNextChar(&url);
+ uint32_t charVal2;
while (charVal != 0)
{
@@ -118,7 +118,7 @@ bool String::HasAbsolutePath(const char* url)
if (!url || !*url)
return true; // Treat empty strings as absolute.
- UInt32 charVal = UTF8Util::DecodeNextChar(&url);
+ uint32_t charVal = UTF8Util::DecodeNextChar(&url);
// Fist character of '/' or '\\' means absolute url.
if ((charVal == '/') || (charVal == '\\'))