summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/qpixmap_x11.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 897dd4cfd..0eb1cf044 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;