liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

255: RT does not lock output file while writing by oduis

Browse Source
This commit is contained in:
Andrey Skvortsov
2010-10-15 21:16:02 -07:00
parent 8bc162f408
commit 217aa68350
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/imageio.cc
View File

@@ -410,7 +410,11 @@ int ImageIO::loadTIFF (Glib::ustring fname) {
int ImageIO::savePNG (Glib::ustring fname, int compression, int bps) { int ImageIO::savePNG (Glib::ustring fname, int compression, int bps) {
FILE* file=g_fopen(safe_locale_from_utf8(fname).c_str (),"wb"); // create a temporary file name that is opened in parallel by e.g. image viewers whilte RT is still writing
Glib::ustring tmpFname=fname;
tmpFname.append(".tmp");
FILE *file = g_fopen (safe_locale_from_utf8(tmpFname).c_str (), "wb");
if (!file) if (!file)
return IMIO_CANNOTREADFILE; return IMIO_CANNOTREADFILE;
@@ -477,6 +481,9 @@ int ImageIO::savePNG (Glib::ustring fname, int compression, int bps) {
delete [] row; delete [] row;
fclose (file); fclose (file);
// Rename temporary filename, practically atomic
rename(safe_locale_from_utf8(tmpFname).c_str (),safe_locale_from_utf8(fname).c_str ());
if (pl) { if (pl) {
pl->setProgressStr ("Ready."); pl->setProgressStr ("Ready.");
pl->setProgress (1.0); pl->setProgress (1.0);
@@ -494,7 +501,11 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality) {
cinfo.err = jpeg_std_error (&jerr); cinfo.err = jpeg_std_error (&jerr);
jpeg_create_compress (&cinfo); jpeg_create_compress (&cinfo);
FILE *file = g_fopen (safe_locale_from_utf8(fname).c_str (), "wb"); // create a temporary file name that is opened in parallel by e.g. image viewers whilte RT is still writing
Glib::ustring tmpFname=fname;
tmpFname.append(".tmp");
FILE *file = g_fopen (safe_locale_from_utf8(tmpFname).c_str (), "wb");
if (!file) if (!file)
return IMIO_CANNOTREADFILE; return IMIO_CANNOTREADFILE;
@@ -584,6 +595,9 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality) {
delete [] row; delete [] row;
fclose (file); fclose (file);
// Rename temporary filename, practically atomic
rename(safe_locale_from_utf8(tmpFname).c_str (),safe_locale_from_utf8(fname).c_str ());
if (pl) { if (pl) {
pl->setProgressStr ("Ready."); pl->setProgressStr ("Ready.");
pl->setProgress (1.0); pl->setProgress (1.0);