diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-01-28 16:41:29 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-07-07 13:27:07 +0200 |
| commit | cf4255e1a0b1c64f7f2d3f1405ce0142b3460e79 (patch) | |
| tree | 12e64f77d811cd4c05e32a4a957563635c8b74e6 /common/rfb/zrleDecode.h | |
| parent | 867bd12a4f4048b6fc71eb9e966a30366a60b7ca (diff) | |
| download | tigervnc-cf4255e1a0b1c64f7f2d3f1405ce0142b3460e79.tar.gz tigervnc-cf4255e1a0b1c64f7f2d3f1405ce0142b3460e79.zip | |
Remove unused alternative code path from the ZRLE and Hextile decoders
Diffstat (limited to 'common/rfb/zrleDecode.h')
| -rw-r--r-- | common/rfb/zrleDecode.h | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/common/rfb/zrleDecode.h b/common/rfb/zrleDecode.h index 8f6f7927..d26d4d3e 100644 --- a/common/rfb/zrleDecode.h +++ b/common/rfb/zrleDecode.h @@ -121,12 +121,6 @@ void ZRLE_DECODE (const Rect& r, rdr::InStream* is, } } -#ifdef FAVOUR_FILL_RECT - //fprintf(stderr,"copying data to screen %dx%d at %d,%d\n", - //t.width(),t.height(),t.tl.x,t.tl.y); - IMAGE_RECT(t,buf); -#endif - } else { if (palSize == 0) { @@ -149,36 +143,7 @@ void ZRLE_DECODE (const Rect& r, rdr::InStream* is, throw Exception ("ZRLE decode error"); } -#ifdef FAVOUR_FILL_RECT - int i = ptr - buf; - ptr += len; - - int runX = i % t.width(); - int runY = i / t.width(); - - if (runX + len > t.width()) { - if (runX != 0) { - FILL_RECT(Rect(t.tl.x+runX, t.tl.y+runY, t.width()-runX, 1), - pix); - len -= t.width()-runX; - runX = 0; - runY++; - } - - if (len > t.width()) { - FILL_RECT(Rect(t.tl.x, t.tl.y+runY, t.width(), len/t.width()), - pix); - runY += len / t.width(); - len = len % t.width(); - } - } - - if (len != 0) { - FILL_RECT(Rect(t.tl.x+runX, t.tl.y+runY, len, 1), pix); - } -#else while (len-- > 0) *ptr++ = pix; -#endif } } else { @@ -207,45 +172,14 @@ void ZRLE_DECODE (const Rect& r, rdr::InStream* is, PIXEL_T pix = palette[index]; -#ifdef FAVOUR_FILL_RECT - int i = ptr - buf; - ptr += len; - - int runX = i % t.width(); - int runY = i / t.width(); - - if (runX + len > t.width()) { - if (runX != 0) { - FILL_RECT(Rect(t.tl.x+runX, t.tl.y+runY, t.width()-runX, 1), - pix); - len -= t.width()-runX; - runX = 0; - runY++; - } - - if (len > t.width()) { - FILL_RECT(Rect(t.tl.x, t.tl.y+runY, t.width(), len/t.width()), - pix); - runY += len / t.width(); - len = len % t.width(); - } - } - - if (len != 0) { - FILL_RECT(Rect(t.tl.x+runX, t.tl.y+runY, len, 1), pix); - } -#else while (len-- > 0) *ptr++ = pix; -#endif } } } -#ifndef FAVOUR_FILL_RECT //fprintf(stderr,"copying data to screen %dx%d at %d,%d\n", //t.width(),t.height(),t.tl.x,t.tl.y); IMAGE_RECT(t,buf); -#endif } } |