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

Replace hardcoded C:\Windows path by auto-search; see issue #572

Browse Source
This commit is contained in:
Oliver Duis
2011-03-08 16:59:27 +01:00
parent e59bfff48b
commit 3ce981e16c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtdata/options/options.win
View File

@@ -107,7 +107,8 @@ FixRatio=true
DPI=600 DPI=600
[Color Management] [Color Management]
ICCDirectory=C:\\WINDOWS\\System32\\spool\\drivers\\color # Auto-determined by RT on first start
# ICCDirectory=
MonitorProfile= MonitorProfile=
Intent=1 Intent=1

6
rtgui/options.cc
View File

@@ -138,7 +138,11 @@ void Options::setDefaults () {
rtSettings.darkFramesPath = ""; rtSettings.darkFramesPath = "";
rtSettings.flatFieldsPath = ""; rtSettings.flatFieldsPath = "";
#ifdef WIN32 #ifdef WIN32
rtSettings.iccDirectory = "C:/WINDOWS/System32/spool/drivers/color"; const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows"
if (sysRoot!=NULL)
rtSettings.iccDirectory = Glib::ustring(sysRoot) + Glib::ustring("\\System32\\spool\\drivers\\color");
else
rtSettings.iccDirectory = "C:\\WINDOWS\\System32\\spool\\drivers\\color";
#else #else
rtSettings.iccDirectory = "/usr/share/color/icc"; rtSettings.iccDirectory = "/usr/share/color/icc";
#endif #endif