AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename function to fix symbol clash in static build

Browse Source 
Rename qt_gl_read_framebuffer function to qt_gl_read_frame_buffer in
Qt5OpenGL. This fixes an error when linking statically against both Qt5Gui
and Qt5OpenGL:

Qt5Guid.lib(qopenglframebufferobject.obj) : error LNK2005: "class QImage
__cdecl qt_gl_read_framebuffer(class QSize const &,bool,bool)"
(?qt_gl_read_framebuffer@@YA?AVQImage@@ABVQSize@@_N1@Z) already defined in
Qt5OpenGLd.lib(qgl.obj)
   Creating library debug\composition.lib and object debug\composition.exp

The function was duplicated in 6e28e844 .

Change-Id: I9e3b78e0ec5b25264575d563538587b45cd93e86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
This commit is contained in:
Kai Koehne 2013-02-04 16:12:58 +01:00 committed by The Qt Project
parent 7f15506548
commit c927d6b9e1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opengl/qgl.cpp
View File

@ -1637,7 +1637,7 @@ static void convertFromGLImage(QImage &img, int w, int h, bool alpha_format, boo
img = img.mirrored(); img = img.mirrored();
} }
QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha) QImage qt_gl_read_frame_buffer(const QSize &size, bool alpha_format, bool include_alpha)
{ {
QImage img(size, (alpha_format && include_alpha) ? QImage::Format_ARGB32_Premultiplied QImage img(size, (alpha_format && include_alpha) ? QImage::Format_ARGB32_Premultiplied
: QImage::Format_RGB32); : QImage::Format_RGB32);
@ -4063,7 +4063,7 @@ QImage QGLWidget::grabFrameBuffer(bool withAlpha)
int w = width(); int w = width();
int h = height(); int h = height();
if (format().rgba()) if (format().rgba())
res = qt_gl_read_framebuffer(QSize(w, h), format().alpha(), withAlpha); res = qt_gl_read_frame_buffer(QSize(w, h), format().alpha(), withAlpha);
return res; return res;
} }

6
src/opengl/qglframebufferobject.cpp
View File

@ -53,7 +53,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool); extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool);
#define QGL_FUNC_CONTEXT const QGLContext *ctx = QGLContext::currentContext(); #define QGL_FUNC_CONTEXT const QGLContext *ctx = QGLContext::currentContext();
#define QGL_FUNCP_CONTEXT const QGLContext *ctx = QGLContext::currentContext(); #define QGL_FUNCP_CONTEXT const QGLContext *ctx = QGLContext::currentContext();
@ -1081,7 +1081,7 @@ QImage QGLFramebufferObject::toImage() const
if (!d->valid) if (!d->valid)
return QImage(); return QImage();
// qt_gl_read_framebuffer doesn't work on a multisample FBO // qt_gl_read_frame_buffer doesn't work on a multisample FBO
if (format().samples() != 0) { if (format().samples() != 0) {
QGLFramebufferObject temp(size(), QGLFramebufferObjectFormat()); QGLFramebufferObject temp(size(), QGLFramebufferObjectFormat());
@ -1094,7 +1094,7 @@ QImage QGLFramebufferObject::toImage() const
bool wasBound = isBound(); bool wasBound = isBound();
if (!wasBound) if (!wasBound)
const_cast<QGLFramebufferObject *>(this)->bind(); const_cast<QGLFramebufferObject *>(this)->bind();
QImage image = qt_gl_read_framebuffer(d->size, format().internalTextureFormat() != GL_RGB, true); QImage image = qt_gl_read_frame_buffer(d->size, format().internalTextureFormat() != GL_RGB, true);
if (!wasBound) if (!wasBound)
const_cast<QGLFramebufferObject *>(this)->release(); const_cast<QGLFramebufferObject *>(this)->release();

4
src/opengl/qglpixelbuffer.cpp
View File

@ -108,7 +108,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool); extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool);
QGLContext* QGLPBufferGLPaintDevice::context() const QGLContext* QGLPBufferGLPaintDevice::context() const
@ -391,7 +391,7 @@ QImage QGLPixelBuffer::toImage() const
const_cast<QGLPixelBuffer *>(this)->makeCurrent(); const_cast<QGLPixelBuffer *>(this)->makeCurrent();
if (d->fbo) if (d->fbo)
d->fbo->bind(); d->fbo->bind();
return qt_gl_read_framebuffer(d->req_size, d->format.alpha(), true); return qt_gl_read_frame_buffer(d->req_size, d->format.alpha(), true);
} }
/*! /*!