diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/kernel/qpixmap_x11.cpp | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qpixmap_x11.cpp')
| -rw-r--r-- | src/kernel/qpixmap_x11.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 4040b055a..2322214cc 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -422,7 +422,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) optim = defOptim; data = new TQPixmapData; - Q_CHECK_PTR( data ); + TQ_CHECK_PTR( data ); memset( data, 0, sizeof(TQPixmapData) ); data->count = 1; @@ -747,7 +747,7 @@ TQImage TQPixmap::convertToImage() const xi = XGetImage( x11Display(), hd, 0, 0, w, h, AllPlanes, mono ? XYPixmap : ZPixmap ); } - Q_CHECK_PTR( xi ); + TQ_CHECK_PTR( xi ); if (!xi) return image; // null image @@ -1180,7 +1180,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) int ibpl = image.bytesPerLine(); if ( image.bitOrder() == TQImage::BigEndian || bpl != ibpl ) { tmp_bits = new uchar[bpl*h]; - Q_CHECK_PTR( tmp_bits ); + TQ_CHECK_PTR( tmp_bits ); bits = (char *)tmp_bits; uchar *p, *b, *end; uint y, count; @@ -1287,7 +1287,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) return false; if( newbits == NULL ) newbits = (uchar *)malloc( xi->bytes_per_line*h ); - Q_CHECK_PTR( newbits ); + TQ_CHECK_PTR( newbits ); if ( !newbits ) // no memory return FALSE; int bppc = xi->bits_per_pixel; @@ -1614,7 +1614,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) newbits = (uchar *)malloc( nbytes ); // copy image into newbits newbits_size = nbytes; - Q_CHECK_PTR( newbits ); + TQ_CHECK_PTR( newbits ); if ( !newbits ) // no memory return FALSE; uchar* p = newbits; @@ -1650,7 +1650,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) PIX *px = &pixarr[0]; int maxpop = 0; int maxpix = 0; - Q_CHECK_PTR( pixarr ); + TQ_CHECK_PTR( pixarr ); uint j = 0; TQRgb* ctable = image.colorTable(); for ( i=0; i<256; i++ ) { // init pixel array @@ -1743,7 +1743,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) int p2inc = xi->bytes_per_line/sizeof(ushort); ushort *newerbits = (ushort *)malloc( xi->bytes_per_line * h ); newbits_size = xi->bytes_per_line * h; - Q_CHECK_PTR( newerbits ); + TQ_CHECK_PTR( newerbits ); if ( !newerbits ) // no memory return FALSE; uchar* p = newbits; @@ -1868,7 +1868,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if( axi->data==NULL ) { // the data is deleted by qSafeXDestroyImage axi->data = (char *) malloc(h * axi->bytes_per_line); - Q_CHECK_PTR( axi->data ); + TQ_CHECK_PTR( axi->data ); } char *aptr = axi->data; @@ -2075,8 +2075,8 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const return *this; // identity matrix scaledHeight = matrix.m22()*hs; scaledWidth = matrix.m11()*ws; - h = TQABS( qRound( scaledHeight ) ); - w = TQABS( qRound( scaledWidth ) ); + h = TQABS( tqRound( scaledHeight ) ); + w = TQABS( tqRound( scaledWidth ) ); } else { // rotation or shearing TQPointArray a( TQRect(0,0,ws+1,hs+1) ); a = mat.map( a ); @@ -2142,7 +2142,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const } else { #endif dptr = (uchar *)malloc( dbytes ); // create buffer for bits - Q_CHECK_PTR( dptr ); + TQ_CHECK_PTR( dptr ); if ( depth1 ) // fill with zeros memset( dptr, 0, dbytes ); else if ( bpp == 8 ) // fill with background color @@ -2243,7 +2243,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const bpp = axi->bits_per_pixel; dbytes = dbpl * h; dptr = (uchar *) malloc(dbytes); - Q_CHECK_PTR( dptr ); + TQ_CHECK_PTR( dptr ); memset(dptr, 0, dbytes); if ( axi->bitmap_bit_order == MSBFirst ) type = QT_XFORM_TYPE_MSBFIRST; |