Move to 'using namespace std;' in all .cpp files.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index a35bbea594a02ce9882d4a449805a28a00d8c63c..be34583805df68a2da1cedc5e8212eb380bf8cdf 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -7,13 +7,26 @@
 #include "flat_input.h"
 #include "gtest/gtest.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "test_util.h"
 #include "util.h"
 
+using namespace std;
+
 class Input;
 
 namespace {
 
+// Not thread-safe, but this isn't a big problem for testing.
+ResourcePool *get_static_pool()
+{
+       static ResourcePool *resource_pool = NULL;
+       if (!resource_pool) {
+               resource_pool = new ResourcePool();
+       }
+       return resource_pool;
+}
+
 // Flip upside-down to compensate for different origin.
 template<class T>
 void vertical_flip(T *data, unsigned width, unsigned height)
@@ -21,7 +34,7 @@ void vertical_flip(T *data, unsigned width, unsigned height)
        for (unsigned y = 0; y < height / 2; ++y) {
                unsigned flip_y = height - y - 1;
                for (unsigned x = 0; x < width; ++x) {
-                       std::swap(data[y * width + x], data[flip_y * width + x]);
+                       swap(data[y * width + x], data[flip_y * width + x]);
                }
        }
 }
@@ -31,9 +44,9 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
                                      MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
                                      GLenum framebuffer_format)
-       : chain(width, height), width(width), height(height), finalized(false)
+       : chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
 {
-       init_movit(".", MOVIT_DEBUG_ON);
+       init_movit(".", MOVIT_DEBUG_OFF);
 
        if (data != NULL) {
                add_input(data, pixel_format, color_space, gamma_curve);