From 0fd7f26533b56703137567c9843683c5e8ddfade Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 1 Dec 2014 16:36:11 -0500
Subject: [PATCH 1/2] move pixel flip from headless test into
 HeadlessView::readPixels

---
 platform/default/headless_view.cpp | 9 +++++++++
 test/headless.cpp                  | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp
index 1f5a0ec98..59bf7f49a 100644
--- a/platform/default/headless_view.cpp
+++ b/platform/default/headless_view.cpp
@@ -237,6 +237,15 @@ std::unique_ptr<uint32_t[]> HeadlessView::readPixels() {
     glReadPixels(0, 0, width_, height_, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get());
     make_inactive();
 
+    const int stride = w * 4;
+    auto tmp = std::unique_ptr<char[]>(new char[stride]());
+    char *rgba = reinterpret_cast<char *>(pixels.get());
+    for (int i = 0, j = height_ - 1; i < j; i++, j--) {
+        memcpy(tmp.get(), rgba + i * stride, stride);
+        memcpy(rgba + i * stride, rgba + j * stride, stride);
+        memcpy(rgba + j * stride, tmp.get(), stride);
+    }
+
     return pixels;
 }
 
diff --git a/test/headless.cpp b/test/headless.cpp
index 680f51aeb..e0409c473 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -203,15 +203,6 @@ TEST_P(HeadlessTest, render) {
 
         auto pixels = view.readPixels();
 
-        const int stride = w * 4;
-        auto tmp = std::unique_ptr<char[]>(new char[stride]());
-        char *rgba = reinterpret_cast<char *>(pixels.get());
-        for (int i = 0, j = height - 1; i < j; i++, j--) {
-            memcpy(tmp.get(), rgba + i * stride, stride);
-            memcpy(rgba + i * stride, rgba + j * stride, stride);
-            memcpy(rgba + j * stride, tmp.get(), stride);
-        }
-
         const std::string image = util::compress_png(w, h, pixels.get());
         util::write_file(actual_image, image);
     }

From 7e7b85e132e74eb52133b391f089e75e8b09d2f5 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 1 Dec 2014 13:49:47 -0800
Subject: [PATCH 2/2] fix memcpy includes/namespace

---
 platform/default/headless_view.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp
index 59bf7f49a..10d6ed8f4 100644
--- a/platform/default/headless_view.cpp
+++ b/platform/default/headless_view.cpp
@@ -4,6 +4,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
+#include <cstring>
 
 #if MBGL_USE_GLX
 #ifdef GLX_ARB_create_context
@@ -241,9 +242,9 @@ std::unique_ptr<uint32_t[]> HeadlessView::readPixels() {
     auto tmp = std::unique_ptr<char[]>(new char[stride]());
     char *rgba = reinterpret_cast<char *>(pixels.get());
     for (int i = 0, j = height_ - 1; i < j; i++, j--) {
-        memcpy(tmp.get(), rgba + i * stride, stride);
-        memcpy(rgba + i * stride, rgba + j * stride, stride);
-        memcpy(rgba + j * stride, tmp.get(), stride);
+        std::memcpy(tmp.get(), rgba + i * stride, stride);
+        std::memcpy(rgba + i * stride, rgba + j * stride, stride);
+        std::memcpy(rgba + j * stride, tmp.get(), stride);
     }
 
     return pixels;