Merge branch 'dev' into procparams-cleanup

2017-12-05 18:23:48 +01:00
parent 95614c7ecb d78848c614
commit e6e4bfa350
19 changed files with 988 additions and 216 deletions
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -3383,27 +3383,10 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
            pedited->set (false);
        }

-        FILE* f = g_fopen (fname.c_str (), "rt");
-
-        if (!f) {
+        if (!keyFile.load_from_file(fname)) {
            return 1;
        }

-        char* buffer = new char[1024];
-        std::ostringstream ostr;
-
-        while (fgets (buffer, 1024, f)) {
-            ostr << buffer << "\n";
-        }
-
-        delete [] buffer;
-
-        if (!keyFile.load_from_data (ostr.str())) {
-            return 1;
-        }
-
-        fclose (f);
-
        ppVersion = PPVERSION;
        appVersion = RTVERSION;