summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-301-12/+5
|\
| * Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-281-12/+5
| | | | | | | | | | | | | | The new class alows more than one hook to be installed at a time and, for QPixmaps, the hook is told which pixmap is getting deleted. Reviewed-By: Samuel
* | Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2Volker Hilsheimer2009-07-281-4/+11
|/ | | | | Clarified that the format used in QImage::fromData() is the image format, not the pixel format.
* Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-251-3/+2
|
* Revert "Doc: Clarified that the format used in QImage::fromData() is the image"Volker Hilsheimer2009-07-251-31/+27
| | | | | This reverts commit 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2, which accidentially reverted previous commits.
* Doc: Clarified that the format used in QImage::fromData() is the imageDavid Boddie2009-07-231-27/+31
| | | | | | format, not the pixel format. Reviewed-by: Trust Me
* Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete.Volker Hilsheimer2009-07-211-5/+4
| | | | | | | They are expensive - which is why QImage::setALphaChannel had been obsoleted in Qt 4.5. Reviewed-by: Gunnar
* Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-1/+1
|
* Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-8/+4
| | | | Reviewed-by: Samuel
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | 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
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-081-1/+1
| | | | | | | | | | | | | | | | 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>
* | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* | Tiny optimization to QImage::setColorTable()Gunnar Sletta2009-04-151-2/+6
|/ | | | Task: 250730
* Compile.Norwegian Rock Cat2009-04-071-1/+1
| | | | | | Looks like a typo. Reviewed-by: Bradley T. Hughes
* Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-071-1/+11
| | | | Reviewed-by: Trond
* Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
| | | | | Task-number: 240164 Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+6119