diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/kernel/qpixmap_x11.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qpixmap_x11.cpp')
| -rw-r--r-- | src/kernel/qpixmap_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index fb4168aa8..06fcaabfb 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -1459,7 +1459,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) switch ( mode ) { case BPP16_8_3_M3: CYCLE( - Q_INT16* dst16 = (Q_INT16*)dst; + TQ_INT16* dst16 = (TQ_INT16*)dst; for ( uint x=0; x<w; x++ ) { GET_PIXEL_DITHER_TC_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f,5,6,5) *dst16++ = pixel; @@ -1468,7 +1468,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) break; case BPP16_7_2_M3: CYCLE( - Q_INT16* dst16 = (Q_INT16*)dst; + TQ_INT16* dst16 = (TQ_INT16*)dst; for ( uint x=0; x<w; x++ ) { GET_PIXEL_DITHER_TC_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f,5,5,5) *dst16++ = pixel; @@ -1509,7 +1509,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) break; case BPP16_8_3_M3: CYCLE( - Q_INT16* dst16 = (Q_INT16*)dst; + TQ_INT16* dst16 = (TQ_INT16*)dst; for ( uint x=0; x<w; x++ ) { GET_PIXEL_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f) *dst16++ = pixel; @@ -1518,7 +1518,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) break; case BPP16_7_2_M3: CYCLE( - Q_INT16* dst16 = (Q_INT16*)dst; + TQ_INT16* dst16 = (TQ_INT16*)dst; for ( uint x=0; x<w; x++ ) { GET_PIXEL_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f) *dst16++ = pixel; |