Run include-what-you-use over all of movit. Some hand tuning.

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index eeea198a4a074fa357311356d3157e7d00f15d36..a1bc2fd3e868c8aa2e6a948237e5608ff11b491b 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -1,11 +1,15 @@
+#include <GL/glew.h>
+#include <assert.h>
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+#include <Eigen/Core>
 
-#include <math.h>
-#include "util.h"
-#include "opengl.h"
 #include "init.h"
+#include "util.h"
+
+extern std::string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -65,10 +69,12 @@ void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b)
 
 std::string read_file(const std::string &filename)
 {
+       const std::string full_pathname = *movit_data_directory + "/" + filename;
+
        static char buf[131072];
-       FILE *fp = fopen(filename.c_str(), "r");
+       FILE *fp = fopen(full_pathname.c_str(), "r");
        if (fp == NULL) {
-               perror(filename.c_str());
+               perror(full_pathname.c_str());
                exit(1);
        }