tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix HeadlessView::readPixels return value, ref #480

Browse Source
This commit is contained in:
Mike Morris
2014-10-08 16:04:13 -04:00
parent a1bc8c766d
commit dfb81fe9ce
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/headless_view.cpp
View File

@@ -97,17 +97,17 @@ void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) {
#endif
}
const std::unique_ptr<uint32_t[]>* HeadlessView::readPixels() {
const std::unique_ptr<uint32_t[]> HeadlessView::readPixels() {
const unsigned int w = width_ * pixelRatio_;
const unsigned int h = height_ * pixelRatio_;
const std::unique_ptr<uint32_t[]> pixels(new uint32_t[w * h]);
std::unique_ptr<uint32_t[]> 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() {

2
common/headless_view.hpp
View File

@@ -26,7 +26,7 @@ public:
void createContext();
void resize(uint16_t width, uint16_t height, float pixelRatio);
const std::unique_ptr<uint32_t[]>* readPixels();
const std::unique_ptr<uint32_t[]> readPixels();
void notify_map_change(MapChange change, timestamp delay = 0);
void make_active();

2
test/headless.cpp
View File

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