godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed iconv dependency from pe_bliss

Browse Source
This commit is contained in:
Juan Linietsky 2015-11-19 11:15:32 -03:00
parent fd5ee87c24
commit b7a1599845
2 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/pe_bliss/SCsub
View File

@ -1,6 +1,5 @@
Import('env') Import('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")
env.Append(LIBS=["iconv"])
Export('env') Export('env')

44
tools/pe_bliss/utils.cpp
View File

@ -23,9 +23,6 @@
#include "utils.h" #include "utils.h"
#include "pe_exception.h" #include "pe_exception.h"
#ifndef PE_BLISS_WINDOWS
#include <iconv.h>
#endif
namespace pe_bliss namespace pe_bliss
{ {
@ -50,22 +47,13 @@ const u16string pe_utils::to_ucs2(const std::wstring& str)
if(str.empty()) if(str.empty())
return ret; return ret;
ret.resize(str.length()); int len = str.length();
iconv_t conv = iconv_open("UCS-2", "WCHAR_T");
if(conv == reinterpret_cast<iconv_t>(-1))
throw pe_exception("Error opening iconv", pe_exception::encoding_convertion_error);
size_t inbytesleft = str.length() * sizeof(wchar_t);
size_t outbytesleft = ret.length() * sizeof(unicode16_t);
const wchar_t* in_pos = str.c_str();
unicode16_t* out_pos = &ret[0];
size_t result = iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
iconv_close(conv);
if(result == static_cast<size_t>(-1)) ret.resize(len);
throw pe_exception("Iconv error", pe_exception::encoding_convertion_error);
for(int i=0;i<len;i++) {
ret[i]=str[i]&0xFFFF;
}
return ret; return ret;
} }
@ -76,22 +64,12 @@ const std::wstring pe_utils::from_ucs2(const u16string& str)
if(str.empty()) if(str.empty())
return ret; return ret;
int len = str.length();
ret.resize(str.length()); ret.resize(str.length());
iconv_t conv = iconv_open("WCHAR_T", "UCS-2"); for(int i=0;i<len;i++) {
if(conv == reinterpret_cast<iconv_t>(-1)) ret[i]=str[i];
throw pe_exception("Error opening iconv", pe_exception::encoding_convertion_error); }
size_t inbytesleft = str.length() * sizeof(unicode16_t);
size_t outbytesleft = ret.length() * sizeof(wchar_t);
const unicode16_t* in_pos = str.c_str();
wchar_t* out_pos = &ret[0];
size_t result = iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
iconv_close(conv);
if(result == static_cast<size_t>(-1))
throw pe_exception("Iconv error", pe_exception::encoding_convertion_error);
return ret; return ret;
} }