summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Remove these colorspace references.Norwegian Rock Cat2009-06-242-4/+4
| | | | | | | It is only used for creating the bitmap context, so there is no reason to keep it around. Reviewed-by: Morten Sørvig
* More culling of Panther Code.Norwegian Rock Cat2009-06-233-74/+14
| | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* Improve flushing performance in the raster window surface on Mac.Morten Sørvig2009-06-231-2/+6
| | | | | | Use the display color space for QNativeImage to avoid format conversions. Reviewed-by: Samuel
* Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-182-16/+9
| | | | Reviewed-by: Samuel
* Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-179-18/+47
| | | | | | | | | | | | | | | | This change moves the w, h, d variables to QPixmapData and introduces is_null to keep track of nullness. This is possible only because QPixmapData is internal API; otherwise we'd have to be smarter. The optimization makes the QPixmap::width() function take 7 instructions, down from 34 before. For the calculator demo in the declarative ui branch this reduces a block of 750000 instructions (out of 30000000) to around 100000-150000 instructions. Tested on Windows, Linux, Mac. Raster, X11 and OpenGL paint engines. Have not tested the DirectFB engine. Reviewed-by: Trond
* Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Merge license header changes from 4.5Volker Hilsheimer2009-06-1656-112/+112
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1656-112/+112
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Make sure QImage::mirrored() doesn't crash if it runs out of memory.Trond Kjernåsen2009-06-101-0/+5
| | | | | | | | | | Task-number: 255742 Reviewed-by: Kim
* | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-111-1/+1
| |
* | small changes in private headersThierry Bastian2009-06-091-1/+1
| |
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-084-2/+6
| | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-1/+1
| | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Add an extra explanation for the API extension.Alexis Menard2009-06-041-1/+4
| | | | | | | | Reviewed-by:David Boddie
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-3/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Fixed a problem with streaming QIcons containing multiple pixmaps.Trond Kjernåsen2009-05-281-3/+6
| | | | | | | | | | | | | | | | | | If pixmaps were added through QIcon::addFile() with different sizes than the sizes of the pixmaps themselves, streaming the icon in didn't work properly. Task-number: 254374 Reviewed-by: Kim
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-87/+95
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * qdoc: Moved some qdoc comments to a common cpp file.Martin Smith2009-05-254-87/+95
| | | | | | | | Task-number: 252488
* | Integrate merge-request #419 into branch 'master'Simon Hausmann2009-05-271-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Daniël (1): Memory of fixedKernel is never returned, found by cppcheck. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/419 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Merge commit 'd8a2e52e4db873a2cfd39630df47b61bec502fd1' into HEAD
| * | Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-05-271-0/+1
| | |
* | | Add comparation of images with indexed colorBenjamin Poulain2009-05-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Previously, two images with indexed colors were not equal if their color tables were not the same. The image are not compared by the value of the pixels Reviewed-by: Samuel
* | | Optimized QRasterPixmapData::metric.Samuel Rødal2009-05-271-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid needless DPI calculations when not needed, and simplify the DPI calculations to the point where most of the operations disappear. Also avoid calling QImage::metric() so that we don't need to go through two switch statements and an extra function call just to get the width of a pixmap. Reviewed-by: Trond
* | | some cleanups on private exported symbolsThierry Bastian2009-05-261-1/+1
| | |
* | | We first remove the pixmap from the cache and then release the keyAlexis Menard2009-05-261-1/+3
| | | | | | | | | | | | | | | | | | | | | If we don't remove the pixmap from QCache first then the key is invalid and the removal failed Reviewed-by: sroedal
* | | Fix all docs warnings and add since 4.6 to new methodsAlexis Menard2009-05-251-7/+22
| | | | | | | | | | | | Reviewed-by:TrustMe
* | | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-3/+3
| | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | | Fix a mistake in the doc.Alexis Menard2009-05-251-2/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Fix build on Solaris for qHash function in QPixmapCache.Alexis Menard2009-05-222-1/+3
| | | | | | | | | | | | Reviewed-by:thierry
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-193-3/+3
|\ \ \ | | |/ | |/|
| * | Fix some typos in the documentation.Frederik Schwarzer2009-05-183-3/+3
| | | | | | | | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* | | compile fixes with namespaceshjk2009-05-191-0/+4
| | |
* | | Add an extension to QPixmapCache to get rid of strings.Alexis Menard2009-05-184-56/+429
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a new API to add/find/remove pixmaps into QPixmapCache. This new extension is based on a key that the cache give you during the insertion. This key is internally a int which makes all operations in the cache much more faster that the string approach. Auto-tests has been extended as well and a benchmark has been added to compare both approach. I also depecrate the find method for the string API to have a method pointer based and not reference based like the Qt policy says. Reviewed-by: bnilsen Reviewed-by: andreas Followed-deeply-by: trond
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-0/+4
|\ \ | |/
| * Document a gotcha with QIcon::addFileNorwegian Rock Cat2009-05-121-0/+3
| | | | | | | | | | | | | | addFile makes a QIcon not null, which may be a surprise if the path given is bad. Reviewed-by: Jens Bache-Wiig
| * Fixed a memory leak that occured when loading system icons on Windows.Trond Kjernaasen2009-05-121-0/+1
| | | | | | | | | | | | | | There was a qFree() call missing. Task-number: related to 253367 Reviewed-by: jbache
* | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-111-1/+1
| |
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-0/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Doc: Updated QImageReader::supportedImageFormat() to include SVGGeir Vattekar2009-05-061-0/+1
| | | | | | | | Task-number: 252415
* | introduce Q_WS_WINCEMaurice Kalinowski2009-04-295-12/+12
| | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+5
|\ \ | |/
| * QPixmapCache:Remove the old pixmap if you insert one with the same key.Alexis Menard2009-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | If you insert a new pixmap in the cache with a key that was already in the cache then we remove the old pixmap and add the new one. This avoid to fill the memory with garbage even if the cache has a protection to avoid running out of memory. This was discovered with QraphicsView and its cache. We don't need to keep old cached pixmaps for an item. Task-number: KDE Reviewed-by: Trond
* | Remove the Direct3D engine.Gunnar Sletta2009-04-244-32/+0
| |
* | Merge branch '4.5'Thiago Macieira2009-04-201-2/+4
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Fix docs for QPixmapCache::setCacheLimit()/cacheLimit()Gunnar Sletta2009-04-201-2/+4
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Fix an endianess issue with 32 bit pixmaps on big endian systems.Trond Kjernåsen2009-04-171-1/+1
| | | | | | | | | | | | | | | | On big endian systems with Xrender, the QPixmap::toImage() function did an unnecessary byte swap for 32 bit pixmaps. Task-number: 196152 Reviewed-by: Samuel
* | Make QIcon update after palette changesJens Bache-Wiig2009-04-151-0/+2
| | | | | | | | | | | | | | | | We have to add the palette cacheKey to ensure that the icon is properly regenerated after a system palette change. Task-number: 250542 Reviewed-by: nrc
* | Tiny optimization to QImage::setColorTable()Gunnar Sletta2009-04-151-2/+6
| | | | | | | | Task: 250730
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-072-2/+26
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
generated by cgit v0.12 at 2024-11-14 21:39:27 (GMT)