Merge branch 'vanilla_0.4.4' and resolve conflicts

TODO: Validate for removed patches due to relocation

Resolved Conflicts:
	LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVR/Src/OVR_Linux_HMDDevice.cpp
	LibOVR/Src/OVR_OSX_HMDDevice.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVR/Src/OVR_Sensor2Impl.cpp
	LibOVR/Src/OVR_SensorFusion.cpp
	LibOVR/Src/OVR_SensorImpl.cpp
	LibOVR/Src/OVR_Win32_DeviceStatus.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.h
	LibOVR/Src/OVR_Win32_HMDDevice.cpp

1 files changed, 15 insertions, 11 deletions

diff --git a/LibOVR/Src/Util/Util_ImageWindow.h b/LibOVR/Src/Util/Util_ImageWindow.h
index 4b88959..979dd93 100644
--- a/LibOVR/Src/Util/Util_ImageWindow.h
+++ b/LibOVR/Src/Util/Util_ImageWindow.h
@@ -7,14 +7,14 @@ Authors     :   Dean Beeler
 
 Copyright   :   Copyright 2014 Oculus, Inc. 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,
@@ -28,13 +28,14 @@ limitations under the License.
 #define UTIL_IMAGEWINDOW_H
 
 #if defined(OVR_OS_WIN32)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <d2d1.h>
 #include <dwrite.h>
 #endif
 
-#include "../../Include/OVR.h"
 #include "../Kernel/OVR_Hash.h"
 #include "../Kernel/OVR_Array.h"
 #include "../Kernel/OVR_Threads.h"
@@ -154,6 +155,9 @@ private:
 	static int					windowCount;
 	static ID2D1Factory*		pD2DFactory;
 	static IDWriteFactory*		pDWriteFactory;
+	static HINSTANCE            hInstD2d1;
+	static HINSTANCE            hInstDwrite;
+
 };
 
 #else
@@ -171,16 +175,16 @@ public:
 	void OnPaint() { }
 
 	void UpdateImage( const uint8_t* imageData, uint32_t width, uint32_t height ) { UpdateImageBW( imageData, width, height ); }
-	void UpdateImageBW( const uint8_t* imageData, uint32_t width, uint32_t height ) { }
-	void UpdateImageRGBA( const uint8_t* imageData, uint32_t width, uint32_t height, uint32_t pitch ) { }
+	void UpdateImageBW( const uint8_t* imageData, uint32_t width, uint32_t height ) { OVR_UNUSED( imageData ); OVR_UNUSED( width ); OVR_UNUSED( height ); }
+	void UpdateImageRGBA( const uint8_t* imageData, uint32_t width, uint32_t height, uint32_t pitch ) { OVR_UNUSED( imageData ); OVR_UNUSED( width ); OVR_UNUSED( height ); OVR_UNUSED( pitch ); }
 	void Complete() { }
 
 	void Process() { }
 
-	void AssociateSurface( void* surface ) { }
+	void AssociateSurface( void* surface ) { OVR_UNUSED(surface); }
 
-	void addCircle( float x , float y, float radius, float r, float g, float b, bool fill ) { }
-	void addText( float x, float y, float r, float g, float b, OVR::String text ) { }
+	void addCircle( float x , float y, float radius, float r, float g, float b, bool fill ) { OVR_UNUSED( x ); OVR_UNUSED( y ); OVR_UNUSED( radius ); OVR_UNUSED( r ); OVR_UNUSED( g ); OVR_UNUSED( b ); OVR_UNUSED( fill ); }
+	void addText( float x, float y, float r, float g, float b, OVR::String text ) { OVR_UNUSED( x ); OVR_UNUSED( y ); OVR_UNUSED( r ); OVR_UNUSED( g ); OVR_UNUSED( b ); OVR_UNUSED( text ); }
 
 	static ImageWindow*			GlobalWindow( int window ) { return globalWindow[window]; }
 	static int					WindowCount() { return windowCount; }
@@ -197,4 +201,4 @@ private:
 }} // namespace OVR::Util
 
 
-#endif
\ No newline at end of file
+#endif