Changeset 216Tweet

Timestamp:

Jan 17, 2011, 1:39:28 PM (12 years ago)

Author:

sam

Message:

Fix compilation issue caused by WinDef.h defining "near" and "far" macros.

File:

• trunk/src/video.cpp (modified) (3 diffs)

trunk/src/video.cpp

@@ -8 +8 @@
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #ifdef WIN32
@@ -42 +42 @@
 void Video::SetFov(float theta)
 {
+#undef near /* Fuck Microsoft */
+#undef far /* Fuck Microsoft again */
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
@@ -114 +116 @@
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
-    glReadPixels(0, 0, width, height, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
+    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
 
     for (int j = 0; j < height / 2; j++)