summaryrefslogtreecommitdiff
path: root/src/OffscreenContextAll.hpp
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-01-28 19:56:17 (GMT)
committerMarius Kintel <marius@kintel.net>2013-01-28 19:56:17 (GMT)
commit256eb2c2f2a4a7363898900335b217efc5c79ce4 (patch)
tree18da55920cf3c8d56d89758bb64e7427b5f5fffc /src/OffscreenContextAll.hpp
parent5eed194f15b6ab24c9fb9f580b7c881c7acccf9e (diff)
Mac OS X build fixes
Diffstat (limited to 'src/OffscreenContextAll.hpp')
-rw-r--r--src/OffscreenContextAll.hpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/OffscreenContextAll.hpp b/src/OffscreenContextAll.hpp
index b0df83d..42563be 100644
--- a/src/OffscreenContextAll.hpp
+++ b/src/OffscreenContextAll.hpp
@@ -1,6 +1,9 @@
// Functions shared by OffscreenContext[platform].cc
// #include this directly after definition of struct OffscreenContext.
+#include <vector>
+#include <ostream>
+
void bind_offscreen_context(OffscreenContext *ctx)
{
if (ctx) fbo_bind(ctx->fbo);
@@ -30,7 +33,7 @@ bool save_framebuffer_common(OffscreenContext *ctx, std::ostream &output)
{
if (!ctx) return false;
int samplesPerPixel = 4; // R, G, B and A
- vector<GLubyte> pixels(ctx->width * ctx->height * samplesPerPixel);
+ std::vector<GLubyte> pixels(ctx->width * ctx->height * samplesPerPixel);
glReadPixels(0, 0, ctx->width, ctx->height, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[0]);
// Flip it vertically - images read from OpenGL buffers are upside-down
@@ -56,7 +59,7 @@ OffscreenContext *create_offscreen_context_common(OffscreenContext *ctx)
if (!ctx) return NULL;
GLenum err = glewInit(); // must come after Context creation and before FBO c$
if (GLEW_OK != err) {
- cerr << "Unable to init GLEW: " << glewGetErrorString(err) << "\n";
+ std::cerr << "Unable to init GLEW: " << glewGetErrorString(err) << "\n";
return NULL;
}
//cerr << glew_dump(0);
contact: Jan Huwald // Impressum