diff options
| -rw-r--r-- | src/kernel/qimage.cpp | 12 | ||||
| -rw-r--r-- | src/kernel/qpixmap_x11.cpp | 4 | ||||
| -rw-r--r-- | src/kernel/qwidget_x11.cpp | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 059b5bafc..a22b744a9 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -1531,12 +1531,12 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl int* line2[3]; int* pv[3]; if ( ( conversion_flags & TQt::Dither_Mask ) == TQt::DiffuseDither ) { - line1[0] = new int[src->width()]; - line2[0] = new int[src->width()]; - line1[1] = new int[src->width()]; - line2[1] = new int[src->width()]; - line1[2] = new int[src->width()]; - line2[2] = new int[src->width()]; + line1[0] = new int[sw]; + line2[0] = new int[sw]; + line1[1] = new int[sw]; + line2[1] = new int[sw]; + line1[2] = new int[sw]; + line2[2] = new int[sw]; pv[0] = new int[sw]; pv[1] = new int[sw]; pv[2] = new int[sw]; diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index cc9c211c4..00564b33c 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -764,6 +764,7 @@ TQImage TQPixmap::convertToImage() const else #endif qSafeXDestroyImage( xi ); + ((TQPixmap*)this)->data->ximage = 0; return image; } @@ -947,7 +948,8 @@ TQImage TQPixmap::convertToImage() const qt_XShmDestroyImage( xi, &shminfo ); else #endif - qSafeXDestroyImage( xi ); + qSafeXDestroyImage( xi ); + ((TQPixmap*)this)->data->ximage = 0; return image; } diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 8e9cc3abc..8e0fee271 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -1336,7 +1336,6 @@ void TQWidget::setIcon( const TQPixmap &pixmap ) int r = int( tqRed( l ) ); int g = int( tqGreen( l ) ); int b = int( tqBlue( l ) ); - ls[x] = tqRgb( r, g, b ); XSetForeground(x11Display(), gc, (r << 16) | (g << 8) | b ); XDrawPoint(x11Display(), pmHandle, gc, x, y); } |