diff options
author | Christian Beier <dontmind@freeshell.org> | 2011-03-28 15:13:29 +0200 |
---|---|---|
committer | Christian Beier <dontmind@freeshell.org> | 2011-03-28 15:13:29 +0200 |
commit | 471baea920773e3080b7972b93dbe091ebe3b4e0 (patch) | |
tree | f29897c140230af1ce95943baa18b89d664b8ba3 /libvncserver/zrleencodetemplate.c | |
parent | 64daa71ede302d4d0ba4174b3dcec49bf2588111 (diff) | |
parent | 62b7acf48009cfad1a54bd8ba04b662f9ac53c80 (diff) | |
download | libtdevnc-471baea920773e3080b7972b93dbe091ebe3b4e0.tar.gz libtdevnc-471baea920773e3080b7972b93dbe091ebe3b4e0.zip |
Merge branch 'master' of ssh://libvncserver.git.sourceforge.net/gitroot/libvncserver/libvncserver
Diffstat (limited to 'libvncserver/zrleencodetemplate.c')
-rw-r--r-- | libvncserver/zrleencodetemplate.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libvncserver/zrleencodetemplate.c b/libvncserver/zrleencodetemplate.c index 3a6f117..b6de755 100644 --- a/libvncserver/zrleencodetemplate.c +++ b/libvncserver/zrleencodetemplate.c @@ -84,8 +84,6 @@ static const int bitsPerPackedPixel[] = { 0, 1, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; -static zrlePaletteHelper paletteHelper; - #endif /* ZRLE_ONCE */ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os, @@ -144,11 +142,7 @@ void ZRLE_ENCODE_TILE(PIXEL_T* data, int w, int h, zrleOutStream* os, PIXEL_T* end = ptr + h * w; *end = ~*(end-1); /* one past the end is different so the while loop ends */ -#if 0 - ph = &paletteHelper; -#else ph = (zrlePaletteHelper *) paletteHelper; -#endif zrlePaletteHelperInit(ph); while (ptr < end) { |