1607N/A[Subset of upstream patch that applies to TigerVNC 1.1 and is needed to

1607N/A silence Solaris Studio C++ compiler errors of: "TXWindow.cxx", line 93:

1607N/A Error: Narrowing conversion of 'int' value to 'char' is not allowed here.]

1607N/A

1607N/AFrom a9af1f12466e201fed5a72bbba2607fb55f7e042 Mon Sep 17 00:00:00 2001

1607N/AFrom: Pierre Ossman <ossman@cendio.se>

1607N/ADate: Wed, 17 Jun 2015 10:47:28 +0200

1607N/ASubject: [PATCH] Fix some bad signed/unsigned mismatches

1607N/A

1607N/A---

1607N/A common/rfb/VNCSConnectionST.h | 2 +-

1607N/A unix/tx/TXWindow.cxx | 8 ++++----

1607N/A vncviewer/parameters.cxx | 4 ++--

1607N/A win/rfb_win32/SInput.cxx | 2 +-

1607N/A 4 files changed, 8 insertions(+), 8 deletions(-)

1607N/A

1607N/Adiff --git a/unix/tx/TXWindow.cxx b/unix/tx/TXWindow.cxx

1607N/Aindex 1f69702..a681917 100644

1607N/A--- a/unix/tx/TXWindow.cxx

1607N/A+++ b/unix/tx/TXWindow.cxx

1607N/A@@ -89,11 +89,11 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_)

1607N/A XSetFont(dpy, defaultGC, defaultFont);

1607N/A XSelectInput(dpy, DefaultRootWindow(dpy), PropertyChangeMask);

1607N/A

1607N/A- static char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06};

1607N/A- dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), dotBits,

1607N/A+ static unsigned char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06};

1607N/A+ dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)dotBits,

1607N/A dotSize, dotSize);

1607N/A- static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};

1607N/A- tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits,

1607N/A+ static unsigned char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};

1607N/A+ tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)tickBits,

1607N/A tickSize, tickSize);

1607N/A defaultWindowClass = rfb::strDup(defaultWindowClass_);

1607N/A }