Eliminate GCC signed/unsigned warnings related to encodings: The
encoding in the RFB protocol has always been signed, and signed values
are also used in the specification (ie DesktopName = -307 etc). In the
code, however, unsigned types were used in a number of places, but not
all, which causes warnings. This patch fixes the problem by switching
to signed values everywhere.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3968 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index af38e0f..286c701 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -769,11 +769,11 @@
}
-void CConn::beginRect(const Rect& r, unsigned int encoding) {
+void CConn::beginRect(const Rect& r, int encoding) {
sock->inStream().startTiming();
}
-void CConn::endRect(const Rect& r, unsigned int encoding) {
+void CConn::endRect(const Rect& r, int encoding) {
sock->inStream().stopTiming();
lastUsedEncoding_ = encoding;
if (debugDelay != 0) {
diff --git a/win/vncviewer/CConn.h b/win/vncviewer/CConn.h
index bf7fd06..5f75843 100644
--- a/win/vncviewer/CConn.h
+++ b/win/vncviewer/CConn.h
@@ -106,8 +106,8 @@
void setName(const char* name);
void serverInit();
void serverCutText(const char* str, rdr::U32 len);
- void beginRect(const Rect& r, unsigned int encoding);
- void endRect(const Rect& r, unsigned int encoding);
+ void beginRect(const Rect& r, int encoding);
+ void endRect(const Rect& r, int encoding);
void fillRect(const Rect& r, Pixel pix);
void imageRect(const Rect& r, void* pixels);
void copyRect(const Rect& r, int srcX, int srcY);