projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.4
[fms.git]
/
src
/
charsetconverter.cpp
diff --git
a/src/charsetconverter.cpp
b/src/charsetconverter.cpp
index
97ba594
..
9e4ff6f
100644
(file)
--- a/
src/charsetconverter.cpp
+++ b/
src/charsetconverter.cpp
@@
-39,6
+39,7
@@
const bool CharsetConverter::SetConversion(const std::string &fromcharset, const
{
\r
m_fromcharset="";
\r
m_tocharset="";
\r
{
\r
m_fromcharset="";
\r
m_tocharset="";
\r
+ return false;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-48,7
+49,7
@@
const bool CharsetConverter::Convert(const std::string &input, std::string &outp
{
\r
std::vector<char> invec(input.begin(),input.end());
\r
std::vector<char> outvec(invec.size()*4,0);
\r
{
\r
std::vector<char> invec(input.begin(),input.end());
\r
std::vector<char> outvec(invec.size()*4,0);
\r
-#if defined(_WIN32) || defined(__APPLE__) || defined(__DARWIN__)
\r
+#if defined(_WIN32)
//
|| defined(__APPLE__) || defined(__DARWIN__)
\r
const char *inptr=&invec[0];
\r
#else
\r
char *inptr=&invec[0];
\r
const char *inptr=&invec[0];
\r
#else
\r
char *inptr=&invec[0];
\r
@@
-56,6
+57,7
@@
const bool CharsetConverter::Convert(const std::string &input, std::string &outp
char *outptr=&outvec[0];
\r
size_t insize=invec.size();
\r
size_t outsize=outvec.size();
\r
char *outptr=&outvec[0];
\r
size_t insize=invec.size();
\r
size_t outsize=outvec.size();
\r
+
\r
size_t rval=0;
\r
\r
rval=iconv(m_iconv,&inptr,&insize,&outptr,&outsize);
\r
size_t rval=0;
\r
\r
rval=iconv(m_iconv,&inptr,&insize,&outptr,&outsize);
\r
@@
-65,6
+67,7
@@
const bool CharsetConverter::Convert(const std::string &input, std::string &outp
outvec.resize(outptr-&outvec[0]);
\r
output="";
\r
output.append(outvec.begin(),outvec.end());
\r
outvec.resize(outptr-&outvec[0]);
\r
output="";
\r
output.append(outvec.begin(),outvec.end());
\r
+ return true;
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r