Move everything into “namespace movit”.

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 3b15c3787d7e82644d6c5633d9ea05387e0efb88..9e18e9f71cd4999ddbbda88cf38f4a2568c4d485 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -11,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)
@@ -175,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