diff options
| author | Pierre Ossman <ossman@cendio.se> | 2009-03-10 10:21:11 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2009-03-10 10:21:11 +0000 |
| commit | 5b39bbe78556b84a4196e9774cc1f9e1cb6a4c3a (patch) | |
| tree | b62af6b6e8bc913d8f6bfc700df4510140c34c14 /win/rfb_win32 | |
| parent | 7469386f02aa945470b80f60f5eecbb45a9a7ffb (diff) | |
| download | tigervnc-5b39bbe78556b84a4196e9774cc1f9e1cb6a4c3a.tar.gz tigervnc-5b39bbe78556b84a4196e9774cc1f9e1cb6a4c3a.zip | |
Fix some overloading ambiguity.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3654 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win/rfb_win32')
| -rw-r--r-- | win/rfb_win32/DeviceFrameBuffer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/rfb_win32/DeviceFrameBuffer.cxx b/win/rfb_win32/DeviceFrameBuffer.cxx index b1e56a3e..921e1fa5 100644 --- a/win/rfb_win32/DeviceFrameBuffer.cxx +++ b/win/rfb_win32/DeviceFrameBuffer.cxx @@ -231,7 +231,7 @@ void DeviceFrameBuffer::setCursor(HCURSOR hCursor, VNCServer* server) bool doOutline = false; if (!iconInfo.hbmColor) { - Pixel xorColour = format.pixelFromRGB(0, 0, 0, cursorBm.getColourMap()); + Pixel xorColour = format.pixelFromRGB((rdr::U16)0, (rdr::U16)0, (rdr::U16)0, cursorBm.getColourMap()); for (int y = 0; y < cursor.height(); y++) { for (int x = 0; x < cursor.width(); x++) { int byte = y * maskInfo.bmWidthBytes + x / 8; @@ -269,7 +269,7 @@ void DeviceFrameBuffer::setCursor(HCURSOR hCursor, VNCServer* server) if (doOutline) { vlog.debug("drawing cursor outline!"); memcpy(cursor.data, cursorBm.data, cursor.dataLen()); - cursor.drawOutline(format.pixelFromRGB(0xffff, 0xffff, 0xffff, cursorBm.getColourMap())); + cursor.drawOutline(format.pixelFromRGB((rdr::U16)0xffff, (rdr::U16)0xffff, (rdr::U16)0xffff, cursorBm.getColourMap())); memcpy(cursorBm.data, cursor.data, cursor.dataLen()); } |