ticket_1141_patch.diff
src/plugins/grass/qgsgrassnewmapset.cpp (working copy) | ||
---|---|---|
474 | 474 |
hSRS = OSRNewSpatialReference(NULL); |
475 | 475 |
int errcode; |
476 | 476 |
const char *oldlocale = setlocale(LC_ALL, NULL); |
477 |
setlocale(LC_ALL, "C");
|
|
477 |
setlocale(LC_ALL, "UTF-8");
|
|
478 | 478 |
errcode = OSRImportFromProj4(hSRS, proj4.ascii()); |
479 | 479 |
setlocale(LC_ALL, oldlocale); |
480 | 480 |
if ( errcode!=OGRERR_NONE ) |
src/core/qgsspatialrefsys.cpp (working copy) | ||
---|---|---|
229 | 229 |
setMapUnits(); |
230 | 230 |
mIsValidFlag = true; |
231 | 231 |
const char *oldlocale = setlocale(LC_ALL, NULL); |
232 |
setlocale(LC_ALL, "C");
|
|
232 |
setlocale(LC_ALL, "UTF-8");
|
|
233 | 233 |
OSRImportFromProj4( mSRS, proj4String.toLatin1().constData() ); |
234 | 234 |
setlocale(LC_ALL, oldlocale); |
235 | 235 |
} |
... | ... | |
412 | 412 |
{ |
413 | 413 |
// Success! We have found the proj string by swapping the lat_1 and lat_2 |
414 | 414 |
const char *oldlocale = setlocale(LC_ALL, NULL); |
415 |
setlocale(LC_ALL, "C");
|
|
415 |
setlocale(LC_ALL, "UTF-8");
|
|
416 | 416 |
OSRImportFromProj4(mSRS, theProj4StringModified.toLatin1().constData() ); |
417 | 417 |
setlocale(LC_ALL, oldlocale); |
418 | 418 |
mySrsId=myRecord["srs_id"].toLong(); |
... | ... | |
665 | 665 |
void QgsSpatialRefSys::setProj4String (QString theProj4String) |
666 | 666 |
{ |
667 | 667 |
const char *oldlocale = setlocale(LC_ALL, NULL); |
668 |
setlocale(LC_ALL, "C");
|
|
668 |
setlocale(LC_ALL, "UTF-8");
|
|
669 | 669 |
mIsValidFlag = OSRImportFromProj4(mSRS, theProj4String.toLatin1().constData() )==OGRERR_NONE; |
670 | 670 |
setlocale(LC_ALL, oldlocale); |
671 | 671 |
} |