diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 15:46:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 15:46:44 (GMT) |
| commit | 591131dca30622a2f7cd8e994a826384115edc84 (patch) | |
| tree | 1e89d1047ae3809d328743de2961c840f39561dd /src/gui/painting/qdrawingprimitive_sse2_p.h | |
| parent | 5de30ecf4c28279fe8eed0ed8cb53504eb1350d7 (diff) | |
| parent | 65e0fe383bba7b75e3ff5f8dd1bf3bb61a8bc589 (diff) | |
| download | Qt-591131dca30622a2f7cd8e994a826384115edc84.zip Qt-591131dca30622a2f7cd8e994a826384115edc84.tar.gz Qt-591131dca30622a2f7cd8e994a826384115edc84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Merge request: 1111
Doc: inform better about how you can tweak Qt apps on Mac
Mac: add support for closing dialogs using Cmd-D
Cocoa: use mouse location from event
Cocoa: implement eventdispatcher flag excludeUserInputEvents
Cocoa: processEvents does not always send posted events
Added QMdiArea::tabsMovable and tabsClosable
Enable the widthForHeight() test case.
Fix some wrong tests in heightForWidth()
Fix and enable the tests that were disabled.
Fixed a double selection in QFileDialog when saving
fix qFadeEffect windowOpacity issue on Windows
Cleanup unused QAccessWidget
Fixed a problem with toolbars not relayouting
Compile fix on solaris
Autotest illustrating Qt::InitialSortOrderRole
Mention when the role was introduced
Add a way to set QHeaderView initial sort order
Doc: Fixing typo
Diffstat (limited to 'src/gui/painting/qdrawingprimitive_sse2_p.h')
| -rw-r--r-- | src/gui/painting/qdrawingprimitive_sse2_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h index 2d61cc5..d8793c3 100644 --- a/src/gui/painting/qdrawingprimitive_sse2_p.h +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE pixelVectorAG = _mm_mullo_epi16(pixelVectorAG, alphaChannel); \ pixelVectorRB = _mm_mullo_epi16(pixelVectorRB, alphaChannel); \ \ - /* 3. devide by 255, that's the tricky part. \ + /* 3. divide by 255, that's the tricky part. \ we do it like for BYTE_MUL(), with bit shift: X/255 ~= (X + X/256 + rounding)/256 */ \ /** so first (X + X/256 + rounding) */\ pixelVectorRB = _mm_add_epi16(pixelVectorRB, _mm_srli_epi16(pixelVectorRB, 8)); \ @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE pixelVectorAG = _mm_add_epi16(pixelVectorAG, _mm_srli_epi16(pixelVectorAG, 8)); \ pixelVectorAG = _mm_add_epi16(pixelVectorAG, half); \ \ - /** second devide by 256 */\ + /** second divide by 256 */\ pixelVectorRB = _mm_srli_epi16(pixelVectorRB, 8); \ /** for AG, we could >> 8 to divide followed by << 8 to put the \ bytes in the correct position. By masking instead, we execute \ |