fix evaluation order bug (patch 1158099)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -115,10 +115,9 @@ const wxChar* wxURI::Create(const wxString& uri)
|
|||||||
|
|
||||||
wxChar wxURI::TranslateEscape(const wxChar* s)
|
wxChar wxURI::TranslateEscape(const wxChar* s)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
|
wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!"));
|
||||||
|
|
||||||
//<<4 == 16
|
return (wxChar)( CharToHex(s[0]) << 4 ) | CharToHex(s[1]);
|
||||||
return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxURI::Unescape(const wxString& uri)
|
wxString wxURI::Unescape(const wxString& uri)
|
||||||
|
Reference in New Issue
Block a user