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/hextileDecode.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/hextileDecode.h')
| -rw-r--r-- | common/rfb/hextileDecode.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/common/rfb/hextileDecode.h b/common/rfb/hextileDecode.h index 77befc7d..7aa04d91 100644 --- a/common/rfb/hextileDecode.h +++ b/common/rfb/hextileDecode.h @@ -69,13 +69,9 @@ void HEXTILE_DECODE (const Rect& r, rdr::InStream* is, PIXEL_T* buf if (tileType & hextileBgSpecified) bg = is->READ_PIXEL(); -#ifdef FAVOUR_FILL_RECT - FILL_RECT(t, bg); -#else int len = t.area(); PIXEL_T* ptr = (PIXEL_T*)buf; while (len-- > 0) *ptr++ = bg; -#endif if (tileType & hextileFgSpecified) fg = is->READ_PIXEL(); @@ -91,14 +87,6 @@ void HEXTILE_DECODE (const Rect& r, rdr::InStream* is, PIXEL_T* buf int xy = is->readU8(); int wh = is->readU8(); -#ifdef FAVOUR_FILL_RECT - Rect s; - s.tl.x = t.tl.x + ((xy >> 4) & 15); - s.tl.y = t.tl.y + (xy & 15); - s.br.x = s.tl.x + ((wh >> 4) & 15) + 1; - s.br.y = s.tl.y + (wh & 15) + 1; - FILL_RECT(s, fg); -#else int x = ((xy >> 4) & 15); int y = (xy & 15); int w = ((wh >> 4) & 15) + 1; @@ -110,12 +98,9 @@ void HEXTILE_DECODE (const Rect& r, rdr::InStream* is, PIXEL_T* buf while (len-- > 0) *ptr++ = fg; ptr += rowAdd; } -#endif } } -#ifndef FAVOUR_FILL_RECT IMAGE_RECT(t, buf); -#endif } } } |