diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /krfb/libvncserver/tight.c | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip | |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krfb/libvncserver/tight.c')
| -rw-r--r-- | krfb/libvncserver/tight.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c index 9dd743ac..bef8f825 100644 --- a/krfb/libvncserver/tight.c +++ b/krfb/libvncserver/tight.c @@ -1239,7 +1239,7 @@ EncodeMonoRect##bpp(buf, w, h) \ { \ CARD##bpp *ptr; \ CARD##bpp bg; \ - unsigned int value, mask; \ + unsigned int value, tqmask; \ int aligned_width; \ int x, y, bg_bits; \ \ @@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \ *buf++ = 0; \ continue; \ } \ - mask = 0x80 >> bg_bits; \ - value = mask; \ + tqmask = 0x80 >> bg_bits; \ + value = tqmask; \ for (bg_bits++; bg_bits < 8; bg_bits++) { \ - mask >>= 1; \ + tqmask >>= 1; \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ } \ *buf++ = (CARD8)value; \ } \ \ - mask = 0x80; \ + tqmask = 0x80; \ value = 0; \ if (x >= w) \ continue; \ \ for (; x < w; x++) { \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ - mask >>= 1; \ + tqmask >>= 1; \ } \ *buf++ = (CARD8)value; \ } \ |