update Eigen dependency

wjakob · Aug 25, 2017 · 17492d3 · 17492d3
1 parent d8903a4
commit 17492d3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/ext/eigen b/ext/eigen
diff --git a/include/nanogui/common.h b/include/nanogui/common.h
@@ -12,6 +12,17 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#  if defined(NANOGUI_BUILD)
+     /* Quench a few warnings on when compiling NanoGUI on Windows */
+#    pragma warning(disable : 4127) // warning C4127: conditional expression is constant
+#    pragma warning(disable : 4244) // warning C4244: conversion from X to Y, possible loss of data
+#  endif
+#  pragma warning(disable : 4251) // warning C4251: class X needs to have dll-interface to be used by clients of class Y
+#  pragma warning(disable : 4714) // warning C4714: function X marked as __forceinline not inlined
+#  pragma warning(disable : 4127) // warning C4127: conditional expression is constant
+#endif
+
 #include <Eigen/Core>
 #include <stdint.h>
 #include <array>
@@ -85,16 +96,6 @@
 #define NANOGUI_FORCE_DISCRETE_GPU()
 #endif
 
-#if defined(_WIN32)
-#if defined(NANOGUI_BUILD)
-/* Quench a few warnings on when compiling NanoGUI on Windows */
-#pragma warning(disable : 4127) // warning C4127: conditional expression is constant
-#pragma warning(disable : 4244) // warning C4244: conversion from X to Y, possible loss of data
-#endif
-#pragma warning(disable : 4251) // warning C4251: class X needs to have dll-interface to be used by clients of class Y
-#pragma warning(disable : 4714) // warning C4714: function X marked as __forceinline not inlined
-#endif
-
 // These will produce broken links in the docs build
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 

diff --git a/src/common.cpp b/src/common.cpp
@@ -12,7 +12,7 @@
 #include <nanogui/screen.h>
 
 #if defined(_WIN32)
-#include <windows.h>
+#  include <windows.h>
 #endif
 
 #include <nanogui/opengl.h>
@@ -22,9 +22,9 @@
 #include <iostream>
 
 #if !defined(_WIN32)
-    #include <locale.h>
-    #include <signal.h>
-    #include <sys/dir.h>
+#  include <locale.h>
+#  include <signal.h>
+#  include <sys/dir.h>
 #endif
 
 NAMESPACE_BEGIN(nanogui)

diff --git a/src/screen.cpp b/src/screen.cpp
@@ -376,8 +376,8 @@ void Screen::drawWidgets() {
     glfwGetWindowSize(mGLFWWindow, &mSize[0], &mSize[1]);
 
 #if defined(_WIN32) || defined(__linux__)
-    mSize = (mSize / mPixelRatio).cast<int>();
-    mFBSize = (mSize * mPixelRatio).cast<int>();
+    mSize = (mSize.cast<float>() / mPixelRatio).cast<int>();
+    mFBSize = (mSize.cast<float>() * mPixelRatio).cast<int>();
 #else
     /* Recompute pixel ratio on OSX */
     if (mSize[0])