summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-03-17 13:32:08 +0100
committerChristian Beier <dontmind@freeshell.org>2011-03-17 13:32:08 +0100
commit56234cd0b656de3c8827288f2adf78c9cb12d0c5 (patch)
tree0b01c1373a38f8ace1f22ba039e25e7de7e66479
parentbf2470cec69ab00f7213aa136f5a2d486c9da17a (diff)
downloadlibvncserver-56234cd0b656de3c8827288f2adf78c9cb12d0c5.zip
libvncserver-56234cd0b656de3c8827288f2adf78c9cb12d0c5.tar.gz
Fix remaining compiler warnings.
-rw-r--r--examples/rotate.c7
-rw-r--r--examples/zippy.c6
-rw-r--r--libvncserver/zrle.c3
-rw-r--r--libvncserver/zrleencodetemplate.c6
4 files changed, 4 insertions, 18 deletions
diff --git a/examples/rotate.c b/examples/rotate.c
index 66fca80..e552e4a 100644
--- a/examples/rotate.c
+++ b/examples/rotate.c
@@ -2,13 +2,6 @@
#include <rfb/rfb.h>
#include <rfb/keysym.h>
-static int gcd(int x, int y)
-{
- if (x == 0)
- return y;
- return gcd((y % x), x);
-}
-
#define CONCAT2(a,b) a##b
#define CONCAT2E(a,b) CONCAT2(a,b)
#define CONCAT3(a,b,c) a##b##c
diff --git a/examples/zippy.c b/examples/zippy.c
index 4f793a9..5a5961a 100644
--- a/examples/zippy.c
+++ b/examples/zippy.c
@@ -13,6 +13,8 @@ static int maxx=400, maxy=400, bpp=4;
void blank_framebuffer(char* frame_buffer, int x1, int y1, int x2, int y2);
/* displays a red bar, a green bar, and a blue bar */
void draw_primary_colors (char* frame_buffer, int x1, int y1, int x2, int y2);
+void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2);
+void draw_primary_colours_generic_fast(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2);
void linecount (char* frame_buffer);
/* handles mouse events */
void on_mouse_event (int buttonMask,int x,int y,rfbClientPtr cl);
@@ -76,7 +78,7 @@ void draw_primary_colors (char* frame_buffer, int x1, int y1, int x2, int y2)
}
/* Dscho's versions (slower, but works for bpp != 3 or 4) */
-static void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
+void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
{
rfbPixelFormat f=s->serverFormat;
int i,j;
@@ -90,7 +92,7 @@ static void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2
rfbDrawPixel(s,i,j,f.blueMax<<f.blueShift);
}
-static void draw_primary_colours_generic_fast(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
+void draw_primary_colours_generic_fast(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
{
rfbPixelFormat f=s->serverFormat;
int i,j,y3=(y1*2+y2)/3,y4=(y1+y2*2)/3;
diff --git a/libvncserver/zrle.c b/libvncserver/zrle.c
index e1f1447..80f629c 100644
--- a/libvncserver/zrle.c
+++ b/libvncserver/zrle.c
@@ -96,9 +96,6 @@
* data.
*/
-/* TODO: put into rfbClient struct */
-
-static char zrleBeforeBuf[rfbZRLETileWidth * rfbZRLETileHeight * 4 + 4];
/*
* rfbSendRectEncodingZRLE - send a given rectangle using ZRLE encoding.
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) {
OpenPOWER on IntegriCloud