X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=util.h;h=cc8256189f84872ec2f4a6b69a140352136fa390;hb=cfc161e0289c2169d4835c48751ff56b97355eb2;hp=b01d62c00f00588a21b2587e6387f649b6b3bdc1;hpb=9447b2d234394c1d966f77ed87271a3625a81cdd;p=movit

diff --git a/util.h b/util.h
index b01d62c..cc82561 100644
--- a/util.h
+++ b/util.h
@@ -1,18 +1,18 @@
-#ifndef _UTIL_H
-#define _UTIL_H 1
+#ifndef _MOVIT_UTIL_H
+#define _MOVIT_UTIL_H 1
 
 // Various utilities.
 
+#include <GL/glew.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-#include <string>
 #include <Eigen/Core>
-
-#include "opengl.h"
+#include <string>
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
+namespace movit {
+
 // Converts a HSV color to RGB. Assumes h in [0, 2pi> or [-pi, pi>
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
 
@@ -43,18 +43,14 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 // (estimated) squared errors of the two weights.
 void combine_two_samples(float w1, float w2, float *offset, float *total_weight, float *sum_sq_error);
 
+}  // namespace movit
+
 #ifdef NDEBUG
 #define check_error()
 #else
 #define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); exit(1); } }
 #endif
 
-#ifdef __GNUC__
-#define MUST_CHECK_RESULT __attribute__((warn_unused_result))
-#else
-#define MUST_CHECK_RESULT 
-#endif
-
 // CHECK() is like assert(), but retains any side effects no matter the compilation mode.
 #ifdef NDEBUG
 #define CHECK(x) (void)(x)
@@ -62,4 +58,4 @@ void combine_two_samples(float w1, float w2, float *offset, float *total_weight,
 #define CHECK(x) do { bool ok = x; if (!ok) { fprintf(stderr, "%s:%d: %s: Assertion `%s' failed.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #x); abort(); } } while (false)
 #endif
 
-#endif // !defined(_UTIL_H)
+#endif // !defined(_MOVIT_UTIL_H)