equal
deleted
inserted
replaced
1914 int sy = qRound(sr.y()); |
1914 int sy = qRound(sr.y()); |
1915 int sw = qRound(sr.width()); |
1915 int sw = qRound(sr.width()); |
1916 int sh = qRound(sr.height()); |
1916 int sh = qRound(sr.height()); |
1917 |
1917 |
1918 QPixmap pixmap = qt_toX11Pixmap(px); |
1918 QPixmap pixmap = qt_toX11Pixmap(px); |
|
1919 if(pixmap.isNull()) |
|
1920 return; |
1919 |
1921 |
1920 if ((d->xinfo && d->xinfo->screen() != pixmap.x11Info().screen()) |
1922 if ((d->xinfo && d->xinfo->screen() != pixmap.x11Info().screen()) |
1921 || (pixmap.x11Info().screen() != DefaultScreen(X11->display))) { |
1923 || (pixmap.x11Info().screen() != DefaultScreen(X11->display))) { |
1922 QPixmap* p = const_cast<QPixmap *>(&pixmap); |
1924 QPixmap* p = const_cast<QPixmap *>(&pixmap); |
1923 p->x11SetScreen(d->xinfo ? d->xinfo->screen() : DefaultScreen(X11->display)); |
1925 p->x11SetScreen(d->xinfo ? d->xinfo->screen() : DefaultScreen(X11->display)); |