Normalize the resample weight after bilinear combining.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index eaa5fc6809dc0f131dd0342b86efe8a44e4a40ce..59c0ef420a43e04b846fa55a946b927ddddba180 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,16 +1,19 @@
 #include <assert.h>
-#include <gtest/gtest-message.h>
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
 
 #include "flat_input.h"
+#include "glew.h"
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
 #include "init.h"
 #include "resource_pool.h"
 #include "test_util.h"
 #include "util.h"
 
+using namespace std;
+
 class Input;
 
 namespace {
@@ -32,7 +35,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]);
                }
        }
 }