summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-3065-492/+1569
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-073-1/+61
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Reading and writing PNG iTXt international text chunksaavit2010-11-021-27/+31
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: corruption of whitespace in text fields when reading PNG imagesaavit2010-10-291-19/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-211-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add TIFFClose to QTIffHandler::option() to avoid memory leakTopi Reiniö2010-10-111-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Fix for CFbsBitmap to QPixmap conversion.Jani Hautakangas2010-10-121-1/+2
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-091-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Experimental support of the unified toolbar withFabien Freling2010-10-081-1/+12
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-081-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-071-0/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-053-62/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Fixed potential crash when loading corrupt GIFs.Kim Motoyoshi Kalland2010-09-281-2/+11
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-272-14/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Avoid creating copy of an image in memory when storing as pngaavit2010-09-271-47/+45
| * | | | | | | | | | | | | | | | | | | | | | | Optimization of pixel conversion when storing jpegaavit2010-09-241-13/+19
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-14/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-235-20/+17
| * | | | | | | | | | | | | | | | | | | | | | Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
| * | | | | | | | | | | | | | | | | | | | | | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-224-1/+17
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-28/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-224-18/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-214-20/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-201-11/+8
| | * | | | | | | | | | | | | | | | | | | | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| | * | | | | | | | | | | | | | | | | | | | | Fixed memory corruption issue in qt_blurImage for Indexed8 images.Samuel Rødal2010-09-171-4/+11
| | * | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-091-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-072-8/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-072-2/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-181-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Make raster the default graphics system on X11.Samuel Rødal2010-09-171-0/+5
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale imagesLuboš Luňák2010-09-141-2/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-3/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary function declarations from qpixmap_s60_p.hJani Hautakangas2010-09-071-5/+0
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove unused variableThomas Zander2010-09-071-1/+0
| * | | | | | | | | | | | | | | | | | | | | | Make compile on gcceThomas Zander2010-09-072-7/+10
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | QPixmaps try to access FBS connection after the connection has been closed.Jani Hautakangas2010-09-062-2/+53
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | C++0x move operatorsOlivier Goffart2010-09-034-0/+17
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Revised fix for pixmap loadingJens Bache-Wiig2010-08-201-0/+5
| * | | | | | | | | | | | | | | | | | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-191-3/+0