summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-4/+5
|\
| * Fix compilation with Sun CC 5.9: it was crashing with this code.Thiago Macieira2009-12-041-4/+5
| | | | | | | | | | | | Definitely a compiler bug. Reviewed-by: Kent Hansen
* | Merge branch '4.6'Thiago Macieira2009-12-023-25/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Fix crash in qt3support QPixmap constructorGunnar Sletta2009-12-011-2/+2
| | | | | | | | Reviewed-by: Trond
| * Fixed memory leak in QImagePixmapCleanupHooks.Kim Motoyoshi Kalland2009-11-272-23/+8
| | | | | | | | | | | | | | | | The QImagePixmapCleanupHooks instance was never deleted. Fixed by making it a Q_GLOBAL_STATIC. Task-number: QTBUG-6116 Reviewed-by: Trond
* | Merge branch '4.6'Thiago Macieira2009-11-258-29/+52
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Fixes: Fuzzy standard icons with Ubuntu Humanity themeJens Bache-Wiig2009-11-231-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6121 RevBy: thorbjorn Details: This icon theme is a bit special in that it uses svg icons even for fixed size entries such as 16x16 icons. An optimization in the icon loader explicitly ignores svgs for such entries so we simply have to remove this check. In addition the actualSize had to be altered to never return a size bigger than the requested size. Otherwise certain menu elements will be bigger than intended.
| * Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 ↵Simon Hausmann2009-11-231-0/+2
| |\ | | | | | | | | | into 4.6
| | * Marking the shmid segment to be destroyed. It prevents leaks when the app ↵Simone Fiorentino2009-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | crashes Merge-request: 2080 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-192-0/+7
| |/ | | | | | | | | | | | | Missing virtual function now implemented Task-number: QTBUG-5977 Reviewed-by: axis
| * Fixed a crash on Mac in QPixmap when loading pixmaps of different sizes.Trond Kjernåsen2009-11-172-3/+5
| | | | | | | | | | | | | | | | The size of the original pixmap data block wasn't retained, which would result in out-of-bound reads in the memcpy() call. Task-number: QTBUG-5070 Reviewed-by: Kim
| * Fixed a crash in QPixmap::fromImage() when passing in a null image.Trond Kjernåsen2009-11-161-0/+5
| | | | | | | | | | Task-number: QTBUG-5840 Reviewed-by: Kim
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-132-4/+10
| |\
| | * Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-131-1/+1
| | |\
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-122-4/+10
| | |\ \ | | | | | | | | | | | | | | | 4.6-staging2
| | | * | Fix to symbian transparent window backing store format.Jani Hautakangas2009-11-112-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian semi-transparent window surface needs backing store pixmap in argb32 format. Normally QPixmap contains only rgb32 or argb32_pre pixels. This fix locks semi-transparent window backing store pixmap to argb32 format. Reviewed-by: Shane Kearns
| | | * | Revert "Using qreal more consistently in code (prevent misuse of double)"Aleksandar Sasha Babic2009-11-116-28/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 676780d515cedca85829ae962e4f501c5e5b6581. Conflicts: src/gui/painting/qblendfunctions.cpp
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-11-102-13/+13
| | | |\ \
| | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-11-1016-100/+155
| | | |\ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-091-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qblendfunctions.cpp
| | | * | | | | Using qreal more consistently in code (prevent misuse of double)Aleksandar Sasha Babic2009-11-066-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to force use of qreal where possible. This can lead to better performance on platforms where qreal -> float (i.e. ARM). To achieve this we: 1. changed from 'double' to 'qreal', where justified 2. using qreal() to intialize constants, where justified 3. adding helper functions that are overloaded for qreal like qAtan2(), qAcos(), qFabs() ... 4. defining QT_USE_MATH_H_FLOATS for Symbian platform In addtion we used opportunity to improve code with some small things 5. converting divisions to multiplications (i.e. '/ 2.0' -> '* qreal(0.5)') 6. defining new constants (i.e. 'Q_PI / 180.0' -> 'Q_PI180') 7. declaring variables as 'const', where justified Reviewed-by: Andreas Aardal Hanssen Reviewed-by: Gunnar Sletta Reviewed-by: Jan-Arve Reviewed-by: Kim Motoyoshi Kalland Reviewed-by: Alessandro Portale Reviewed-by: Janne Koskinen
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-1318-114/+169
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | | | | | | Fixed QPixmapDropShadowFilter and updated its testcaseGunnar Sletta2009-11-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reivewed-by: Samuel
| * | | | | | | Fixed dropshadow raster implementation since rewriteGunnar Sletta2009-11-091-4/+9
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | | | | Merge branch '4.6'Thiago Macieira2009-11-132-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix typo in license headerAlessandro Portale2009-11-121-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The word 'module' was missing. Reviewed-By: TrustMe
| * | | | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Fixed QPixmap::grabWidget() on widgets that have not yet been shown.Kim Motoyoshi Kalland2009-11-121-2/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where QPixmap::grabWidget() would return a pixmap of a different size that the widget if the widget had not yet been shown or resized. Updated the qpixmap autotest. Task-number: QTBUG-4149 Reviewed-by: Trond
* | | | Improvements to graphics effects API after review round.Samuel Rødal2009-11-102-13/+13
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
* | | API review: Rename numCols() -> colorCount()Marius Storm-Olsen2009-11-063-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The name numCols is ambiguous, as sometimes it's refering to the number of columns, and sometimes the number of colors. It also does not match the typical Qt naming convention *Count(). Reviewed-by: Tom Cooksey Reviewed-by: Andreas Aardal Hanssen
* | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-0614-99/+141
|/ / | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-063-1/+6
|\ \ | |/
| * Merge branch 'graphicseffect' into 4.6Jørgen Lind2009-11-052-0/+5
| |\
| | * Add QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-042-0/+5
| | | | | | | | | | | | | | | | | | | | | It depends on QT_NO_GRAPHICSVIEW for now, but it is possible to remove this dependency. Reviewed-by: paul
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-042-3/+4
| |\ \ | | |/
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/gui/kernel/qgesture.cpp
| | * | Doc: fix broken link in QBitmapAndy Nichols2009-11-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Pierre
* | | | Fixed crash in QPixmap::resize_helper on mac and x11Gunnar Sletta2009-11-051-2/+2
| |_|/ |/| | | | | | | | Reviewed-by: Trond
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-041-12/+12
|\ \ \ | |/ /
| * | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6-s60' into 4.6axis2009-11-041-11/+11
| |\ \
| | * | Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was caused by S60 closing a handle under our feet when QApplication is destroyed. To avoid this, we open our own handle for the global lock instead of using the shared one inside CFbsBitmap. Also the global unlock/relock is not needed on S60 3.2 so this can be eliminated and save a few cycles (the function call was a no-op before) Reviewed-by: Jani Hautakangas
* | | Fixed crash with nullptr in QPixmapData::transformedGunnar Sletta2009-11-041-2/+2
| | | | | | | | | | | | Reviewed-By: Trond
* | | Fixed crash when QImage::createAlphaMask() runs out of memoryGunnar Sletta2009-11-041-1/+2
|/ / | | | | | | Reviewed-by: Trond
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-041-1/+0
|\ \
| * | QGtkStyle refactoringRobert Griebl2009-11-031-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-031-4/+8
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-032-8/+15
| |\ \
| * | | Fixed crash in QPixmap::fromImage with an Indexed8 without a colortable.Gunnar Sletta2009-11-031-4/+8
| | | | | | | | | | | | | | | | Reviewed-by: Trond
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-035-13/+26
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
generated by cgit v0.12 at 2025-01-10 13:25:20 (GMT)