From 8e2cfe9a0a9f89fbbc7a651d16bbc7651dce154b Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Thu, 6 Aug 2020 18:29:56 +0900 Subject: Fix MIT_SHM related condition Prevent to build MIT_SHM related codes for !QT_MITSHM condition. Signed-off-by: OBATA Akio (cherry picked from commit ac500135785f34eebe8d9c077208a5dd0b494929) --- src/kernel/qpixmap_x11.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 0d31834ba..790f4eb82 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -1243,8 +1243,8 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) bool trucol = (visual->c_class == TrueColor || visual->c_class == DirectColor); int nbytes = image.numBytes(); uchar *newbits= 0; - int newbits_size = 0; #ifdef QT_MITSHM_CONVERSIONS + int newbits_size = 0; bool mitshm_ximage = false; XShmSegmentInfo shminfo; #endif @@ -1615,7 +1615,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } newbits = (uchar *)malloc( nbytes ); // copy image into newbits +#ifdef QT_MITSHM_CONVERSIONS newbits_size = nbytes; +#endif TQ_CHECK_PTR( newbits ); if ( !newbits ) // no memory return FALSE; @@ -1744,7 +1746,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) ushort *p2; int p2inc = xi->bytes_per_line/sizeof(ushort); ushort *newerbits = (ushort *)malloc( xi->bytes_per_line * h ); +#ifdef QT_MITSHM_CONVERSIONS newbits_size = xi->bytes_per_line * h; +#endif TQ_CHECK_PTR( newerbits ); if ( !newerbits ) // no memory return FALSE; -- cgit v1.2.3