← Back to branch summary

~ubuntu-branches/ubuntu/precise/qt4-x11/precise-proposed

« back to all changes in this revision

Viewing changes to src/gui/image/qpixmap_x11.cpp

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-09-29 13:31:46 UTC
  • Revision ID: package-import@ubuntu.com-20110929133146-r3ozrkjk4aywnesy
Tags: 4:4.7.4-0ubuntu7
https://launchpad.net/bugs/804784
https://launchpad.net/bugs/805587
* debian/patches/kubuntu_96_fix_qml_crash.diff:
  - unity-2d-panel crashed with SIGSEGV in QPainter::drawTiledPixmap()
    (LP: #804784)
  - unity-2d-launcher crashed with SIGSEGV in QPainter::fillRect()
    (LP: #805587)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/image/qpixmap_x11.cpp
897
897
                    }
898
898
                    )
899
899
                    break;
900
 
            case BPP24_888:                        // 24 bit MSB
 
900
            case BPP24_888:
901
901
                CYCLE(
902
 
                    for (int x=0; x<w; x++) {
903
 
                        *dst++ = qRed  (*p);
904
 
                        *dst++ = qGreen(*p);
905
 
                        *dst++ = qBlue (*p++);
 
902
                    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
 
903
                        for (int x=0; x<w; x++) {
 
904
                            *dst++ = qRed  (*p);
 
905
                            *dst++ = qGreen(*p);
 
906
                            *dst++ = qBlue (*p++);
 
907
                        }
 
908
                    } else {
 
909
                        for (int x=0; x<w; x++) {
 
910
                            *dst++ = qBlue (*p);
 
911
                            *dst++ = qGreen(*p);
 
912
                            *dst++ = qRed  (*p++);
 
913
                        }
906
914
                    }
907
915
                    )
908
916
                    break;