Bug #662 » convert_bug.patch
| convert.cpp (working copy) | ||
|---|---|---|
| 508 | 508 |
return; |
| 509 | 509 |
} |
| 510 | 510 |
// Todo: Convert to UTF-8 if necessary |
| 511 |
|
|
| 511 | 512 |
(*xmpData_)[to] = cv->comment(); |
| 512 | 513 |
if (erase_) exifData_->erase(pos); |
| 513 | 514 |
} |
| ... | ... | |
| 1325 | 1326 |
std::string outstr; |
| 1326 | 1327 |
EXV_ICONV_CONST char *inptr = const_cast<char *>(str.c_str()); |
| 1327 | 1328 |
size_t inbytesleft = str.length(); |
| 1328 |
int outbytesProduced = 0; |
|
| 1329 | ||
| 1329 | 1330 |
while (inbytesleft) {
|
| 1330 | 1331 |
char outbuf[100]; |
| 1331 | 1332 |
char *outptr = outbuf; |
| ... | ... | |
| 1335 | 1336 |
&inbytesleft, |
| 1336 | 1337 |
&outptr, |
| 1337 | 1338 |
&outbytesleft); |
| 1338 |
outbytesProduced += sizeof(outbuf) - 1 - outbytesleft; |
|
| 1339 | ||
| 1340 |
int outbytesProduced = sizeof(outbuf) - 1 - outbytesleft; |
|
| 1339 | 1341 |
if (rc == size_t(-1) && errno != E2BIG) {
|
| 1340 | 1342 |
#ifndef SUPPRESS_WARNINGS |
| 1341 | 1343 |
std::cerr << "Warning: iconv: " |