From dfb81fe9ce796c06263c4b531cdba4d0e8571808 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 8 Oct 2014 16:04:13 -0400 Subject: fix HeadlessView::readPixels return value, ref #480 --- common/headless_view.cpp | 6 +++--- common/headless_view.hpp | 2 +- test/headless.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/headless_view.cpp b/common/headless_view.cpp index 9775da1d57..3f945ee6aa 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -97,17 +97,17 @@ void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) { #endif } -const std::unique_ptr* HeadlessView::readPixels() { +const std::unique_ptr HeadlessView::readPixels() { const unsigned int w = width_ * pixelRatio_; const unsigned int h = height_ * pixelRatio_; - const std::unique_ptr pixels(new uint32_t[w * h]); + std::unique_ptr pixels(new uint32_t[w * h]); make_active(); glReadPixels(0, 0, width_, height_, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get()); make_inactive(); - return &pixels; + return pixels; } void HeadlessView::clear_buffers() { diff --git a/common/headless_view.hpp b/common/headless_view.hpp index b59366349e..600e9d51fa 100644 --- a/common/headless_view.hpp +++ b/common/headless_view.hpp @@ -26,7 +26,7 @@ public: void createContext(); void resize(uint16_t width, uint16_t height, float pixelRatio); - const std::unique_ptr* readPixels(); + const std::unique_ptr readPixels(); void notify_map_change(MapChange change, timestamp delay = 0); void make_active(); diff --git a/test/headless.cpp b/test/headless.cpp index 439a6dcab7..91533bb36b 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -98,7 +98,7 @@ TEST_P(HeadlessTest, render) { const unsigned int w = width * pixelRatio; const unsigned int h = height * pixelRatio; - const std::string image = util::compress_png(w, h, view.readPixels()->get(), true); + const std::string image = util::compress_png(w, h, view.readPixels().get(), true); util::write_file(actual_image, image); } } -- cgit v1.2.1