aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/Displays/OVR_OSX_Display.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'LibOVR/Src/Displays/OVR_OSX_Display.cpp')
-rw-r--r--LibOVR/Src/Displays/OVR_OSX_Display.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/LibOVR/Src/Displays/OVR_OSX_Display.cpp b/LibOVR/Src/Displays/OVR_OSX_Display.cpp
index c49daa5..262a2bf 100644
--- a/LibOVR/Src/Displays/OVR_OSX_Display.cpp
+++ b/LibOVR/Src/Displays/OVR_OSX_Display.cpp
@@ -5,16 +5,16 @@ Content : OSX-specific Display declarations
Created : July 2, 2014
Authors : James Hughes
-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,
@@ -210,7 +210,11 @@ static int discoverExtendedRifts(OVR::OSX::DisplayDesc* descriptorArray, int inp
if (vendor == 16082 && ( (product == 1)||(product == 2)||(product == 3) ) ) // 7" or HD
{
- if( result >= inputArraySize ) { return result; }
+ if( result >= inputArraySize )
+ {
+ CFRelease(DispInfo);
+ return result;
+ }
Sizei monitorResolution(1280, 800);
@@ -355,7 +359,7 @@ Ptr<Display> Display::GetDisplay( int index, DisplaySearchHandle* handle )
return *new OSX::OSXDisplayGeneric(localHandle->cachedDescriptorArray[index]);
}
- index -= localHandle->extendedDisplayCount;
+ // index -= localHandle->extendedDisplayCount;
}
if (localHandle->application)