Merge pull request #673 from mapbox/pixel-flip

Move pixel flip from headless test into HeadlessView::readPixels
This commit is contained in:
Mike Morris
2014-12-01 19:28:47 -05:00
2 changed files with 10 additions and 9 deletions

View File

@@ -4,6 +4,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
#include <cstring>
#if MBGL_USE_GLX
#ifdef GLX_ARB_create_context
@@ -237,6 +238,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--) {
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;
}

View File

@@ -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);
}