mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-18 11:28:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fixed tfscanf return value with * modifier

Browse Source 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1087 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
theraysmith@gmail.com 2014-04-29 04:30:47 +00:00
parent c8e27cb8f8
commit 484b47bc5d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccutil/scanutils.cpp
View File

@ -399,11 +399,11 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
break; break;
} }
val = streamtoumax(stream, base); val = streamtoumax(stream, base);
converted++;
// fall through // fall through
set_integer: set_integer:
if (!(flags & FL_SPLAT)) { if (!(flags & FL_SPLAT)) {
converted++;
switch(rank) { switch(rank) {
case RANK_CHAR: case RANK_CHAR:
*va_arg(ap, unsigned char *) *va_arg(ap, unsigned char *)
@ -451,8 +451,8 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
*va_arg(ap, float *) = static_cast<float>(fval); *va_arg(ap, float *) = static_cast<float>(fval);
else if (rank == RANK_LONG) else if (rank == RANK_LONG)
*va_arg(ap, double *) = static_cast<double>(fval); *va_arg(ap, double *) = static_cast<double>(fval);
converted++;
} }
converted++;
} }
break; break;
@ -464,10 +464,11 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
bail = BAIL_EOF; bail = BAIL_EOF;
break; break;
} }
if (!(flags & FL_SPLAT)) *sarg++ = q; if (!(flags & FL_SPLAT)) {
*sarg++ = q;
converted++;
}
} }
if (!bail)
converted++;
break; break;
case 's': // String case 's': // String