From 9b9910dfc179da45735c24e7f557e8349751a679 Mon Sep 17 00:00:00 2001 From: Francisco Zurita Date: Sun, 29 Jan 2017 22:04:45 +0700 Subject: [PATCH] Fix return value in ColorBufferReaderWithBufferStorage::readPixels and ColorBufferReaderWithPixelBuffer::readPixels --- .../OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp | 2 +- .../OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp index 6b453756..0fc00ba6 100644 --- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp +++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp @@ -75,7 +75,7 @@ u8 * ColorBufferReaderWithBufferStorage::readPixels(s32 _x0, s32 _y0, u32 _width GLubyte* pixelData = reinterpret_cast(m_PBOData[m_curIndex]); if (pixelData == nullptr) - return false; + return nullptr; int widthBytes = _width * colorFormatBytes; int strideBytes = m_pTexture->realWidth * colorFormatBytes; diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp index 6cb29596..725458cf 100644 --- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp +++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp @@ -68,7 +68,7 @@ u8 * ColorBufferReaderWithPixelBuffer::readPixels(s32 _x0, s32 _y0, u32 _width, GLubyte* pixelData = (GLubyte*)glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, m_pTexture->realWidth * _height * colorFormatBytes, GL_MAP_READ_BIT); if (pixelData == nullptr) - return false; + return nullptr; int widthBytes = _width*colorFormatBytes; int strideBytes = m_pTexture->realWidth * colorFormatBytes;