diff --git a/rtengine/camconst.json b/rtengine/camconst.json index c0d833db7..90e7141fa 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1288,6 +1288,11 @@ Camera constants: "ranges": { "white": 16100 } }, + { // Quality C + "make_model": "Fujifilm X10", + "ranges": { "white": 3788 } + }, + { // Quality B "make_model": "FUJIFILM X70", "dcraw_matrix": [ 10450,-4329,-878,-3217,11105,2421,-752,1758,6519 ], // DNG_v9.4 D65 diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index d5a36b959..308e61bc9 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -17,34 +17,37 @@ * along with RawTherapee. If not, see . */ #include + #include #include + #ifdef _OPENMP #include #endif #include "alignedbuffer.h" +#include "calc_distort.h" +#include "ciecam02.h" #include "cieimage.h" -#include "labimage.h" -#include "rtengine.h" -#include "improcfun.h" +#include "clutstore.h" +#include "color.h" #include "curves.h" #include "dcp.h" +#include "EdgePreservingDecomposition.h" +#include "iccmatrices.h" #include "iccstore.h" #include "imagesource.h" -#include "rtthumbnail.h" -#include "utils.h" -#include "iccmatrices.h" -#include "color.h" -#include "calc_distort.h" -#include "rt_math.h" -#include "EdgePreservingDecomposition.h" #include "improccoordinator.h" -#include "clutstore.h" -#include "ciecam02.h" +#include "improcfun.h" +#include "labimage.h" +#include "procparams.h" +#include "rt_math.h" +#include "rtengine.h" +#include "rtthumbnail.h" #include "satandvalueblendingcurve.h" #include "StopWatch.h" -#include "procparams.h" +#include "utils.h" + #include "../rtgui/editcallbacks.h" #ifdef _DEBUG @@ -308,7 +311,7 @@ void ImProcFunctions::updateColorProfiles(const Glib::ustring& monitorProfile, R #if !defined(__APPLE__) // No support for monitor profiles on OS X, all data is sRGB monitor = ICCStore::getInstance()->getProfile(monitorProfile); #else - monitor = ICCStore::getInstance()->getProfile (options.rtSettings.srgb); + monitor = ICCStore::getInstance()->getProfile (settings->srgb); #endif }