Commit 36ce9d02 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Fixed issue running dot on files with non-ascii characters

parent f8a55e01
...@@ -665,7 +665,7 @@ static void checkDotResult(const QCString &imgName) ...@@ -665,7 +665,7 @@ static void checkDotResult(const QCString &imgName)
{ {
if (Config_getEnum("DOT_IMAGE_FORMAT")=="png") if (Config_getEnum("DOT_IMAGE_FORMAT")=="png")
{ {
FILE *f = fopen(imgName,"rb"); FILE *f = portable_fopen(imgName,"rb");
if (f) if (f)
{ {
char data[4]; char data[4];
...@@ -961,24 +961,25 @@ bool DotFilePatcher::run() ...@@ -961,24 +961,25 @@ bool DotFilePatcher::run()
//printf("DotFilePatcher::addSVGConversion: file=%s zoomable=%d\n", //printf("DotFilePatcher::addSVGConversion: file=%s zoomable=%d\n",
// m_patchFile.data(),map->zoomable); // m_patchFile.data(),map->zoomable);
} }
QCString tmpName = m_patchFile+".tmp"; QString tmpName = QString::fromUtf8(m_patchFile+".tmp");
if (!QDir::current().rename(m_patchFile,tmpName)) QString patchFile = QString::fromUtf8(m_patchFile);
if (!QDir::current().rename(patchFile,tmpName))
{ {
err("Failed to rename file %s to %s!\n",m_patchFile.data(),tmpName.data()); err("Failed to rename file %s to %s!\n",m_patchFile.data(),tmpName.data());
return FALSE; return FALSE;
} }
QFile fi(tmpName); QFile fi(tmpName);
QFile fo(m_patchFile); QFile fo(patchFile);
if (!fi.open(IO_ReadOnly)) if (!fi.open(IO_ReadOnly))
{ {
err("problem opening file %s for patching!\n",tmpName.data()); err("problem opening file %s for patching!\n",tmpName.data());
QDir::current().rename(tmpName,m_patchFile); QDir::current().rename(tmpName,patchFile);
return FALSE; return FALSE;
} }
if (!fo.open(IO_WriteOnly)) if (!fo.open(IO_WriteOnly))
{ {
err("problem opening file %s for patching!\n",m_patchFile.data()); err("problem opening file %s for patching!\n",m_patchFile.data());
QDir::current().rename(tmpName,m_patchFile); QDir::current().rename(tmpName,patchFile);
return FALSE; return FALSE;
} }
FTextStream t(&fo); FTextStream t(&fo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment