Browse Source

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

legacy
Sam Hocevar sam 14 years ago
parent
commit
e5a870d4ef
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      src/video.cpp

+ 4
- 2
src/video.cpp View File

@@ -7,7 +7,7 @@
# include "config.h" # include "config.h"
#endif #endif


#include <math.h>
#include <cmath>


#ifdef WIN32 #ifdef WIN32
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
@@ -41,6 +41,8 @@ void Video::Setup(int width, int height)


void Video::SetFov(float theta) void Video::SetFov(float theta)
{ {
#undef near /* Fuck Microsoft */
#undef far /* Fuck Microsoft again */
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();


@@ -113,7 +115,7 @@ void Video::Capture(uint32_t *buffer)
glPixelStorei(GL_PACK_ROW_LENGTH, 0); glPixelStorei(GL_PACK_ROW_LENGTH, 0);
glPixelStorei(GL_PACK_ALIGNMENT, 1); 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++) for (int j = 0; j < height / 2; j++)
for (int i = 0; i < width; i++) for (int i = 0; i < width; i++)


Loading…
Cancel
Save