summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-136-50/+192
|\ \ | |/
| * Use the fast Neon conversion for converting colors of jpeg images.Benjamin Poulain2010-08-061-2/+9
| * Do the conversion from RGB888 to RGB32 using NeonBenjamin Poulain2010-08-063-0/+123
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-042-8/+26
| |\
| | * Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3Benjamin Poulain2010-08-032-4/+4
| | * Use the fast conversion from RGB888 to RGB32 for Jpeg imagesBenjamin Poulain2010-08-032-7/+25
| * | Unbreak QImage::rgbSwapped() for many image formats.Andreas Kling2010-08-031-41/+35
| |/
| * Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-291-1/+1
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-2/+2
* | QImage::fill() overloads that take QColor and Qt::GlobalColorGunnar Sletta2010-08-042-0/+85
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-284-18/+207
|\ \ | |/
| * Use SSSE3 to convert from RGB888 to RGB32Benjamin Poulain2010-07-263-1/+160
| * Improve the conversion from indexted to RGB16Benjamin Poulain2010-07-221-7/+16
| * Avoid qMin() for each pixel when converting indexed colors in-placeBenjamin Poulain2010-07-221-4/+12
| * Premultiply the color table instead of each pixel for image conversionBenjamin Poulain2010-07-221-2/+7
| * Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-1529-126/+4167
|\ \ | |/
| * The forward declaration should have been in the namespace for QImageDataBenjamin Poulain2010-07-081-2/+2
| * Add test and fix style for the SSE2 implementation of ARGB32 conversionBenjamin Poulain2010-07-072-3/+3
| * Build fix, the header of QImageData did not declare QImageWriter.Benjamin Poulain2010-07-071-0/+2
| * SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImageJohn Brooks2010-07-074-2/+130
| * Revert "Character spacing when drawing a QPicture to a high DPI device."Trond Kjernåsen2010-07-051-13/+39
| * make image handler includes privateOswald Buddenhagen2010-07-0414-28/+28
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0316-46/+3763
| |\
| | * Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-022-0/+116
| | * Split image handler plugin project filesMark Brand2010-07-0214-38/+3641
| | * Removed stray line continuationsMark Brand2010-07-021-4/+2
| | * Long live else!Mark Brand2010-07-021-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-029-64/+232
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-019-64/+232
| | |\
| | | * Add the conversion in-place for QPixmap::fromImageReader() on raster.Benjamin Poulain2010-06-302-0/+12
| | | * Add QPixmap::fromImageReader() to decode arbitrary images in place.Benjamin Poulain2010-06-304-1/+35
| | | * Fixed some potential index-out-of-bounds issues in QImage.Kim Motoyoshi Kalland2010-06-241-4/+22
| | | * Fixed missing copy of raster pixmap data after change fb76a872e20bd.Samuel Rødal2010-06-232-0/+6
| | | * Fixed QPixmap::toImage() bug introduced in fb76a872e20bd.Samuel Rødal2010-06-231-0/+10
| | | * Optimized sub-rect copying / painting of QPixmaps.Samuel Rødal2010-06-236-59/+147
| * | | Avkon removal configured with -no-s60mread2010-07-011-2/+2
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-062-7/+7
|\ \ \ | |/ / |/| |
| * | Make qt_pixmap_serial thread-safe.Trond Kjernåsen2010-07-021-6/+6
| * | Add an application attribute to control XInitThreads().Trond Kjernåsen2010-07-021-2/+1
| * | More work on GL threading.Trond Kjernåsen2010-07-021-0/+1
* | | Reformat whitespace according to coding styleMark Brand2010-06-302-3/+3
| |/ |/|
* | Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-204-95/+399
* | Don't do opaque detection when copying a sub-rect of a QPixmap.Samuel Rødal2010-06-171-1/+1
* | Optimized QPixmap::fromImage for raster pixmaps.Samuel Rødal2010-06-171-3/+16
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-163-7/+16
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-7/+16
| |\ \