summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-12-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (23 commits) Restore patch that got lost in merge Fix spelling in comment Spelling mistakes in Documentation. There are probably more :) Fix spelling mistake in QEGLPlatformcontext Restore patch that disappeared in merge Make the openKODE use the new eventloopintegration api. Make QtOpenGL use shared contextexts on Lighthouse Move the Lighthouse specfic api into qpa_qpa.cpp Lighthouse: Fix QGLContext::currentContext for systems with limited Make EglFS plugin compile after changes to QPlatformEGLContext Adding some documentation for Lighthouse Lighthouse: move the currentContext functionality to QPlatformGLContext Remove QWidget::paintEngine() codepath for Lighthouse Fix transformIsSimple in QGraphicsScene Lighthouse: Make sure that we call QPlatformWindow::setVisible Lighthouse: using QFont enums when possible in QPlatformFontdatabase No more windowsurface for QGLWidget in Lighthouse Add workaround_brokenFBOReadback=true for mali Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629 Compile fix for c1148ee9a60a6fae8. ...
| * | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-281-0/+1
| |/ | | | | | | | | | | The declaration of QCoreTextFontEngine was ifdefed in qfontengine_p.h. So was QMacFontEngine. I have moved them into their own files (qfontengine_coretext_p.h and qfontengine_mac_p.h).
* | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-301-0/+36
|/ | | | | | | | | | | | When switching from a format without alpha channel to one that has it, reuse the underlying QImage memory if the old & new color depths match. This avoids one allocation when using the rather common pattern: QPixmap pixmap(w, h); pixmap.fill(Qt::transparent); Reviewed-by: Samuel Rødal
* The forward declaration should have been in the namespace for QImageDataBenjamin Poulain2010-07-081-2/+2
| | | | Reviewed-by: Olivier Goffart
* Build fix, the header of QImageData did not declare QImageWriter.Benjamin Poulain2010-07-071-0/+2
| | | | | Including this header in the SSE2 file broke the build because QImageWriter was not declared.
* SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImageJohn Brooks2010-07-071-0/+2
| | | | | Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-201-0/+3
| | | | | | | | | | | | | | | | | | | | | Currently, with the graphics system raster, converting from images to QPixmap often needs to allocate a new image to convert the right format. For example, for an image in ARGB32 of 10 mbytes, we need to allocate a second image of 10 mbytes in ARGB32_PM to convert the source image in the right format for pixmap. This can create a hight peak of memory, and is a bit slower than it should. This patch introduce in-place conversion of images when they are loaded with QPixmap::loadFromData(). The images are loaded in their default format by QImageReader, and are then converted in-place, trying to reduce memory allocations. Reviewed-by: Samuel Rødal
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Make 16-bit graphicssystem opengl workGunnar Sletta2009-10-021-1/+1
| | | | Reviewed-by: Eskil
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-08-111-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+110
generated by cgit v0.12 at 2024-11-14 07:42:06 (GMT)