summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1775-75/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1075-75/+75
| | | | | | | | Reviewed-by: Trust Me
* | Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From fixing qwidget autotest, it seems to be the case that filling a pixmap with a solid color on mac changes the hasAlpha status. This is different from X11 (and raster engine). That is, the following code will produce different result: QPixmap pixmap(100, 100); pixmap.setAlphaChannel(QPixmap(100, 100)); qDebug() << "Has alpha after setting channel?" << pixmap.hasAlpha(); pixmap.fill(Qt::red); qDebug() << "Has alpha after fill?" << pixmap.hasAlpha(); So, this patch remove the possibility of converting an already alpha supporting pixmap to non-alpha upon fill. NB: somewhat related, the following code works the same on both x11, raster and mac (prints 'false'), but still seems wrong: QPixmap pixmap2(pixmap); qDebug() << "pixmap2 has alpha initially?" << pixmap2.hasAlpha(); Rev-By: Fabien Freling
* | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depending on platform, qBinaryFind might be up to 3 times faster than bsearch or a bit bit slower at the worst case; so why don't simply use qBinaryFind instead of bsearch and be an optimist? ;) also we know that all color names are in the lower case already and thus we can avoid lowercasing of them again and again, and again; the name to find needs to be lowercased separately instead. some color-by-name-lookup numbers: before: 0.000737 msecs per iteration (total: 3,684, iterations: 5000000) after: 0.000154 msecs per iteration (total: 771, iterations: 5000000) Merge-request: 906 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-241-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite loop in QMoviePrivate::next(). Added int overloads to QPoint operator* and operator*=. tst_qmessagebox: add debug to know why it fails QMessageBox wrong Show/Hide Details button label
| * | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | If we're unable to read the first frame, we shouldn't return an end marker, as that will cause QMoviePrivate::next() to recurse indefinitely when the playCounter is set to -1 (infinite). Reviewed-by: Olivier Goffart
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| | | | | | | | | | Task-number: QTBUG-16223 Reviewed-by: Gunnar Sletta
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-12-142-8/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits) Add expected failures for JS test suite on Symbian Ensure ListView contentHeight is set to a valid size. Revert "Add mirroring-positioners.qml example" that was accidentally pushed Fix dragging Flickable back over start point. Add mirroring-positioners.qml example A QAIM model resulted in items moving to incorrect locations Build on Symbian refuse to open empty translation files fix path separator matching fix -dont-process for mingw cross-build fix nonsense condition Fix qwidget test crash QmlViewer: Remove trailing whitespace QmlViewer: Remove trailing whitespace QmlViewer: Fix crash on exit Don't include <features.h> directly: non-standard header. Remove superfluous OpenGL linking for QtDeclarative Corrected case on Symbian library. Missing glyphs in GL when scaling QStaticText and QML text items PathView: removing the currentIndex could make it invalid. ...
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-8/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| | * Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.Samuel Rødal2010-12-071-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Calling paintEngine() can cause a deep copy since it will indirectly call the bits() function. Since we don't want to create a paint engine if it doesn't exist we should access the QImageData paintEngine variable directly instead. Reviewed-by: Olivier Goffart
| | * Make sure to do a deep copy of a QImage when it's being painted on.Samuel Rødal2010-12-062-8/+25
| | | | | | | | | | | | | | | | | | | | | Not doing so can produce some hard-to-track-down bugs in the app. Task-number: QTBUG-15749 Reviewed-by: Gunnar Sletta
* | | Corrected documentation for QImage::fill().Kim Motoyoshi Kalland2010-12-131-2/+2
|/ / | | | | | | Reviewed-by: Samuel
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-36/+48
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | | | | | | | | | Task-number: QT-4103 Reviewed-by: trustme
| * Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | | | | | | | | | Task-number: QT-4103 Reviewed-by: gunnar
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-12-022-0/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (23 commits) Restore patch that got lost in merge Fix spelling in comment Spelling mistakes in Documentation. There are probably more :) Fix spelling mistake in QEGLPlatformcontext Restore patch that disappeared in merge Make the openKODE use the new eventloopintegration api. Make QtOpenGL use shared contextexts on Lighthouse Move the Lighthouse specfic api into qpa_qpa.cpp Lighthouse: Fix QGLContext::currentContext for systems with limited Make EglFS plugin compile after changes to QPlatformEGLContext Adding some documentation for Lighthouse Lighthouse: move the currentContext functionality to QPlatformGLContext Remove QWidget::paintEngine() codepath for Lighthouse Fix transformIsSimple in QGraphicsScene Lighthouse: Make sure that we call QPlatformWindow::setVisible Lighthouse: using QFont enums when possible in QPlatformFontdatabase No more windowsurface for QGLWidget in Lighthouse Add workaround_brokenFBOReadback=true for mali Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629 Compile fix for c1148ee9a60a6fae8. ...
| * \ Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-0/+2
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1914-56/+105
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| * | | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-282-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The declaration of QCoreTextFontEngine was ifdefed in qfontengine_p.h. So was QMacFontEngine. I have moved them into their own files (qfontengine_coretext_p.h and qfontengine_mac_p.h).
* | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching from a format without alpha channel to one that has it, reuse the underlying QImage memory if the old & new color depths match. This avoids one allocation when using the rather common pattern: QPixmap pixmap(w, h); pixmap.fill(Qt::transparent); Reviewed-by: Samuel Rødal
* | | | Fix some warnings on MacJiang Jiang2010-11-221-0/+2
| |/ / |/| | | | | | | | Reviewed-by: Fabien Freling
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-2/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * | Doc: Fixing typoSergio Ahumada2010-11-092-2/+2
| | |
| * | Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some auto-tests render into a QPixmap and check the result against QPixmap::grabWidget(). Change acc1a2bd5520369c made grabWidget() render into a QImage to be able to preserve background transparency. Instead, to avoid breaking various auto-tests, we can use a QPixmap and fill it with transparent if the widget's isOpaque flag is not set. Task-number: QTBUG-14945 Reviewed-by: Kim
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-051-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | * | Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a QImage initialized with transparent to prevent any translucent parts of the widget to end up as garbage, and to ensure that the resulting QPixmap ends up with an alpha format only when needed. Task-number: QTBUG-14945 Reviewed-by: Kim
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-8/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * | | Prevent excessive seeks in xbm detectionHarald Fernengel2010-11-041-8/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When auto-detecting an image type, the xbm handler would read the entire file just to figure out that it's not an xbm. This patch limits the read to maximum 4k and also breaks if line length >= 299. Task-number: QT-4021 Reviewed-by: Robert Griebl
* | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-0310-0/+47
| | | | | | | | | | | | | | | | | | | | | For consistency. Merge-request: 871 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-029-2/+549
|\ \ \ | | |/ | |/|
| * | Fix the license in files for LighthouseJørgen Lind2010-10-282-0/+82
| | |
| * | Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORTJørgen Lind2010-10-281-2/+2
| | |
| * | Compile fix for RVCT 4Jørgen Lind2010-10-281-2/+2
| | |
| * | Fix QT_BLITTER_RASTEROVERLAY and namespace errorJørgen Lind2010-10-271-1/+2
| | | | | | | | | | | | Reviewed-by: paul
| * | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-1/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-224-2/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-055-76/+107
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-275-50/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-136-3/+68
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-3/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qgl.cpp src/opengl/qgl_p.h
| * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-198-51/+278
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-053-9/+6
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-035-19/+208
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| | * | | | | | | | | | Removed createBlittable factory function from PlatformIntegrationJørgen Lind2010-07-222-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and moved it onto QBlittablePixmap making the class abstract. The creator function was seen as to spesialised to be part of the PlatformIntegration class, and belonged to the QBlittablePixmap class anyway since that was the PixmapData type you would need to return to use the blitter api. Also removed the cross platform examples as they are more confusing than anything else. For usage of QBlittable look in the directfb platform integration plugin.
| * | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-044-18/+207
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-199-2/+469
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qgl_p.h
| | * | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1429-129/+4170
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-245-83/+400
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Refactored QGraphicsSystemCursor -> QPlatformCursorJørgen Lind2010-06-241-0/+4
| | | | | | | | | | | | | | |
generated by cgit v0.12 at 2025-03-27 02:03:32 (GMT)