diff options
Diffstat (limited to 'LibOVR/Src/OVR_JSON.cpp')
| -rw-r--r-- | LibOVR/Src/OVR_JSON.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/LibOVR/Src/OVR_JSON.cpp b/LibOVR/Src/OVR_JSON.cpp index b7bb374..2c886bb 100644 --- a/LibOVR/Src/OVR_JSON.cpp +++ b/LibOVR/Src/OVR_JSON.cpp @@ -30,16 +30,16 @@ Notes : THE SOFTWARE. -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, @@ -337,9 +337,13 @@ const char* JSON::parseString(const char* str, const char** perror) switch (len) { case 4: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; + //no break, fall through case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; + //no break case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; + //no break case 1: *--ptr2 = (char)(uc | firstByteMark[len]); + //no break } ptr2+=len; break; |