Move everything into “namespace movit”.

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 6b1de53cc35b52af8094a65a97e442aba43f81f8..9e18e9f71cd4999ddbbda88cf38f4a2568c4d485 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <Eigen/Core>
 
@@ -10,6 +11,8 @@
 
 using namespace std;
 
+namespace movit {
+
 extern string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
@@ -98,7 +101,7 @@ GLuint compile_shader(const string &shader_src, GLenum type)
        glGetShaderInfoLog(obj, log_length, &log_length, info_log);
        info_log[log_length] = 0; 
        if (strlen(info_log) > 0) {
-               printf("shader compile log: %s\n", info_log);
+               fprintf(stderr, "Shader compile log: %s\n", info_log);
        }
 
        GLint status;
@@ -174,3 +177,5 @@ void combine_two_samples(float w1, float w2, float *offset, float *total_weight,
        assert(*offset >= 0.0f);
        assert(*offset <= 1.0f);
 }
+
+}  // namespace movit