mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Revert r3461.. on unix iconv requires const char**, however for whatever reason msvc is complaining it can't convert it to char**. I have no idea why someone on windows will have to debug it.

Browse source 
Originally committed to SVN as r3466.
This commit is contained in:
Amar Takhar 2009-09-02 09:40:52 +00:00
parent 430286cf69
commit e1a23412ac
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/charset_conv.cpp
View file

@ -131,7 +131,7 @@ size_t AegisubCSConv::GetMBNulLen() const {
char outBuff[8];
size_t inLen = sizeof(wchar_t);
size_t outLen = sizeof(outBuff);
const char * inPtr = (char *)nulStr;
char * inPtr = (char *)nulStr;
char * outPtr = outBuff;
size_t res = iconv(w2m, &inPtr, &inLen, &outPtr, &outLen);
@ -211,7 +211,7 @@ size_t AegisubCSConv::FromWChar(char *dst, size_t dstSize, const wchar_t *src, s
/// @param srcSize
/// @return
///
size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, const char *src, size_t srcSize) const {
size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, char *src, size_t srcSize) const {
if (dstSize > 0) {
return iconvWrapper(cd, &src, &srcSize, &dst, &dstSize);
}
@ -243,7 +243,7 @@ size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, const
/// @param outbytesleft
/// @return
///
size_t AegisubCSConv::iconvWrapper(iconv_t cd, const char **inbuf, size_t *inbytesleft,
size_t AegisubCSConv::iconvWrapper(iconv_t cd, char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft) const {
#if wxUSE_THREADS

4
aegisub/src/charset_conv.h
View file

@ -106,8 +106,8 @@ private:
/// DOCME
bool enableSubst;
size_t doConversion(iconv_t cd, char *dst, size_t dstSize, const char *src, size_t srcSize) const;
size_t iconvWrapper(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) const;
size_t doConversion(iconv_t cd, char *dst, size_t dstSize, char *src, size_t srcSize) const;
size_t iconvWrapper(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) const;
static void ucToMbFallback(
unsigned int code,