From 1676a1941a6bf74fd549c81f76190f6a7546c289 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 5 Nov 2004 20:49:37 +0000 Subject: [PATCH] Still needs a typecasting to please warning about loosing bits. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/uri.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 0d181449c1..c251d92326 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -117,7 +117,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s) { wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!")); - return CharToHex(*s) * 0x10 + CharToHex(*++s); + return (wxChar)( CharToHex(*s) * 0x10 ) | CharToHex(*++s); } wxString wxURI::Unescape(const wxString& uri) @@ -1152,9 +1152,9 @@ bool wxURI::ParseIPvFuture(const wxChar*& uri) //static wxChar wxURI::CharToHex(const wxChar& c) { - if ((c >= wxT('A')) && (c <= wxT('Z'))) return c - wxT('A') + 0x0A; - if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a; - if ((c >= wxT('0')) && (c <= wxT('9'))) return c - wxT('0') + 0x00; + if ((c >= wxT('A')) && (c <= wxT('Z'))) return wxChar(c - wxT('A') + 0x0A); + if ((c >= wxT('a')) && (c <= wxT('z'))) return wxChar(c - wxT('a') + 0x0a); + if ((c >= wxT('0')) && (c <= wxT('9'))) return wxChar(c - wxT('0') + 0x00); return 0; } -- 2.45.2