summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-02-25 15:18:56 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-02-25 15:18:56 (GMT)
commitcff8111ed33af6033bd188868964d92ea3503188 (patch)
tree2a7451abfd771d43ea2b3ac2443d94c3eb5cfee7 /src/config.l
parent34d4ace6d4037862b6d280f1d7534292c714bf59 (diff)
downloadDoxygen-cff8111ed33af6033bd188868964d92ea3503188.zip
Doxygen-cff8111ed33af6033bd188868964d92ea3503188.tar.gz
Doxygen-cff8111ed33af6033bd188868964d92ea3503188.tar.bz2
Release-1.8.0
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/config.l b/src/config.l
index 2e23ea1..2988810 100644
--- a/src/config.l
+++ b/src/config.l
@@ -454,7 +454,7 @@ static QCString configStringRecode(
QCString outputEncoding = toEncoding;
if (inputEncoding.isEmpty() || outputEncoding.isEmpty() || inputEncoding==outputEncoding) return str;
int inputSize=str.length();
- size_t outputSize=inputSize*4+1;
+ int outputSize=inputSize*4+1;
QCString output(outputSize);
void *cd = portable_iconv_open(outputEncoding,inputEncoding);
if (cd==(void *)(-1))
@@ -463,13 +463,13 @@ static QCString configStringRecode(
inputEncoding.data(),outputEncoding.data());
exit(1);
}
- size_t iLeft=inputSize;
- size_t oLeft=outputSize;
+ size_t iLeft=(size_t)inputSize;
+ size_t oLeft=(size_t)outputSize;
const char *inputPtr = str.data();
char *outputPtr = output.data();
if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft))
{
- outputSize-=oLeft;
+ outputSize-=(int)oLeft;
output.resize(outputSize+1);
output.at(outputSize)='\0';
//printf("iconv: input size=%d output size=%d\n[%s]\n",size,newSize,srcBuf.data());